diff --git a/docs.json b/docs.json
index 48fd62d7e..3b85c5ca2 100644
--- a/docs.json
+++ b/docs.json
@@ -28,13 +28,13 @@
             ]
           },
           {
-            "group": "Core Concepts",
+            "group": "Core Configuration",
             "pages": [
               "settings",
               "pages",
               "navigation",
               "themes",
-              "react-components",
+              "settings/custom-domain",
               "ai-ingestion"
             ]
           },
@@ -96,73 +96,47 @@
               "api-playground/troubleshooting"
             ]
           },
-          {
-            "group": "Guides",
+          { 
+            "group": "Authentication and Personalization",
             "pages": [
-              "guides/migration"
+              "settings/authentication-personalization/authentication",
+              "settings/authentication-personalization/partial-authentication",
+              "settings/authentication-personalization/personalization",
+              "settings/authentication-personalization/authentication-vs-personalization",
+              {
+                "group": "Authentication Setup",
+                "icon": "file-cog",
+                "pages": [
+                  "settings/authentication-personalization/authentication-setup/choosing-a-handshake",
+                  "settings/authentication-personalization/authentication-setup/password",
+                  "settings/authentication-personalization/authentication-setup/jwt",
+                  "settings/authentication-personalization/authentication-setup/oauth",
+                  "settings/authentication-personalization/authentication-setup/mintlify"
+                ]
+              },
+              {
+                "group": "Personalization Setup",
+                "icon": "user-cog",
+                "pages": [
+                  "settings/authentication-personalization/personalization-setup/choosing-a-handshake",
+                  "settings/authentication-personalization/personalization-setup/shared-session",
+                  "settings/authentication-personalization/personalization-setup/jwt",
+                  "settings/authentication-personalization/personalization-setup/oauth"
+                ]
+              },
+              "settings/authentication-personalization/sending-data"
             ]
           },
           {
-            "group": "Deep Dive",
+            "group": "Guides",
             "pages": [
-              "settings/custom-domain",
-              "settings/seo",
-              "settings/broken-links",
-              "settings/github",
-              "settings/gitlab",
-              "settings/ci",
-              "settings/preview-deployments",
-              "settings/custom-scripts",
+              "guides/migration",
               "mcp",
               "translations",
-              {
-                "group": "Integrations",
-                "icon": "blocks",
-                "pages": [
-                  {
-                    "group": "Analytics",
-                    "pages": [
-                      "integrations/analytics/overview",
-                      "integrations/analytics/amplitude",
-                      "integrations/analytics/clearbit",
-                      "integrations/analytics/fathom",
-                      "integrations/analytics/google-analytics",
-                      "integrations/analytics/google-tag-manager",
-                      "integrations/analytics/heap",
-                      "integrations/analytics/hotjar",
-                      "integrations/analytics/koala",
-                      "integrations/analytics/logrocket",
-                      "integrations/analytics/mixpanel",
-                      "integrations/analytics/pirsch",
-                      "integrations/analytics/plausible",
-                      "integrations/analytics/posthog",
-                      "integrations/analytics/segment"
-                    ]
-                  },
-                  {
-                    "group": "SDKs",
-                    "pages": [
-                      "integrations/sdks/speakeasy",
-                      "integrations/sdks/stainless"
-                    ]
-                  },
-                  {
-                    "group": "Support",
-                    "pages": [
-                      "integrations/support/overview",
-                      "integrations/support/intercom",
-                      "integrations/support/front"
-                    ]
-                  },
-                  {
-                    "group": "Privacy",
-                    "pages": [
-                      "integrations/privacy/overview",
-                      "integrations/privacy/osano"
-                    ]
-                  }
-                ]
-              },
+              "react-components",
+              "settings/custom-scripts",
+              "settings/seo",
+              "settings/broken-links",
               {
                 "group": "Custom Subdirectory",
                 "icon": "folder",
@@ -172,36 +146,6 @@
                   "advanced/subpath/vercel"
                 ]
               },
-              {
-                "group": "Auth & Personalization",
-                "icon": "user",
-                "pages": [
-                  "settings/authentication-personalization/authentication",
-                  "settings/authentication-personalization/partial-authentication",
-                  "settings/authentication-personalization/personalization",
-                  "settings/authentication-personalization/authentication-vs-personalization",
-                  {
-                    "group": "Authentication Setup",
-                    "pages": [
-                      "settings/authentication-personalization/authentication-setup/choosing-a-handshake",
-                      "settings/authentication-personalization/authentication-setup/password",
-                      "settings/authentication-personalization/authentication-setup/jwt",
-                      "settings/authentication-personalization/authentication-setup/oauth",
-                      "settings/authentication-personalization/authentication-setup/mintlify"
-                    ]
-                  },
-                  {
-                    "group": "Personalization Setup",
-                    "pages": [
-                      "settings/authentication-personalization/personalization-setup/choosing-a-handshake",
-                      "settings/authentication-personalization/personalization-setup/shared-session",
-                      "settings/authentication-personalization/personalization-setup/jwt",
-                      "settings/authentication-personalization/personalization-setup/oauth"
-                    ]
-                  },
-                  "settings/authentication-personalization/sending-data"
-                ]
-              },
               {
                 "group": "Dashboard Access",
                 "icon": "gauge",
@@ -213,6 +157,66 @@
                 ]
               }
             ]
