diff --git a/content/downloads/_index.html b/content/downloads/_index.html
index 8875f32233..33c02ccae9 100644
--- a/content/downloads/_index.html
+++ b/content/downloads/_index.html
@@ -38,28 +38,13 @@ <h1>Downloads</h1>
     </div>
   </div>
   <div class="callout" id="more-downloads">
-    <div class="two-column">
-      <div class="column-left">
-        <h2>GUI Clients</h2>
-        <p>
-          Git comes with built-in GUI tools (<strong>git-gui</strong>, <strong>gitk</strong>), but there are several third-party tools for users looking for a platform-specific experience.
-        </p>
-        <p>
-          <strong>
-            <a href="{{< relurl "downloads/guis" >}}">View GUI Clients →</a>
-          </strong>
-        </p>
-      </div>
-      <div class="column-right">
-        <h2>Logos</h2>
-        <p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
-        <p>
-          <strong>
-            <a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
-          </strong>
-        </p>
-      </div>
-    </div>
+    <h2>Logos</h2>
+    <p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
+    <p>
+      <strong>
+        <a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
+      </strong>
+      </p>
   </div>
   <h2>Git via Git</h2>
   <p>
diff --git a/content/downloads/guis/android.html b/content/downloads/guis/android.html
deleted file mode 100644
index 6f45007eb1..0000000000
--- a/content/downloads/guis/android.html
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: downloads/guis?os=android
-aliases:
-- /download/gui/android
----
diff --git a/content/downloads/guis/ios.html b/content/downloads/guis/ios.html
deleted file mode 100644
index 5a017cb7cc..0000000000
--- a/content/downloads/guis/ios.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-redirect_to: downloads/guis?os=ios
-aliases:
-- /download/gui/ios
----
-
-
diff --git a/content/downloads/guis/linux.html b/content/downloads/guis/linux.html
deleted file mode 100644
index 2453875437..0000000000
--- a/content/downloads/guis/linux.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-redirect_to: downloads/guis?os=linux
-aliases:
-- /download/gui/linux
----
-
diff --git a/content/downloads/guis/mac.html b/content/downloads/guis/mac.html
deleted file mode 100644
index 6f22384797..0000000000
--- a/content/downloads/guis/mac.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-redirect_to: downloads/guis?os=mac
-aliases:
-- /download/gui/mac
----
-
-
diff --git a/content/downloads/guis/windows.html b/content/downloads/guis/windows.html
deleted file mode 100644
index c1bb0b2e1e..0000000000
--- a/content/downloads/guis/windows.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-redirect_to: downloads/guis?os=windows
-aliases:
-- /download/gui/windows
----
-
-
diff --git a/content/tools/_index.html b/content/tools/_index.html
new file mode 100644
index 0000000000..0889bc1f45
--- /dev/null
+++ b/content/tools/_index.html
@@ -0,0 +1,50 @@
+---
+section: "tools"
+title: "Git - Tools"
+url: /tools.html
+---
+
+<div id="main">
+
+  <h1> Tools </h1>
+
+  <p>
+    The community has built a huge number of tools to make it easier to use Git.
+    While you can use Git on its own, most Git users use some of these extra tools.
+    There are editor integrations, GUIs, tools for resolving merge conflicts,
+    hosting services, and much more.
+  </p>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/command-line">}}">
+      <img alt="Terminal icon" aria-hidden="true" src="{{< relurl "images/icons/fa-terminal.svg">}}" >
+      <h3> Command Line Tools </h3>
+    </a>
+
+    <p>
+      Tools to view and manipulate your Git history
+    </p>
+  </div>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/guis">}}">
+      <img alt="Desktop icon" aria-hidden="true" src="{{< relurl "images/icons/fa-desktop.svg">}}" >
+      <h3> GUIs </h3>
+    </a>
+
+    <p>
+      Graphical user interfaces and editor integrations
+    </p>
+  </div>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/hosting">}}">
+      <img alt="Cloud icon" aria-hidden="true" src="{{< relurl "images/icons/fa-cloud.svg">}}" >
+      <h3> Hosting </h3>
+    </a>
+
+    <p>
+      Git repository hosting
+    </p>
+  </div>
+</div>
diff --git a/content/tools/command-line.html b/content/tools/command-line.html
new file mode 100644
index 0000000000..eb8a5e79a8
--- /dev/null
+++ b/content/tools/command-line.html
@@ -0,0 +1,78 @@
+---
+section: "tools"
+subsection: "command-line"
+title: "Git - Command Line Tools"
+url: /tools/command-line.html
+---
+
+<div id="main">
+  <h1>Command Line Tools</h1>
+
+  <h3>TUIs</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/jesseduffield/lazygit">lazygit</a></strong>: simple terminal UI for git commands</li>
+    <li><strong><a href="https://jonas.github.io/tig/">tig</a></strong>: ncurses-based text-mode interface for git</li>
+    <li><strong><a href="https://github.com/wfxr/forgit">forgit</a></strong>: A utility tool powered by fzf for using git interactively </li>
+    <li><strong><a href="https://github.com/altsem/gitu">gitu</a></strong>: A TUI Git client inspired by Magit  </li>
+    <li><strong><a href="https://github.com/gitui-org/gitui">gitui</a></strong>: Blazing fast terminal-ui for Git written in Rust</li>
+  </ul>
+
+  <h3>Manage Git history</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/tummychow/git-absorb">git-absorb</a></strong>: git commit --fixup, but automatic</li>
+    <li><strong><a href="https://github.com/newren/git-filter-repo">git-filter-repo</a></strong>:  Quickly rewrite git repository history (filter-branch replacement)</li>
+    <li><strong><a href="https://github.com/mhagger/git-imerge">git-imerge</a></strong>: Incremental merge for Git </li>
+    <li><strong><a href="https://mergiraf.org/">mergiraf</a></strong>: A syntax-aware git merge driver for a growing collection of programming languages and file formats.</li>
+    <li><strong><a href="https://github.com/arxanas/git-branchless">git-branchless</a></strong>: Branchless workflow for Git</li>
+  </ul>
+
+  <h3>Shell prompt integrations</h3>
+
+  These let you put your current Git branch (and more) in your shell prompt:
+
+  <ul>
+    <li><strong><a href="https://starship.rs/">Starship</a></strong>: The minimal, blazing-fast, and infinitely customizable prompt for any shell!</li>
+    <li><strong><a href="https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh">git-prompt.sh</a></strong>: Bash prompt that comes with Git</li>
+  </ul>
+
+  <h3>Manage large files</h3>
+
+  <ul>
+    <li><strong><a href="https://git-annex.branchable.com/">git-annex</a></strong></li>
+    <li><strong><a href="https://git-lfs.com/">git-lfs</a></strong></li>
+  </ul>
+
+  <h3>Diff tools</h3>
+
+  <ul>
+    <li><strong><a href="https://dandavison.github.io/delta/">delta</a></strong>: A syntax highlighting pager for Git diffs</li>
+    <li><strong><a href="https://github.com/Wilfred/difftastic">difftastic</a></strong>: A structural diff that understands syntax</li>
+    <li><strong><a href="https://github.com/so-fancy/diff-so-fancy">diff-so-fancy</a></strong>: diff-so-fancy strives to make your diffs human readable instead of machine readable</li>
+  </ul>
+
+  <h3>Manage hooks</h3>
+
+  <ul>
+    <li><strong><a href="https://pre-commit.com/">pre-commit</a></strong>:  A framework for managing and maintaining multi-language pre-commit hooks.  </li>
+    <li><strong><a href="https://github.com/evilmartians/lefthook">lefthook</a></strong>: A fast Git hooks manager written in Go </li>
+  </ul>
+
+  <h3>Collections of Git tools</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/tj/git-extras">git-extras</a></strong>: Git repo summary, repl, changelog population, author commit percentages and more </li>
+    <li><strong><a href="https://github.com/nvie/git-toolbelt">git-toolbelt</a></strong>: A suite of useful Git commands that aid with scripting or every day command line usage</li>
+  </ul>
+
+  <h3>Other</h3>
+
+  <ul>
+    <li><strong><a href="https://mob.sh/">mob.sh</a></strong>: Fast git handover for remote pair/mob programming. </li>
+    <li><strong><a href="https://github.com/awslabs/git-secrets">git-secrets</a></strong>: Prevents you from committing secrets and credentials into git repositories </li>
+    <li><strong><a href="https://commitizen-tools.github.io/commitizen/">Commitizen</a></strong>: Create committing rules for projects, auto bump versions and auto changelog generation</li>
+    <li><strong><a href="https://github.com/git-town/git-town">git-town</a></strong>: Additional Git commands that automate the creation, synchronization, shipping, and cleanup of Git branches</li>
+  </ul>
+
+</div>
diff --git a/content/downloads/guis/_index.html b/content/tools/guis/_index.html
similarity index 96%
rename from content/downloads/guis/_index.html
rename to content/tools/guis/_index.html
index 5c2be871ae..36b068fede 100644
--- a/content/downloads/guis/_index.html
+++ b/content/tools/guis/_index.html
@@ -1,9 +1,10 @@
 ---
-section: "downloads"
+section: "tools"
 subsection: "guis"
 title: "Git - GUI Clients"
-url: /downloads/guis.html
+url: /tools/guis.html
 aliases:
+- /downloads/guis.html
 - /downloads/guis/index.html
 - /download/guis/index.html
 - /download/guis.html
diff --git a/content/tools/guis/android.html b/content/tools/guis/android.html
new file mode 100644
index 0000000000..0be00e5c52
--- /dev/null
+++ b/content/tools/guis/android.html
@@ -0,0 +1,6 @@
+---
+redirect_to: tools/guis?os=android
+aliases:
+- /download/gui/android
+- /download/guis/android
+---
diff --git a/content/tools/guis/ios.html b/content/tools/guis/ios.html
new file mode 100644
index 0000000000..e922080a0d
--- /dev/null
+++ b/content/tools/guis/ios.html
@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=ios
+aliases:
+- /download/gui/ios
+- /download/guis/ios
+---
+
+
diff --git a/content/tools/guis/linux.html b/content/tools/guis/linux.html
new file mode 100644
index 0000000000..ba3b4fdbad
--- /dev/null
+++ b/content/tools/guis/linux.html
@@ -0,0 +1,7 @@
+---
+redirect_to: tools/guis?os=linux
+aliases:
+- /download/gui/linux
+- /download/guis/linux
+---
+
diff --git a/content/tools/guis/mac.html b/content/tools/guis/mac.html
new file mode 100644
index 0000000000..febad274bf
--- /dev/null
+++ b/content/tools/guis/mac.html
@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=mac
+aliases:
+- /download/gui/mac
+- /download/guis/mac
+---
+
+
diff --git a/content/tools/guis/windows.html b/content/tools/guis/windows.html
new file mode 100644
index 0000000000..51def4f726
--- /dev/null
+++ b/content/tools/guis/windows.html
@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=windows
+aliases:
+- /download/gui/windows
+- /download/guis/windows
+---
+
+
diff --git a/content/tools/hosting.html b/content/tools/hosting.html
new file mode 100644
index 0000000000..6e190477d3
--- /dev/null
+++ b/content/tools/hosting.html
@@ -0,0 +1,12 @@
+---
+section: "tools"
+subsection: "hosting"
+title: "Git - Hosting"
+url: /tools/hosting.html
+---
+
+<div id="main">
+  <h1>Git Hosting</h1>
+
+  {{< hosting >}}
+</div>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index eeca912a05..90c3783752 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -35,15 +35,27 @@
           </li>
         </ul>
       </li>
