diff --git a/sites/shared/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs
index 670be07ae68..d42ea9fe7f9 100644
--- a/sites/shared/components/account/apikeys.mjs
+++ b/sites/shared/components/account/apikeys.mjs
@@ -151,7 +151,9 @@ const NewKey = ({ account, setGenerate, backend }) => {
   const { t, i18n } = useTranslation(ns)
   const docs = {}
   for (const option of ['name', 'expiry', 'level']) {
-    docs[option] = <DynamicMdx language={i18n.language} slug={`docs/site/apikeys/${option}`} />
+    docs[option] = (
+      <DynamicMdx language={i18n.language} slug={`docs/about/site/apikeys/${option}`} />
+    )
   }
 
   const levels = account.role === 'admin' ? [0, 1, 2, 3, 4, 5, 6, 7, 8] : [0, 1, 2, 3, 4]
diff --git a/sites/shared/components/account/bio.mjs b/sites/shared/components/account/bio.mjs
index 751817a5340..510e13e7cbf 100644
--- a/sites/shared/components/account/bio.mjs
+++ b/sites/shared/components/account/bio.mjs
@@ -50,7 +50,7 @@ export const BioSettings = ({ welcome = false }) => {
   const nextHref =
     welcomeSteps[account.control].length > 5
       ? '/welcome/' + welcomeSteps[account.control][6]
-      : '/docs/guide'
+      : '/docs/about/guide'
 
   return (
     <div className="max-w-xl xl:pl-4">
@@ -60,7 +60,7 @@ export const BioSettings = ({ welcome = false }) => {
         update={setBio}
         current={bio}
         placeholder={t('bioTitle')}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/bio`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/bio`} />}
         labelBL={
           <span className="flex flex-row items-center gap-1">
             <TipIcon className="w-6 h-6 text-success" />
diff --git a/sites/shared/components/account/bookmarks.mjs b/sites/shared/components/account/bookmarks.mjs
index 65621b5b5ee..895e4544677 100644
--- a/sites/shared/components/account/bookmarks.mjs
+++ b/sites/shared/components/account/bookmarks.mjs
@@ -49,7 +49,9 @@ export const NewBookmark = () => {
   const { t, i18n } = useTranslation(ns)
   const docs = {}
   for (const option of ['title', 'location', 'type']) {
-    docs[option] = <DynamicMdx language={i18n.language} slug={`docs/site/bookmarks/${option}`} />
+    docs[option] = (
+      <DynamicMdx language={i18n.language} slug={`docs/about/site/bookmarks/${option}`} />
+    )
   }
 
   // State
diff --git a/sites/shared/components/account/compare.mjs b/sites/shared/components/account/compare.mjs
index 87e30d45a05..49d664423a8 100644
--- a/sites/shared/components/account/compare.mjs
+++ b/sites/shared/components/account/compare.mjs
@@ -44,7 +44,7 @@ export const CompareSettings = ({ welcome = false }) => {
   const nextHref =
     welcomeSteps[account?.control].length > 3
       ? '/welcome/' + welcomeSteps[account?.control][4]
-      : '/docs/guide'
+      : '/docs/about/guide'
 
   return (
     <div className="max-w-xl">
@@ -67,7 +67,7 @@ export const CompareSettings = ({ welcome = false }) => {
         }))}
         current={selection}
         update={update}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/compare`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/compare`} />}
       />
       {welcome ? (
         <>
diff --git a/sites/shared/components/account/control.mjs b/sites/shared/components/account/control.mjs
index 624bd108d67..d996dac0953 100644
--- a/sites/shared/components/account/control.mjs
+++ b/sites/shared/components/account/control.mjs
@@ -58,7 +58,7 @@ export const ControlSettings = ({ welcome = false, noBack = false }) => {
   const nextHref = welcome
     ? welcomeSteps[selection].length > 1
       ? '/welcome/' + welcomeSteps[selection][1]
-      : '/docs/guide'
+      : '/docs/about/guide'
     : false
 
   return (
@@ -78,7 +78,7 @@ export const ControlSettings = ({ welcome = false, noBack = false }) => {
         }))}
         current={selection}
         update={update}
-        docs={<DynamicMdx language={i18n.language} slug="docs/site/account/control" />}
+        docs={<DynamicMdx language={i18n.language} slug="docs/about/site/account/control" />}
       />
       {welcome ? (
         <>
diff --git a/sites/shared/components/account/email.mjs b/sites/shared/components/account/email.mjs
index 56be5e74253..e71603b1789 100644
--- a/sites/shared/components/account/email.mjs
+++ b/sites/shared/components/account/email.mjs
@@ -59,7 +59,7 @@ export const EmailSettings = () => {
             current={email}
             original={account.email}
             valid={() => valid}
-            docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/email`} />}
+            docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/email`} />}
           />
           <button
             className="btn mt-4 btn-primary w-full"
diff --git a/sites/shared/components/account/github.mjs b/sites/shared/components/account/github.mjs
index 3cfaed13dcc..435b44cc998 100644
--- a/sites/shared/components/account/github.mjs
+++ b/sites/shared/components/account/github.mjs
@@ -44,7 +44,7 @@ export const GithubSettings = () => {
         update={setGithubEmail}
         valid={(val) => val.length > 0}
         placeholder={'joostdecock'}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/github`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/github`} />}
       />
       <StringInput
         id="account-github-username"
@@ -53,7 +53,7 @@ export const GithubSettings = () => {
         update={setGithubUsername}
         valid={(val) => val.length > 0}
         placeholder={'joost@joost.at'}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/github`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/github`} />}
       />
       <SaveSettingsButton btnProps={{ onClick: save }} />
       <BackToAccountButton />
diff --git a/sites/shared/components/account/img.mjs b/sites/shared/components/account/img.mjs
index 1b02e0330c9..8fd76fc42d1 100644
--- a/sites/shared/components/account/img.mjs
+++ b/sites/shared/components/account/img.mjs
@@ -33,7 +33,7 @@ export const ImgSettings = ({ welcome = false }) => {
     } else setLoadingStatus([true, 'backendError', true, false])
   }
 
