diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 88e23f1f5..03973007e 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -206,9 +206,11 @@ class="{{ request()->is('subscription*') ? 'menu-item-active menu-item' : 'menu-
         @endif
     </ul>
     {{-- Sticky sidebar collapser (desktop only; mobile uses a temporary slide-over) --}}
-    <div class="sticky bottom-0 mt-auto -mx-2 hidden border-t border-neutral-200 bg-white px-2 py-2 dark:border-white/[0.06] dark:bg-panel lg:-mx-3 lg:block lg:px-3">
+    <div class="sticky bottom-0 mt-auto -mx-2 hidden items-center gap-1 border-t border-neutral-200 bg-white px-2 py-2 dark:border-white/[0.06] dark:bg-panel lg:-mx-3 lg:flex lg:px-3"
+        :class="collapsed ? 'flex-col justify-center' : 'justify-between'">
+        <x-top-user-menu sidebar />
         <button type="button" @click="toggleSidebar()" title="Toggle sidebar" aria-label="Toggle sidebar"
-            class="menu-item mx-auto w-8 justify-center px-0">
+            class="menu-item w-8 shrink-0 justify-center px-0">
             <svg class="menu-item-icon" viewBox="0 0 24 24" fill="none">
                 <rect x="3" y="4" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.6" />
                 <path d="M9 4v16" stroke="currentColor" stroke-width="1.6" />
diff --git a/resources/views/components/top-user-menu.blade.php b/resources/views/components/top-user-menu.blade.php
index e51cf6810..c1a4c80d7 100644
--- a/resources/views/components/top-user-menu.blade.php
+++ b/resources/views/components/top-user-menu.blade.php
@@ -1,10 +1,14 @@
+@props([
+    'sidebar' => false,
+])
+
 @php
     $user = auth()->user();
     $userName = $user?->name ?? 'Account';
     $userEmail = $user?->email ?? '';
     $userInitial = strtoupper(mb_substr($user?->name ?: ($user?->email ?: 'A'), 0, 1));
 @endphp
-<div class="relative" x-data="{
+<div @class(['relative', 'min-w-0' => $sidebar]) x-data="{
     open: false,
     appearanceOpen: false,
     theme: localStorage.getItem('theme') || 'dark',
@@ -22,19 +26,31 @@
     @click.outside="open = false; appearanceOpen = false">
     <button type="button" @click="open = !open"
         title="{{ $userName }}" aria-label="Account menu for {{ $userName }}"
-        class="flex h-8 items-center gap-1.5 rounded-full border border-neutral-200 bg-neutral-100 px-2 shadow-sm transition-colors hover:bg-neutral-200 dark:border-white/[0.08] dark:bg-white/[0.06] dark:hover:bg-white/[0.1]">
+        @if ($sidebar) :class="collapsed && 'w-8 justify-center px-0'" @endif
+        @class([
+            'flex h-8 items-center gap-1.5 rounded-full border border-neutral-200 bg-neutral-100 px-2 shadow-sm transition-colors hover:bg-neutral-200 dark:border-white/[0.08] dark:bg-white/[0.06] dark:hover:bg-white/[0.1]',
+            'max-w-36' => $sidebar,
+        ])>
         <span
             class="flex size-5 shrink-0 items-center justify-center rounded-full bg-neutral-200 text-[11px] font-semibold text-neutral-700 dark:bg-white/[0.1] dark:text-fg">
             {{ $userInitial }}
         </span>
-        <svg class="size-3.5 shrink-0 text-neutral-400 dark:text-fg-faint transition-transform" :class="open && 'rotate-180'"
+        @if ($sidebar)
+            <span class="min-w-0 truncate text-xs font-medium" :class="collapsed && 'hidden'">{{ $userName }}</span>
+        @endif
+        <svg class="size-3.5 shrink-0 text-neutral-400 dark:text-fg-faint transition-transform"
+            :class="[open && 'rotate-180', {{ $sidebar ? "collapsed && 'hidden'" : 'false' }}]"
             viewBox="0 0 24 24" fill="none" aria-hidden="true">
             <path d="M6 9l6 6 6-6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
         </svg>
     </button>
 
     <div x-show="open" x-cloak x-transition.opacity.duration.120ms
