diff --git a/apps/web/astro.config.mjs b/apps/web/astro.config.mjs
index 4f3c55212..372abd60a 100644
--- a/apps/web/astro.config.mjs
+++ b/apps/web/astro.config.mjs
@@ -62,6 +62,7 @@ export default defineConfig({
         alt: 'AgentV mark',
       },
       components: {
+        Header: './src/components/Header.astro',
         SiteTitle: './src/components/StarlightSiteTitle.astro',
         LanguageSelect: './src/components/VersionSelect.astro',
         Sidebar: './src/components/VersionedSidebar.astro',
diff --git a/apps/web/src/components/Header.astro b/apps/web/src/components/Header.astro
new file mode 100644
index 000000000..fd5d79ede
--- /dev/null
+++ b/apps/web/src/components/Header.astro
@@ -0,0 +1,97 @@
+---
+import LanguageSelect from 'virtual:starlight/components/LanguageSelect';
+import Search from 'virtual:starlight/components/Search';
+import SiteTitle from 'virtual:starlight/components/SiteTitle';
+import SocialIcons from 'virtual:starlight/components/SocialIcons';
+import ThemeSelect from 'virtual:starlight/components/ThemeSelect';
+import config from 'virtual:starlight/user-config';
+
+const shouldRenderSearch =
+  config.pagefind || config.components.Search !== '@astrojs/starlight/components/Search.astro';
+---
+
+<div class="header">
+  <div class="title-wrapper sl-flex">
+    <SiteTitle />
+  </div>
+  <div class="mobile-version md:sl-hidden print:hidden">
+    <LanguageSelect />
+  </div>
+  <div class="sl-flex print:hidden">
+    {shouldRenderSearch && <Search />}
+  </div>
+  <div class="sl-hidden md:sl-flex print:hidden right-group">
+    <div class="sl-flex social-icons">
+      <SocialIcons />
+    </div>
+    <ThemeSelect />
+    <LanguageSelect />
+  </div>
+</div>
+
+<style>
+  @layer starlight.core {
+    .header {
+      display: flex;
+      gap: 0.625rem;
+      justify-content: space-between;
+      align-items: center;
+      height: 100%;
+    }
+
+    .title-wrapper {
+      overflow: clip;
+      padding: 0.25rem;
+      margin: -0.25rem;
+      min-width: 0;
+    }
+
+    .mobile-version {
+      display: flex;
+      align-items: center;
+      flex: 0 0 auto;
+    }
+
+    .right-group,
+    .social-icons {
+      gap: 1rem;
+      align-items: center;
+    }
+
+    .social-icons::after {
+      content: '';
+      height: 2rem;
+      border-inline-end: 1px solid var(--sl-color-gray-5);
+    }
+
+    @media (min-width: 50rem) {
+      :global(:root[data-has-sidebar]) {
+        --__sidebar-pad: calc(2 * var(--sl-nav-pad-x));
+      }
+
+      :global(:root:not([data-has-toc])) {
+        --__toc-width: 0rem;
+      }
+
+      .header {
+        --__sidebar-width: max(0rem, var(--sl-content-inline-start, 0rem) - var(--sl-nav-pad-x));
+        --__main-column-fr: calc(
+          (
+              100% + var(--__sidebar-pad, 0rem) - var(--__toc-width, var(--sl-sidebar-width)) -
+                (2 * var(--__toc-width, var(--sl-nav-pad-x))) - var(--sl-content-inline-start, 0rem) -
+                var(--sl-content-width)
+            ) / 2
+        );
+        display: grid;
+        grid-template-columns:
+          minmax(
+            calc(var(--__sidebar-width) + max(0rem, var(--__main-column-fr) - var(--sl-nav-gap))),
+            auto
+          )
+          1fr
+          auto;
+        align-content: center;
+      }
+    }
+  }
+</style>
diff --git a/apps/web/src/styles/custom.css b/apps/web/src/styles/custom.css
index 4e6b37670..637e10372 100644
--- a/apps/web/src/styles/custom.css
+++ b/apps/web/src/styles/custom.css
@@ -82,7 +82,7 @@ a[aria-current="page"] {
 }
 
 .version-select select {
-  max-width: 11.5rem;
+  max-width: min(11.5rem, 28vw);
   min-height: 2rem;
   border: 1px solid var(--sl-color-gray-5);
   border-radius: 0.375rem;
@@ -93,6 +93,10 @@ a[aria-current="page"] {
   font-size: 0.8125rem;
 }
 
+.mobile-version .version-select select {
+  max-width: 7.25rem;
+}
+
 .version-select select:focus {
   outline: 2px solid var(--sl-color-accent-high);
   outline-offset: 2px;