-  const nextHref = '/docs/guide'
+  const nextHref = '/docs/about/guide'
 
   return (
     <div className="max-w-xl">
@@ -51,7 +51,7 @@ export const ImgSettings = ({ welcome = false }) => {
         update={setImg}
         current={img}
         valid={(val) => val.length > 0}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/img`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/img`} />}
       />
       {welcome ? (
         <>
diff --git a/sites/shared/components/account/imperial.mjs b/sites/shared/components/account/imperial.mjs
index 54675d5580c..739c6ad74d3 100644
--- a/sites/shared/components/account/imperial.mjs
+++ b/sites/shared/components/account/imperial.mjs
@@ -40,7 +40,7 @@ export const ImperialSettings = ({ welcome = false }) => {
   const nextHref =
     welcomeSteps[account?.control].length > 3
       ? '/welcome/' + welcomeSteps[account?.control][3]
-      : '/docs/guide'
+      : '/docs/about/guide'
 
   return (
     <div className="max-w-xl">
@@ -59,7 +59,7 @@ export const ImperialSettings = ({ welcome = false }) => {
         }))}
         current={selection}
         update={update}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/units`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/units`} />}
       />
       {welcome ? (
         <>
diff --git a/sites/shared/components/account/language.mjs b/sites/shared/components/account/language.mjs
index 1dee54ec673..f55869462b3 100644
--- a/sites/shared/components/account/language.mjs
+++ b/sites/shared/components/account/language.mjs
@@ -58,7 +58,7 @@ export const LanguageSettings = () => {
         }))}
         current={language}
         update={update}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/language`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/language`} />}
       />
       <BackToAccountButton />
     </div>
diff --git a/sites/shared/components/account/newsletter.mjs b/sites/shared/components/account/newsletter.mjs
index 70f93c14230..12d1afeb7f5 100644
--- a/sites/shared/components/account/newsletter.mjs
+++ b/sites/shared/components/account/newsletter.mjs
@@ -40,7 +40,7 @@ export const NewsletterSettings = ({ welcome = false, bare = false }) => {
   const nextHref =
     welcomeSteps[account?.control].length > 2
       ? '/welcome/' + welcomeSteps[account?.control][2]
-      : '/docs/guide'
+      : '/docs/about/guide'
 
   return (
     <div className="max-w-xl">
diff --git a/sites/shared/components/account/password.mjs b/sites/shared/components/account/password.mjs
index 9d5bab82bb5..d41958f10f1 100644
--- a/sites/shared/components/account/password.mjs
+++ b/sites/shared/components/account/password.mjs
@@ -46,7 +46,7 @@ export const PasswordSettings = ({ welcome = false }) => {
         update={setPassword}
         valid={(val) => val.length > 0}
         placeholder={t('passwordTitle')}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/password`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/password`} />}
       />
       <SaveSettingsButton btnProps={{ onClick: save, disabled: password.length < 4 }} />
       {!welcome && <BackToAccountButton />}
diff --git a/sites/shared/components/account/patterns.mjs b/sites/shared/components/account/patterns.mjs
index cb89a84253b..0d0437334ad 100644
--- a/sites/shared/components/account/patterns.mjs
+++ b/sites/shared/components/account/patterns.mjs
@@ -380,7 +380,7 @@ export const Pattern = ({ id }) => {
         original={pattern.name}
         placeholder="Maurits Cornelis Escher"
         valid={(val) => val && val.length > 0}
-        docs={<DynamicMdx language={i18n.language} slug="docs/site/patterns/name" />}
+        docs={<DynamicMdx language={i18n.language} slug="docs/about/site/patterns/name" />}
       />
 
       {/* img: Control level determines whether or not to show this */}
@@ -392,7 +392,7 @@ export const Pattern = ({ id }) => {
           update={setImage}
           current={image}
           valid={(val) => val.length > 0}
-          docs={<DynamicMdx language={i18n.language} slug="docs/site/patterns/image" />}
+          docs={<DynamicMdx language={i18n.language} slug="docs/about/site/patterns/image" />}
         />
       ) : null}
 
@@ -429,7 +429,7 @@ export const Pattern = ({ id }) => {
             },
           ]}
           current={isPublic}
-          docs={<DynamicMdx language={i18n.language} slug="docs/site/patterns/public" />}
+          docs={<DynamicMdx language={i18n.language} slug="docs/about/site/patterns/public" />}
         />
       ) : null}
 
@@ -442,7 +442,7 @@ export const Pattern = ({ id }) => {
           update={setNotes}
           current={notes}
           placeholder={t('mdSupport')}
-          docs={<DynamicMdx language={i18n.language} slug="docs/site/patterns/notes" />}
+          docs={<DynamicMdx language={i18n.language} slug="docs/about/site/patterns/notes" />}
         />
       ) : null}
       <button
diff --git a/sites/shared/components/account/platform.mjs b/sites/shared/components/account/platform.mjs
index 6b1a0d2f43d..8c0609f0b06 100644
--- a/sites/shared/components/account/platform.mjs
+++ b/sites/shared/components/account/platform.mjs
@@ -46,7 +46,7 @@ export const PlatformSettings = ({ platform }) => {
         update={setPlatformId}
         valid={(val) => val.length > 0}
         placeholder={'joostdecock'}
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/platform`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/platform`} />}
       />
       <SaveSettingsButton btnProps={{ onClick: save }} />
       <BackToAccountButton />
diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs
index 54740bc0152..51f1e6118ec 100644
--- a/sites/shared/components/account/sets.mjs
+++ b/sites/shared/components/account/sets.mjs
@@ -285,7 +285,7 @@ export const Mset = ({ id, publicOnly = false }) => {
 
   const docs = {}
   for (const option of ['name', 'units', 'public', 'notes', 'image']) {
-    docs[option] = <DynamicMdx language={i18n.language} slug={`docs/site/sets/${option}`} />
+    docs[option] = <DynamicMdx language={i18n.language} slug={`docs/about/site/sets/${option}`} />
   }
 
   const heading = (
@@ -1079,7 +1079,8 @@ const SuggestCset = ({ mset, backend, setLoadingStatus, t }) => {
         {t('account:img')}
       </h4>
       <p>
-        {t('account:csetImgMsg')}: <PageLink href="/docs/site/csets">{t('account:docs')}</PageLink>
+        {t('account:csetImgMsg')}:{' '}
+        <PageLink href="/docs/about/site/csets">{t('account:docs')}</PageLink>
       </p>
       <PassiveImageInput
         label={t('account:img')}
diff --git a/sites/shared/components/account/username.mjs b/sites/shared/components/account/username.mjs
index 32ed9bf3f84..36349e980d3 100644
--- a/sites/shared/components/account/username.mjs
+++ b/sites/shared/components/account/username.mjs
@@ -44,7 +44,7 @@ export const UsernameSettings = ({ welcome = false }) => {
   const nextHref =
     welcomeSteps[account.control].length > 4
       ? '/welcome/' + welcomeSteps[account.control][5]
-      : '/docs/guide'
+      : '/docs/about/guide'
 
   let btnClasses = 'btn mt-4 capitalize '
   if (welcome) btnClasses += 'w-64 btn-secondary'
@@ -72,7 +72,7 @@ export const UsernameSettings = ({ welcome = false }) => {
             )}
           </span>
         }
-        docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/username`} />}
+        docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/username`} />}
       />
       <button className={btnClasses} disabled={!available} onClick={save}>
         <span className="flex flex-row items-center gap-2">
diff --git a/sites/shared/components/navigation/primary.mjs b/sites/shared/components/navigation/primary.mjs
index 3db5acb445e..22cb2ae2cc9 100644
--- a/sites/shared/components/navigation/primary.mjs
+++ b/sites/shared/components/navigation/primary.mjs
@@ -19,6 +19,7 @@ import {
   RocketIcon,
   TutorialIcon,
   YouTubeIcon,
+  HeartIcon,
 } from 'shared/components/icons.mjs'
 import { Breadcrumbs } from 'shared/components/breadcrumbs.mjs'
 