-        class="listbox-panel right-0! left-auto! z-[90]! max-h-none! w-52! min-w-0! overflow-visible!">
+        @class([
+            'listbox-panel z-[90]! max-h-none! w-52! min-w-0! overflow-visible!',
+            'right-0! left-auto!' => ! $sidebar,
+            'bottom-full! left-0! right-auto! top-auto! mb-1!' => $sidebar,
+        ])>
         <div class="min-w-0 px-2 py-1.5">
             <div class="truncate text-[13px] font-semibold text-black dark:text-fg">{{ $userName }}</div>
             <div class="truncate text-[11px] text-neutral-500 dark:text-fg-faint">{{ $userEmail }}</div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index df8de4ca4..a8d64608e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -56,8 +56,8 @@ class="!text-[10.5px] font-medium text-neutral-400 dark:text-fg-faint !opacity-1
                     <div class="flex-1"></div>
                     {{-- Dev Server-Timing HUD docks here (local only; empty in production) --}}
                     <div id="server-timing-hud-slot" data-server-timing-hud-slot class="hidden shrink-0 items-center"></div>
-                    {{-- Right cluster --}}
-                    <x-top-user-menu />
+                    {{-- Resource actions dock here on desktop. --}}
+                    <div id="resource-action-hud-slot" class="hidden shrink-0 items-center xl:flex"></div>
                 </div>
             </header>
 
@@ -85,7 +85,7 @@ class="!text-[10.5px] font-medium text-neutral-400 dark:text-fg-faint !opacity-1
             {{-- ============ DESKTOP SIDEBAR (below top bar) ============ --}}
             <div class="hidden lg:fixed lg:top-12 lg:bottom-0 lg:left-0 lg:z-40 lg:flex lg:flex-col min-w-0"
                 :class="[collapsed ? 'lg:w-16' : 'lg:w-56', sidebarReady ? 'transition-[width] duration-200' : '']">
-                <div class="flex flex-col overflow-y-auto grow scrollbar min-w-0">
+                <div class="flex grow min-w-0 flex-col overflow-visible">
                     <x-navbar />
                 </div>
             </div>
diff --git a/resources/views/livewire/project/application/deployment/show.blade.php b/resources/views/livewire/project/application/deployment/show.blade.php
index 976aaedf8..7e1225bb6 100644
--- a/resources/views/livewire/project/application/deployment/show.blade.php
+++ b/resources/views/livewire/project/application/deployment/show.blade.php
@@ -5,7 +5,7 @@ class="flex min-h-[calc(100dvh-7.5rem)] flex-col xl:h-[calc(100dvh-7.5rem)] xl:m
         </x-slot>
         <livewire:project.shared.configuration-checker :resource="$application" />
         <livewire:project.application.heading :application="$application" wire:key="application-heading-deployment-show" />
-        <section class="application-settings-workspace flex min-h-0 w-full max-w-[1180px] flex-1">
+        <section class="application-settings-workspace mt-4 flex min-h-0 w-full max-w-[1180px] flex-1 lg:mt-0">
             <div class="grid min-h-0 min-w-0 flex-1 gap-8 xl:grid-cols-[210px_minmax(0,1fr)] xl:gap-10">
                 <x-application.configuration-sidebar :application="$application" :flush="true"
                     current-route="project.application.deployment.show" />
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 9c2189e97..b9fe4d964 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -183,11 +183,11 @@ class="listbox-panel top-full! left-0! right-0! mt-1! w-full! min-w-0!" role="me
             </div>
         </div>
 
-        {{-- Layer-2 top nav: one unified bar — menus left, actions right --}}
-        <div
-            class="hidden w-full items-center xl:fixed xl:top-14 xl:right-4 xl:z-30 xl:flex xl:h-12 xl:w-auto xl:border-0 xl:bg-transparent xl:p-0 xl:backdrop-blur-none xl:dark:bg-transparent">
+        {{-- Desktop actions live in the fixed top bar so they cannot overlap page content. --}}
+        @teleport('#resource-action-hud-slot')
+        <div class="hidden w-full items-center xl:flex xl:w-auto">
             <div