+          },
+          {
+            "group": "Integrations",
+            "pages": [
+              {
+                "group": "Analytics",
+                "icon": "chart-no-axes-combined",
+                "pages": [
+                  "integrations/analytics/overview",
+                  "integrations/analytics/amplitude",
+                  "integrations/analytics/clearbit",
+                  "integrations/analytics/fathom",
+                  "integrations/analytics/google-analytics",
+                  "integrations/analytics/google-tag-manager",
+                  "integrations/analytics/heap",
+                  "integrations/analytics/hotjar",
+                  "integrations/analytics/koala",
+                  "integrations/analytics/logrocket",
+                  "integrations/analytics/mixpanel",
+                  "integrations/analytics/pirsch",
+                  "integrations/analytics/plausible",
+                  "integrations/analytics/posthog",
+                  "integrations/analytics/segment"
+                ]
+              },
+              {
+                "group": "SDKs",
+                "icon": "folder-code",
+                "pages": [
+                  "integrations/sdks/speakeasy",
+                  "integrations/sdks/stainless"
+                ]
+              },
+              {
+                "group": "Support",
+                "icon": "messages-square",
+                "pages": [
+                  "integrations/support/overview",
+                  "integrations/support/intercom",
+                  "integrations/support/front"
+                ]
+              },
+              {
+                "group": "Privacy",
+                "icon": "folder-lock",
+                "pages": [
+                  "integrations/privacy/overview",
+                  "integrations/privacy/osano"
+                ]
+              }
+            ]
+          },
+          {
+            "group": "Version Control and CI/CD",
+            "pages": [
+            "settings/github",
+              "settings/gitlab",
+              "settings/ci",
+              "settings/preview-deployments"
+            ]
           }
         ]
       },
diff --git a/settings/authentication-personalization/authentication-vs-personalization.mdx b/settings/authentication-personalization/authentication-vs-personalization.mdx
index c6be06046..6b4dcf8a7 100644
--- a/settings/authentication-personalization/authentication-vs-personalization.mdx
+++ b/settings/authentication-personalization/authentication-vs-personalization.mdx
@@ -1,6 +1,7 @@
 ---
-title: 'Auth vs Personalization'
-description: 'How to determine which product is best for you'
+title: "Auth vs Personalization"
+description: "How to determine which product is best for you"
+icon: "arrow-right-left"
 ---
 
 Mintlify offers both Authentication and Personalization. For the most part, Authentication is
diff --git a/settings/authentication-personalization/authentication.mdx b/settings/authentication-personalization/authentication.mdx
index 2da3096be..94786d377 100644
--- a/settings/authentication-personalization/authentication.mdx
+++ b/settings/authentication-personalization/authentication.mdx
@@ -1,6 +1,7 @@
 ---
 title: "Authentication"
 description: "Guarantee privacy of your docs by authenticating users"
+icon: "file-lock"
 ---
 
 <Info>
diff --git a/settings/authentication-personalization/partial-authentication.mdx b/settings/authentication-personalization/partial-authentication.mdx
index 2d77eb0d1..b27f15ad5 100644
--- a/settings/authentication-personalization/partial-authentication.mdx
+++ b/settings/authentication-personalization/partial-authentication.mdx
@@ -1,6 +1,7 @@
 ---
 title: "Partial Authentication"
 description: "Authenticate users to view only certain pages"
+icon: "file-lock-2"
 ---
 
 Partial Authentication allows you to authenticate users to view only certain pages.
diff --git a/settings/authentication-personalization/personalization.mdx b/settings/authentication-personalization/personalization.mdx
index 05baef8e8..83baa4bb1 100644
--- a/settings/authentication-personalization/personalization.mdx
+++ b/settings/authentication-personalization/personalization.mdx
@@ -1,6 +1,7 @@
 ---
 title: "Personalization"
 description: "A list of features unlocked with Personalization"
+icon: "user-pen"
 ---
 
 Personalization refers to a suite of features that allow you to customize your
diff --git a/settings/authentication-personalization/sending-data.mdx b/settings/authentication-personalization/sending-data.mdx
index e969fa8bc..4fb4b4165 100644
--- a/settings/authentication-personalization/sending-data.mdx
+++ b/settings/authentication-personalization/sending-data.mdx
@@ -1,6 +1,7 @@
 ---
-title: 'Sending Data'
-description: 'The shape of user data you can use to personalize your docs'
+title: "Sending Data"
+description: "The shape of user data you can use to personalize your docs"
+icon: "send"
 ---
 
 Depending on your Handshake method, your API will respond with either a raw JSON object or a signed JWT. The shape of the data is the same for both: