diff --git a/resources/views/partials/mobile-bottom-nav.blade.php b/resources/views/partials/mobile-bottom-nav.blade.php
index 8613313..499483f 100644
--- a/resources/views/partials/mobile-bottom-nav.blade.php
+++ b/resources/views/partials/mobile-bottom-nav.blade.php
@@ -1,5 +1,9 @@
 @php
-    $gridCols = !empty($centerCompose) ? 'grid-cols-5' : 'grid-cols-4';
+    $showSearch = isset($searchUrl) && $searchUrl !== null && $searchUrl !== '#';
+    $gridCols = match (true) {
+        ! empty($centerCompose) => $showSearch ? 'grid-cols-5' : 'grid-cols-4',
+        default => $showSearch ? 'grid-cols-4' : 'grid-cols-3',
+    };
     $avatarUrl = $avatarUrl ?? null;
     $initials = $initials ?? 'U';
     $notificationsUrl = $notificationsUrl ?? '#';
@@ -23,11 +27,13 @@
                 <span class="text-[10px] font-medium">Home</span>
             </a>
 
-            <a href="{{ $searchUrl }}"
-               class="flex flex-col items-center justify-center gap-1 px-2 py-2 transition hover:text-slate-900 {{ $navActive($searchActive ?? false) }}">
-                <svg class="h-6 w-6" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z"/></svg>
-                <span class="text-[10px] font-medium">Search</span>
-            </a>
+            @if ($showSearch)
+                <a href="{{ $searchUrl }}"
+                   class="flex flex-col items-center justify-center gap-1 px-2 py-2 transition hover:text-slate-900 {{ $navActive($searchActive ?? false) }}">
+                    <svg class="h-6 w-6" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z"/></svg>
+                    <span class="text-[10px] font-medium">Search</span>
+                </a>
+            @endif
 
             @if (!empty($centerCompose))
                 <div class="flex items-center justify-center">
diff --git a/resources/views/partials/topbar-desktop-widgets.blade.php b/resources/views/partials/topbar-desktop-widgets.blade.php
index bb1eca5..5e00826 100644
--- a/resources/views/partials/topbar-desktop-widgets.blade.php
+++ b/resources/views/partials/topbar-desktop-widgets.blade.php
@@ -1,6 +1,7 @@
 {{--
-  Standard desktop top-right widgets (CRM / Invoice layout):
-  Afia → notifications → launcher → divider → avatar dropdown.
+  Top-right header widgets:
+  Mobile — Afia + launcher only (profile/notifications live in bottom nav).
+  Desktop — Afia → notifications → launcher → divider → avatar dropdown.
 --}}
 @php
     $topbarUser = $user ?? auth()->user();
@@ -22,7 +23,7 @@
 
 <div class="hidden h-8 w-px bg-slate-200 lg:block"></div>
 
-<div class="relative" x-data="{ profileOpen: false }" @click.outside="profileOpen = false" @keydown.escape.window="profileOpen = false">
+<div class="relative hidden lg:block" x-data="{ profileOpen: false }" @click.outside="profileOpen = false" @keydown.escape.window="profileOpen = false">
     <button type="button" @click="profileOpen = !profileOpen"
             class="inline-flex items-center gap-2 rounded-full border border-slate-200 px-2 py-1.5 text-slate-700 transition hover:bg-slate-50">
         @if ($avatarUrl)