+
+      <li>
+        <a href="{{ relURL "tools" }}"{{ if (eq $section "tools") }} class="active"{{ end }}>Tools</a>
+        <ul {{ if (eq $section "tools") }}class="expanded"{{ end }}>
+          <li>
+            <a href="{{ relURL "tools/command-line" }}"{{ if (eq .Params.Subsection "command-line") }} class="active"{{ end }}>Command Line</a>
+          </li>
+          <li>
+            <a href="{{ relURL "tools/guis" }}"{{ if (eq .Params.Subsection "guis") }} class="active"{{ end }}>GUIs</a>
+          </li>
+          <li>
+            <a href="{{ relURL "tools/hosting" }}"{{ if (eq .Params.Subsection "hosting") }} class="active"{{ end }}>Hosting</a>
+          </li>
+        </ul>
+      </li>
       <li>
         <a href="{{ relURL "docs" }}"{{ if or (eq .Params.Subsection "reference") (eq .Params.Subsection "manual") }} class="active"{{ end }}>Reference</a>
       </li>
       <li>
         <a href="{{ relURL "downloads" }}"{{ if (eq $section "downloads") }} class="active"{{ end }}>Downloads</a>
         <ul {{ if (eq $section "downloads") }}class="expanded"{{ end }}>
-          <li>
-            <a href="{{ relURL "downloads/guis" }}"{{ if (eq .Params.Subsection "guis") }} class="active"{{ end }}>GUI Clients</a>
-          </li>
           <li>
             <a href="{{ relURL "downloads/logos" }}"{{ if (eq .Params.Subsection "logos") }} class="active"{{ end }}>Logos</a>
           </li>
