diff --git a/content/manuals/_index.md b/content/manuals/_index.md
index ac033af064..558924bf10 100644
--- a/content/manuals/_index.md
+++ b/content/manuals/_index.md
@@ -33,13 +33,17 @@ params:
     link: /testcontainers/
   ai:
   - title: Ask Gordon
-    description: streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.
+    description: Streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.
     icon: note_add
     link: /ai/gordon/
   - title: Docker Model Runner
-    description: View and manage your local models
+    description: View and manage your local models.
     icon: view_in_ar
     link: /model-runner/
+  - title: MCP Catalog and Toolkit
+    description: Augment your AI workflow with MCP servers.
+    icon: /assets/icons/toolbox.svg
+    link: /ai/mcp-catalog-and-toolkit/
   products:
   - title: Docker Desktop
     description: Your command center for container development.
diff --git a/content/manuals/ai/gordon/mcp/gordon-mcp-server.md b/content/manuals/ai/gordon/mcp/gordon-mcp-server.md
index 39a163ca87..4b0577abb3 100644
--- a/content/manuals/ai/gordon/mcp/gordon-mcp-server.md
+++ b/content/manuals/ai/gordon/mcp/gordon-mcp-server.md
@@ -6,8 +6,6 @@ aliases:
  - /desktop/features/gordon/mcp/gordon-mcp-server/
 ---
 
-## Gordon as an MCP server
-
 In addition to functioning as an MCP client, Gordon can also act as an MCP
 server. This means that all the tools configured in the toolbox section of
 Gordon can be exposed to another MCP client like Claude Desktop, Cursor and
diff --git a/static/assets/icons/toolbox.svg b/static/assets/icons/toolbox.svg
new file mode 100644
index 0000000000..bef5013751
--- /dev/null
+++ b/static/assets/icons/toolbox.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.99664 3.86884C2.66197 3.67455 2.54731 3.24425 2.74052 2.90773L4.05323 0.621471C4.21089 0.346882 4.0471 0 3.73178 0C1.67077 0 0 1.68003 0 3.75244C0 5.05867 0.663747 6.20902 1.6706 6.88106C1.88987 7.02742 2.04082 7.26509 2.04082 7.52974V9.5242C0.836426 10.08 0 11.3034 0 12.7231V14.4821C0 16.425 1.56635 18 3.49854 18H16.5015C18.4336 18 20 16.425 20 14.4821V12.7231C20 10.9058 18.6296 9.41033 16.8712 9.22462L16.8697 7.05588C16.8695 6.8004 16.6571 6.57979 16.4032 6.57139L14.0554 6.49368C13.7979 6.48516 13.5893 6.68826 13.5895 6.94731L13.591 9.20521H5.42274V7.52974C5.42274 7.26509 5.57368 7.02742 5.79296 6.88106C6.79981 6.20902 7.46356 5.05867 7.46356 3.75244C7.46356 3.25607 7.36771 2.78221 7.19361 2.34856C7.00782 1.88575 6.40534 1.91906 6.15717 2.35129L5.06339 4.25626C4.87017 4.59278 4.44224 4.70808 4.10757 4.51379L2.99664 3.86884ZM10.4811 11.9316C10.2708 11.5089 9.67085 11.5089 9.46062 11.9316C9.3182 12.2181 9.24699 12.3613 9.15186 12.4854C9.06744 12.5955 8.96927 12.6942 8.85975 12.7791C8.73635 12.8747 8.59394 12.9463 8.30914 13.0895C7.88869 13.3009 7.88863 13.9043 8.30908 14.1157C8.59392 14.2589 8.73634 14.3305 8.85975 14.4261C8.96927 14.511 9.06744 14.6097 9.15186 14.7199C9.24699 14.8439 9.3182 14.9872 9.46062 15.2736C9.67084 15.6964 10.2708 15.6964 10.4811 15.2736C10.6235 14.9872 10.6947 14.8439 10.7898 14.7199C10.8742 14.6097 10.9724 14.511 11.0819 14.4261C11.2054 14.3305 11.3478 14.2589 11.6326 14.1157C12.053 13.9043 12.0531 13.3009 11.6326 13.0896C11.3478 12.9464 11.2053 12.8747 11.0819 12.7791C10.9724 12.6942 10.8742 12.5955 10.7898 12.4854C10.6947 12.3613 10.6235 12.218 10.4811 11.9316Z" fill="#6C7E9D"/>
+<path d="M12.747 0.352806L15.8774 0.456415C16.1444 0.465255 16.2902 0.695161 16.4238 0.905985L16.4239 0.906077C16.4485 0.944879 16.4727 0.983033 16.4971 1.01904C16.5507 0.977799 16.6076 0.92709 16.6675 0.873745C16.8635 0.699266 17.0911 0.496583 17.3353 0.504665L19.0077 0.560025C19.16 0.565066 19.3028 0.644639 19.3901 0.773154L19.9123 1.54198C19.967 1.62255 19.9964 1.71727 19.9965 1.81333L19.9978 3.8175C19.9979 3.91356 19.9686 4.00634 19.914 4.08329L19.3928 4.81758C19.3057 4.94033 19.163 5.01045 19.0107 5.00541L17.3383 4.95006C17.1676 4.94441 17.0435 4.83815 16.9194 4.73184L16.9194 4.73178C16.9023 4.71718 16.8853 4.70258 16.8681 4.68823L16.8685 5.17965C16.8686 5.4387 16.66 5.6418 16.4025 5.63328L14.0548 5.55557C13.737 5.54505 13.5884 5.26822 13.5882 4.98596L13.0193 4.23731L12.3888 4.69243C12.3082 4.75066 12.21 4.78032 12.1092 4.77699L9.61909 4.69457C9.2538 4.68248 9.02826 4.25157 9.23069 3.95249C9.37539 3.70808 9.51264 3.45635 9.65041 3.20368C9.88151 2.77982 10.1141 2.35328 10.3856 1.95429C10.6584 1.55352 10.9829 1.15384 11.3624 0.854847C11.7439 0.554318 12.2081 0.334968 12.747 0.352806Z" fill="#6C7E9D"/>
+</svg>