-                class="resource-heading-navbar application-heading-actions flex w-full min-w-0 items-center justify-start gap-2 overflow-visible rounded-[10px] border border-neutral-200 bg-neutral-100 p-1 xl:w-auto xl:justify-end dark:border-white/[0.07] dark:bg-white/[0.035]">
+                class="resource-heading-navbar application-heading-actions flex w-full min-w-0 items-center justify-start gap-1 overflow-visible xl:w-auto xl:justify-end">
                 <div class="resource-heading-actions flex shrink-0 items-center gap-0.5">
                     {{-- Status badge temporarily hidden — will be redesigned later:
                          <x-status.index :resource="$application" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" /> --}}
@@ -282,5 +282,6 @@ class="listbox-panel top-full! right-0! left-auto! mt-1! w-60! min-w-0!" role="m
                 </div>
             </div>
         </div>
+        @endteleport
     </div>
 </nav>
diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index 6c1d43bc3..9f8be9338 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -151,9 +151,10 @@ class="listbox-panel top-full! left-0! right-0! mt-1! w-full! min-w-0!" role="me
 
         </div>
 
-        <div class="hidden w-full items-center xl:fixed xl:top-14 xl:right-4 xl:z-30 xl:flex xl:h-12 xl:w-auto">
+        @teleport('#resource-action-hud-slot')
+        <div class="hidden w-full items-center xl:flex xl:w-auto">
             <div
-                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-2 overflow-visible rounded-[10px] border border-neutral-200 bg-neutral-100 p-1 dark:border-white/[0.07] dark:bg-white/[0.035]">
+                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-1 overflow-visible">
                 <div class="resource-heading-actions flex shrink-0 items-center gap-0.5">
                     @if ($database->destination->server->isFunctional())
                         @if (! $databaseStatus->startsWith('exited'))
@@ -193,6 +194,7 @@ class="listbox-panel top-full! right-0! left-auto! mt-1! w-52! min-w-0!" role="m
                 </div>
             </div>
         </div>
+        @endteleport
 
     </div>
 
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 5878d4e48..04648d7e1 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -107,10 +107,7 @@ class="flex size-6.5 items-center justify-center rounded-md transition-colors"
                             class="group relative flex min-h-28 flex-col rounded-xl border border-neutral-200 bg-white p-3 shadow-sm transition-all hover:-translate-y-px hover:border-neutral-300 hover:shadow-md dark:border-white/[0.08] dark:bg-white/[0.025] dark:hover:border-white/[0.14]">
                             <a :href="project.href" {{ wireNavigate() }} class="absolute inset-0 rounded-xl"
                                 :aria-label="`Open ${project.name}`"></a>
-                            <x-reicon name="arrow-right"
-                                class="pointer-events-none absolute top-1/2 right-3 size-3.5 -translate-y-1/2 text-neutral-300 opacity-0 transition-all group-hover:translate-x-0.5 group-hover:opacity-100 dark:text-fg-faint" />
-
-                            <div class="flex items-start gap-3 pr-6">
+                            <div class="flex items-start gap-3">
                                 <div
                                     class="flex size-8 shrink-0 items-center justify-center rounded-lg border border-neutral-200 bg-neutral-50 text-neutral-500 dark:border-white/[0.08] dark:bg-white/[0.04] dark:text-fg-dim">
                                     <x-reicon name="projects" class="size-4" />
diff --git a/resources/views/livewire/project/service/heading.blade.php b/resources/views/livewire/project/service/heading.blade.php
index 4173f139f..fcd6afd0b 100644
--- a/resources/views/livewire/project/service/heading.blade.php
+++ b/resources/views/livewire/project/service/heading.blade.php
@@ -183,9 +183,10 @@ class="listbox-panel top-full! left-0! right-0! mt-1! w-full! min-w-0!" role="me
             </div>
         </div>
 
-        <div class="hidden w-full items-center xl:fixed xl:top-14 xl:right-4 xl:z-30 xl:flex xl:h-12 xl:w-auto">
+        @teleport('#resource-action-hud-slot')
+        <div class="hidden w-full items-center xl:flex xl:w-auto">
             <div
-                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-2 overflow-visible rounded-[10px] border border-neutral-200 bg-neutral-100 p-1 dark:border-white/[0.07] dark:bg-white/[0.035]">
+                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-1 overflow-visible">
                 <div class="resource-heading-actions flex shrink-0 items-center gap-0.5">
                     @if ($service->isDeployable)
                         <x-services.advanced :service="$service" />
@@ -229,6 +230,7 @@ class="listbox-panel top-full! right-0! left-auto! mt-1! w-52! min-w-0!" role="m
                 </div>
             </div>
         </div>
+        @endteleport
 
     </div>
 
diff --git a/resources/views/livewire/server/index.blade.php b/resources/views/livewire/server/index.blade.php
index f43014e67..31f7fa470 100644
--- a/resources/views/livewire/server/index.blade.php
+++ b/resources/views/livewire/server/index.blade.php
@@ -100,9 +100,7 @@ class="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4">
                 <template x-for="server in filteredServers" :key="server.uuid">
                     <a :href="server.href" {{ wireNavigate() }}
                         class="group relative flex min-h-28 flex-col rounded-xl border border-neutral-200 bg-white p-3 shadow-sm transition-all hover:-translate-y-px hover:border-neutral-300 hover:no-underline hover:shadow-md dark:border-white/[0.08] dark:bg-white/[0.025] dark:hover:border-white/[0.14]">
-                        <x-reicon name="arrow-right"
-                            class="pointer-events-none absolute top-1/2 right-3 size-3.5 -translate-y-1/2 text-neutral-300 opacity-0 transition-all group-hover:translate-x-0.5 group-hover:opacity-100 dark:text-fg-faint" />
-                        <div class="flex items-start gap-3 pr-6">
+                        <div class="flex items-start gap-3">
                             <div
                                 class="flex size-8 shrink-0 items-center justify-center rounded-lg border border-neutral-200 bg-neutral-50 text-neutral-500 dark:border-white/[0.08] dark:bg-white/[0.04] dark:text-fg-dim">
                                 <x-reicon name="servers" class="size-4" />
diff --git a/resources/views/livewire/server/navbar.blade.php b/resources/views/livewire/server/navbar.blade.php
index f0961731d..9d7964bab 100644
--- a/resources/views/livewire/server/navbar.blade.php
+++ b/resources/views/livewire/server/navbar.blade.php
@@ -250,9 +250,10 @@ class="listbox-panel top-full! left-0! right-0! mt-1! w-full! min-w-0!" role="me
             </div>
         </div>
 
-        <div class="hidden xl:fixed xl:top-14 xl:right-4 xl:z-30 xl:flex xl:h-12 xl:w-auto xl:items-center">
+        @teleport('#resource-action-hud-slot')
+        <div class="hidden xl:flex xl:w-auto xl:items-center">
             <div
-                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-2 overflow-visible rounded-[10px] border border-neutral-200 bg-neutral-100 p-1 dark:border-white/[0.07] dark:bg-white/[0.035]">
+                class="resource-heading-navbar application-heading-actions flex w-auto min-w-0 items-center justify-end gap-1 overflow-visible">
                 <x-resource-heading-tabs class="hidden" aria-hidden="true">
                     @foreach ($serverMenuItems as $menuItem)
                         <a wire:key="server-primary-nav-{{ str($menuItem['label'])->slug() }}"
@@ -327,6 +328,7 @@ class="size-4 text-coollabs dark:text-warning" />
                 @endif
             </div>
         </div>
+        @endteleport
     </div>
 
     @script
diff --git a/tests/Feature/NavigableCardHoverIndicatorTest.php b/tests/Feature/NavigableCardHoverIndicatorTest.php
index 0745778f3..0ca3245fa 100644
--- a/tests/Feature/NavigableCardHoverIndicatorTest.php
+++ b/tests/Feature/NavigableCardHoverIndicatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-it('shows the shared hover arrow on project and server cards', function () {
+it('uses card hover animation without a right arrow on project and server cards', function () {
     $views = [
         resource_path('views/livewire/project/index.blade.php'),
         resource_path('views/livewire/server/index.blade.php'),
@@ -10,8 +10,9 @@
         $contents = file_get_contents($view);
 
         expect($contents)
-            ->toContain('<x-reicon name="arrow-right"')
-            ->toContain('group-hover:translate-x-0.5 group-hover:opacity-100')
-            ->toContain('pointer-events-none absolute top-1/2 right-3');
+            ->toContain('hover:-translate-y-px')
+            ->toContain('hover:shadow-md')
+            ->not->toContain('group-hover:translate-x-0.5 group-hover:opacity-100')
+            ->not->toContain('pointer-events-none absolute top-1/2 right-3');
     }
 });
diff --git a/tests/Feature/ResourceHeadingUnifiedNavbarTest.php b/tests/Feature/ResourceHeadingUnifiedNavbarTest.php
index 0eed129af..4a6a11728 100644
--- a/tests/Feature/ResourceHeadingUnifiedNavbarTest.php
+++ b/tests/Feature/ResourceHeadingUnifiedNavbarTest.php
@@ -22,9 +22,9 @@
         ->toContain('justify-start')
         ->toContain('xl:justify-end')
         ->toContain('xl:w-auto')
-        ->toContain('xl:bg-transparent')
-        ->toContain('xl:fixed')
-        ->toContain('xl:top-14')
+        ->toContain("@teleport('#resource-action-hud-slot')")
+        ->not->toContain('xl:fixed')
+        ->not->toContain('xl:top-14')
         ->toContain('xl:hidden')
         ->not->toContain('application-primary-tabs')
         ->not->toContain("typeof collapsed !== 'undefined'")
@@ -33,6 +33,55 @@
         ->not->toContain('border-l border-neutral-200 pl-1');
 });
 
+it('docks desktop resource actions in the top bar instead of floating over content', function () {
+    $layout = file_get_contents(resource_path('views/layouts/app.blade.php'));
+    $files = [
+        resource_path('views/livewire/project/application/heading.blade.php'),
+        resource_path('views/livewire/project/service/heading.blade.php'),
+        resource_path('views/livewire/project/database/heading.blade.php'),
+        resource_path('views/livewire/server/navbar.blade.php'),
+    ];
+
+    expect($layout)->toContain('id="resource-action-hud-slot"');
+
+    foreach ($files as $path) {
+        $contents = file_get_contents($path);
+
+        expect($contents)
+            ->toContain("@teleport('#resource-action-hud-slot')")
+            ->not->toContain('xl:fixed xl:top-14 xl:right-4');
+
+        $desktopHud = str($contents)->after("@teleport('#resource-action-hud-slot')")->before('@endteleport')->toString();
+
+        expect($desktopHud)
+            ->not->toContain('rounded-[10px]')
+            ->not->toContain('border-neutral-200')
+            ->not->toContain('bg-neutral-100')
+            ->not->toContain('dark:bg-white/[0.035]');
+    }
+});
+
+it('places the account menu beside the desktop sidebar toggle while retaining it on mobile', function () {
+    $layout = file_get_contents(resource_path('views/layouts/app.blade.php'));
+    $navbar = file_get_contents(resource_path('views/components/navbar.blade.php'));
+    $accountMenu = file_get_contents(resource_path('views/components/top-user-menu.blade.php'));
+
+    expect($layout)
+        ->not->toContain("{{-- Right cluster --}}\n                    <x-top-user-menu />")
+        ->toContain('<x-top-user-menu />')
+        ->toContain('flex grow min-w-0 flex-col overflow-visible');
+
+    expect(substr_count($layout, '<x-top-user-menu />'))->toBe(1);
+
+    expect($navbar)
+        ->toContain('<x-top-user-menu sidebar />')
+        ->toContain('Toggle sidebar');
+
+    expect($accountMenu)
+        ->toContain("'sidebar' => false")
+        ->toContain("'bottom-full! left-0! right-auto! top-auto! mb-1!' => \$sidebar");
+});
+
 it('keeps application links next to advanced actions on the right', function () {
     $application = file_get_contents(resource_path('views/livewire/project/application/heading.blade.php'));
     $links = file_get_contents(resource_path('views/components/applications/links.blade.php'));
@@ -168,6 +217,17 @@
         ->and($css)->toContain('overflow: visible;');
 });
 
+it('uses the same mobile heading gap on deployment pages as application settings', function () {
+    $configuration = file_get_contents(resource_path('views/livewire/project/application/configuration.blade.php'));
+    $deploymentIndex = file_get_contents(resource_path('views/livewire/project/application/deployment/index.blade.php'));
+    $deploymentShow = file_get_contents(resource_path('views/livewire/project/application/deployment/show.blade.php'));
+
+    expect($configuration)->toContain('application-settings-workspace mt-4')
+        ->and($deploymentIndex)->toContain("'mt-4 max-w-[1180px] lg:mt-0' => ! \$embedded")
+        ->and($deploymentShow)->toContain('application-settings-workspace mt-4')
+        ->toContain('lg:mt-0');
+});
+
 it('removes desktop top spacing from the deployment log viewer', function () {
     $deployment = file_get_contents(resource_path('views/livewire/project/application/deployment/show.blade.php'));