diff --git a/layouts/partials/site-root.html b/layouts/partials/site-root.html
index 1cb6763e50..b853cbe0b8 100644
--- a/layouts/partials/site-root.html
+++ b/layouts/partials/site-root.html
@@ -16,6 +16,13 @@ <h3>Learn</h3>
             <p>Pro Git book, videos, tutorials, and cheat sheet</p>
           </a>
         </li>
+        <li>
+          <a href="{{ relURL "tools" }}">
+            <img src="{{ relURL "images/icons/fa-screwdriver-wrench.svg" }}" width="74" height="74" />
+            <h3>Tools</h3>
+            <p>Command line tools, GUIs, and hosting services</p>
+          </a>
+        </li>
         <li>
           <a href="{{ relURL "docs" }}">
             <img src="{{ relURL "images/icons/fa-book-open.svg" }}" width="74" height="74" />
@@ -27,7 +34,7 @@ <h3>Reference</h3>
           <a href="{{ relURL "downloads" }}">
             <img src="{{ relURL "images/icons/fa-down-long.svg" }}" width="74" height="74" />
             <h3>Downloads</h3>
-            <p>GUI clients and binary releases for all major platforms.</p>
+            <p>Binary releases for all major platforms.</p>
           </a>
         </li>
         <li>
@@ -64,26 +71,3 @@ <h3>Community</h3>
 </section>
 </div>
 