@@ -39,10 +40,8 @@ export const icons = {
   designs: (className = '') => <DesignIcon className={className} stroke={3} />,
   docs: (className = '') => <DocsIcon className={className} />,
   showcase: (className = '') => <ShowcaseIcon className={className} />,
-  community: (className = '') => <CommunityIcon className={className} />,
-  sets: (className = '') => <MeasieIcon className={className} />,
-  patterns: (className = '') => <PatternIcon className={className} />,
   new: (className = '') => <PlusIcon className={className} />,
+  support: (className = '') => <HeartIcon className={className} />,
 
   // Lab
   code: (className = '') => <GitHubIcon className={className} />,
diff --git a/sites/shared/components/susi/migrate.mjs b/sites/shared/components/susi/migrate.mjs
index 76255166d97..bc5793ebbfc 100644
--- a/sites/shared/components/susi/migrate.mjs
+++ b/sites/shared/components/susi/migrate.mjs
@@ -114,7 +114,7 @@ export const Migrate = () => {
           current={username}
           update={setUsername}
           valid={(val) => val.length > 1}
-          docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/username`} />}
+          docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/username`} />}
         />
         <PasswordInput
           id="migrate-password"
@@ -123,7 +123,7 @@ export const Migrate = () => {
           current={password}
           update={setPassword}
           valid={(val) => val.length > 1}
-          docs={<DynamicMdx language={i18n.language} slug={`docs/site/account/password`} />}
+          docs={<DynamicMdx language={i18n.language} slug={`docs/about/site/account/password`} />}
         />
         <button
           className="btn btn-primary btn-lg w-full mt-4"
diff --git a/sites/shared/components/workbench/menus/core-settings/index.mjs b/sites/shared/components/workbench/menus/core-settings/index.mjs
index 2efe8be343c..3db5be2251d 100644
--- a/sites/shared/components/workbench/menus/core-settings/index.mjs
+++ b/sites/shared/components/workbench/menus/core-settings/index.mjs
@@ -44,7 +44,7 @@ const CoreSetting = ({ name, config, control, updateFunc, current, passProps, ..
       docs={
         <DynamicMdx
           language={rest.language}
-          slug={`docs/site/draft/core-settings/${name.toLowerCase()}`}
+          slug={`docs/about/site/draft/core-settings/${name.toLowerCase()}`}
         />
       }
     />
diff --git a/sites/shared/components/workbench/menus/ui-settings/index.mjs b/sites/shared/components/workbench/menus/ui-settings/index.mjs
index bf0563ea341..b32f9fce9c2 100644
--- a/sites/shared/components/workbench/menus/ui-settings/index.mjs
+++ b/sites/shared/components/workbench/menus/ui-settings/index.mjs
@@ -22,8 +22,8 @@ const UiSetting = ({ name, control, ...rest }) => (
         language={rest.language}
         slug={
           name === 'control'
-            ? 'docs/site/account/control'
-            : `docs/site/draft/ui-settings/${name.toLowerCase()}`
+            ? 'docs/about/site/account/control'
+            : `docs/about/site/draft/ui-settings/${name.toLowerCase()}`
         }
       />
     }
diff --git a/sites/shared/components/workbench/views/docs/index.mjs b/sites/shared/components/workbench/views/docs/index.mjs
index 058e11503c7..c38135a2201 100644
--- a/sites/shared/components/workbench/views/docs/index.mjs
+++ b/sites/shared/components/workbench/views/docs/index.mjs
@@ -28,7 +28,7 @@ export const DocsView = ({ design }) => {
   return (
     <div className="m-auto mt-8 max-w-7xl px-4 mb-8">
       <Popout tip compact>
-        <PageLink txt={t('workbench:learnHowToUseEditor')} href="/docs/site/draft" />
+        <PageLink txt={t('workbench:learnHowToUseEditor')} href="/docs/about/site/draft" />
       </Popout>
       <h2>{t(`designs:${design}.t`)}</h2>
       <DesignInfo design={design} workbench />
diff --git a/sites/shared/components/workbench/views/save/index.mjs b/sites/shared/components/workbench/views/save/index.mjs
index 443585e2934..e81486d1cb8 100644
--- a/sites/shared/components/workbench/views/save/index.mjs
+++ b/sites/shared/components/workbench/views/save/index.mjs
@@ -114,7 +114,7 @@ export const SaveView = ({ design, settings, setView, saveAs }) => {
 
   const docs = {}
   for (const field of ['name', 'notes', 'goto']) {
-    docs[field] = <DynamicMdx language={i18n.language} slug={`docs/site/patterns/${field}`} />
+    docs[field] = <DynamicMdx language={i18n.language} slug={`docs/about/site/patterns/${field}`} />
   }
 
   return (