-<section id="companies-projects">
-  <h3 class="text-center">Products providing Git hosting</h3>
-  <ul>
-    {{ $m := slice
-    (dict "name" "gitlab" "url" "https://gitlab.com")
-    (dict "name" "github" "url" "https://github.com")
-    (dict "name" "forgejo" "url" "https://forgejo.org")
-    (dict "name" "codeberg" "url" "https://codeberg.org")
-    (dict "name" "sourcehut" "url" "https://sourcehut.org")
-    (dict "name" "gitea" "url" "https://gitea.com")
-    (dict "name" "tangled" "url" "https://tangled.org")
-    (dict "name" "radicle" "url" "https://radicle.xyz")
-    (dict "name" "gerrit" "url" "https://www.gerritcodereview.com")
-    (dict "name" "azure-repos" "url" "https://azure.microsoft.com/en-us/products/devops/repos/")
-    }}
-    {{ range shuffle $m }}
-    <li><a href="{{ .url }}">{{ partial "company-svg" (printf "company-project-logos/%s" .name) }}</a></li>
-    {{ end }}
-  </ul>
-  <script type="text/javascript">
-    document.getElementById("companies-projects").style.setProperty("--seed", Math.floor(Math.random() * 1000));
-  </script>
-</section>
diff --git a/layouts/shortcodes/hosting.html b/layouts/shortcodes/hosting.html
new file mode 100644
index 0000000000..66d098fd3d
--- /dev/null
+++ b/layouts/shortcodes/hosting.html
@@ -0,0 +1,22 @@
+<section id="companies-projects">
+  <ul>
+    {{ $m := slice
+    (dict "name" "gitlab" "url" "https://gitlab.com")
+    (dict "name" "github" "url" "https://github.com")
+    (dict "name" "forgejo" "url" "https://forgejo.org")
+    (dict "name" "codeberg" "url" "https://codeberg.org")
+    (dict "name" "sourcehut" "url" "https://sourcehut.org")
+    (dict "name" "gitea" "url" "https://gitea.com")
+    (dict "name" "tangled" "url" "https://tangled.org")
+    (dict "name" "radicle" "url" "https://radicle.xyz")
+    (dict "name" "gerrit" "url" "https://www.gerritcodereview.com")
+    (dict "name" "azure-repos" "url" "https://azure.microsoft.com/en-us/products/devops/repos/")
+    }}
+    {{ range shuffle $m }}
+    <li><a href="{{ .url }}">{{ partial "company-svg" (printf "company-project-logos/%s" .name) }}</a></li>
+    {{ end }}
+  </ul>
+  <script type="text/javascript">
+    document.getElementById("companies-projects").style.setProperty("--seed", Math.floor(Math.random() * 1000));
+  </script>
+</section>
\ No newline at end of file
diff --git a/static/images/icons/fa-cloud.svg b/static/images/icons/fa-cloud.svg
new file mode 100644
index 0000000000..a52c3b3759
--- /dev/null
+++ b/static/images/icons/fa-cloud.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.0.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M32 400C32 479.5 96.5 544 176 544L480 544C550.7 544 608 486.7 608 416C608 364.4 577.5 319.9 533.5 299.7C540.2 286.6 544 271.7 544 256C544 203 501 160 448 160C430.3 160 413.8 164.8 399.6 173.1C375.5 127.3 327.4 96 272 96C192.5 96 128 160.5 128 240C128 248 128.7 255.9 129.9 263.5C73 282.7 32 336.6 32 400z"/></svg>
\ No newline at end of file
diff --git a/static/images/icons/fa-desktop.svg b/static/images/icons/fa-desktop.svg
new file mode 100644
index 0000000000..fc6f32ffd2
--- /dev/null
+++ b/static/images/icons/fa-desktop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.0.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M128 96C92.7 96 64 124.7 64 160L64 416C64 451.3 92.7 480 128 480L272 480L256 528L184 528C170.7 528 160 538.7 160 552C160 565.3 170.7 576 184 576L456 576C469.3 576 480 565.3 480 552C480 538.7 469.3 528 456 528L384 528L368 480L512 480C547.3 480 576 451.3 576 416L576 160C576 124.7 547.3 96 512 96L128 96zM160 160L480 160C497.7 160 512 174.3 512 192L512 352C512 369.7 497.7 384 480 384L160 384C142.3 384 128 369.7 128 352L128 192C128 174.3 142.3 160 160 160z"/></svg>
\ No newline at end of file
diff --git a/static/images/icons/fa-screwdriver-wrench.svg b/static/images/icons/fa-screwdriver-wrench.svg
new file mode 100644
index 0000000000..c902295573
--- /dev/null
+++ b/static/images/icons/fa-screwdriver-wrench.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.0.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M102.8 57.3C108.2 51.9 116.6 51.1 123 55.3L241.9 134.5C250.8 140.4 256.1 150.4 256.1 161.1L256.1 210.7L346.9 301.5C380.2 286.5 420.8 292.6 448.1 320L574.2 446.1C592.9 464.8 592.9 495.2 574.2 514L514.1 574.1C495.4 592.8 465 592.8 446.2 574.1L320.1 448C292.7 420.6 286.6 380.1 301.6 346.8L210.8 256L161.2 256C150.5 256 140.5 250.7 134.6 241.8L55.4 122.9C51.2 116.6 52 108.1 57.4 102.7L102.8 57.3zM247.8 360.8C241.5 397.7 250.1 436.7 274 468L179.1 563C151 591.1 105.4 591.1 77.3 563C49.2 534.9 49.2 489.3 77.3 461.2L212.7 325.7L247.9 360.8zM416.1 64C436.2 64 455.5 67.7 473.2 74.5C483.2 78.3 485 91 477.5 98.6L420.8 155.3C417.8 158.3 416.1 162.4 416.1 166.6L416.1 208C416.1 216.8 423.3 224 432.1 224L473.5 224C477.7 224 481.8 222.3 484.8 219.3L541.5 162.6C549.1 155.1 561.8 156.9 565.6 166.9C572.4 184.6 576.1 203.9 576.1 224C576.1 267.2 558.9 306.3 531.1 335.1L482 286C448.9 253 403.5 240.3 360.9 247.6L304.1 190.8L304.1 161.1L303.9 156.1C303.1 143.7 299.5 131.8 293.4 121.2C322.8 86.2 366.8 64 416.1 63.9z"/></svg>
\ No newline at end of file
diff --git a/static/images/icons/fa-terminal.svg b/static/images/icons/fa-terminal.svg
new file mode 100644
index 0000000000..25544cf48f
--- /dev/null
+++ b/static/images/icons/fa-terminal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Pro v7.0.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc.--><path d="M73.4 182.6C60.9 170.1 60.9 149.8 73.4 137.3C85.9 124.8 106.2 124.8 118.7 137.3L278.7 297.3C291.2 309.8 291.2 330.1 278.7 342.6L118.7 502.6C106.2 515.1 85.9 515.1 73.4 502.6C60.9 490.1 60.9 469.8 73.4 457.3L210.7 320L73.4 182.6zM288 448L544 448C561.7 448 576 462.3 576 480C576 497.7 561.7 512 544 512L288 512C270.3 512 256 497.7 256 480C256 462.3 270.3 448 288 448z"/></svg>
\ No newline at end of file