diff --git a/resources/views/layouts/user.blade.php b/resources/views/layouts/user.blade.php
index 0607c90..188b799 100644
--- a/resources/views/layouts/user.blade.php
+++ b/resources/views/layouts/user.blade.php
@@ -40,8 +40,6 @@
         @include('partials.mobile-bottom-nav', [
             'homeUrl' => route('woo.dashboard'),
             'homeActive' => request()->routeIs('woo.dashboard'),
-            'searchUrl' => route('woo.orders.index'),
-            'searchActive' => request()->routeIs('woo.orders.*'),
             'notificationsUrl' => route('notifications.index'),
             'notificationsActive' => request()->routeIs('notifications.*'),
             'unreadUrl' => route('notifications.unread'),
diff --git a/resources/views/partials/store-switcher.blade.php b/resources/views/partials/store-switcher.blade.php
index 9bac922..ab3f98e 100644
--- a/resources/views/partials/store-switcher.blade.php
+++ b/resources/views/partials/store-switcher.blade.php
@@ -1,15 +1,12 @@
 @if(($wooActiveStores ?? collect())->count() > 0)
     <div class="relative hidden shrink-0 lg:block" x-data="{ open: false }" @click.outside="open = false">
         <button type="button" @click="open = !open"
-                class="flex max-w-[14rem] items-center gap-2 rounded-xl border border-slate-200 bg-slate-50 px-3 py-2 text-left text-sm text-slate-700 hover:bg-white">
-            <svg class="h-4 w-4 shrink-0 text-slate-400" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 21v-7.5a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75V21m-4.5 0H2.36m11.14 0H18m0 0h3.64m-1.39 0V9.349M3.75 21V9.349m0 0a3.001 3.001 0 0 0 3.75-.615A2.993 2.993 0 0 0 9.75 9.75c.896 0 1.7-.393 2.25-1.016a2.993 2.993 0 0 0 2.25 1.016c.896 0 1.7-.393 2.25-1.016a3.001 3.001 0 0 0 3.75.614m-16.5 0a3.004 3.004 0 0 1-.621-4.72L4.318 3.44A1.5 1.5 0 0 1 5.378 3h13.243a1.5 1.5 0 0 1 1.06.44l1.19 1.189a3 3 0 0 1-.621 4.72M6.75 18h3.75a.75.75 0 0 0 .75-.75V13.5a.75.75 0 0 0-.75-.75H6.75a.75.75 0 0 0-.75.75v3.75c0 .414.336.75.75.75Z" />
-            </svg>
+                class="inline-flex max-w-[14rem] items-center gap-1.5 rounded-full border border-slate-200 px-3 py-2 text-sm text-slate-700 transition hover:bg-slate-50">
             <span class="truncate font-medium">{{ $currentWooStore?->site_name ?? parse_url($currentWooStore?->site_url ?? '', PHP_URL_HOST) ?? 'Select store' }}</span>
-            <svg class="ml-auto h-4 w-4 shrink-0 text-slate-400" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/></svg>
+            <svg class="h-4 w-4 shrink-0 text-slate-400" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="m19 9-7 7-7-7"/></svg>
         </button>
         <div x-show="open" x-cloak x-transition
-             class="absolute left-0 top-full z-50 mt-2 w-72 overflow-hidden rounded-xl border border-slate-200 bg-white py-1 shadow-lg">
+             class="absolute right-0 top-full z-50 mt-2 w-72 overflow-hidden rounded-xl border border-slate-200 bg-white py-1 shadow-lg">
             <p class="px-3 py-2 text-xs font-semibold uppercase tracking-wide text-slate-400">Switch store</p>
             @foreach($wooActiveStores as $store)
                 <form method="post" action="{{ route('woo.stores.switch') }}">
diff --git a/resources/views/partials/topbar-desktop-widgets.blade.php b/resources/views/partials/topbar-desktop-widgets.blade.php
index 5e00826..8769e00 100644
--- a/resources/views/partials/topbar-desktop-widgets.blade.php
+++ b/resources/views/partials/topbar-desktop-widgets.blade.php
@@ -1,7 +1,7 @@
 {{--
   Top-right header widgets:
   Mobile — Afia + launcher only (profile/notifications live in bottom nav).
-  Desktop — Afia → notifications → launcher → divider → avatar dropdown.
+  Desktop — store → Afia → notifications → launcher → divider → avatar dropdown.
 --}}
 @php
     $topbarUser = $user ?? auth()->user();
@@ -13,6 +13,8 @@
     $showUserHeader = $showUser ?? true;
 @endphp
 
+@include('partials.store-switcher')
+
 @includeIf('partials.afia-button', ['compact' => true])
 
 @includeIf('partials.notification-dropdown')
diff --git a/resources/views/partials/topbar.blade.php b/resources/views/partials/topbar.blade.php
index 2be86b4..0ea554b 100644
--- a/resources/views/partials/topbar.blade.php
+++ b/resources/views/partials/topbar.blade.php
@@ -10,20 +10,6 @@
         </button>
 
         @include('partials.mobile-topbar-title')
-
-        {{-- Desktop: search (orders) --}}
-        <form method="GET" action="{{ route('woo.orders.index') }}"
-              class="relative hidden w-full max-w-md lg:block"
-              x-data
-              @keydown.window="if ($event.key === '/' && !['INPUT','TEXTAREA','SELECT'].includes($event.target.tagName)) { $event.preventDefault(); $refs.search.focus(); }">
-            <svg class="pointer-events-none absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-slate-400" fill="none" stroke="currentColor" stroke-width="2" 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>
-            <input x-ref="search" type="search" name="q" value="{{ request('q') }}"
-                   placeholder="Search orders…"
-                   class="w-full rounded-xl border border-slate-200 bg-slate-50 py-2 pl-9 pr-10 text-sm text-slate-700 placeholder-slate-400 transition focus:border-indigo-300 focus:bg-white focus:ring-2 focus:ring-indigo-100 focus:outline-none">
-            <kbd class="pointer-events-none absolute right-3 top-1/2 hidden -translate-y-1/2 rounded-md border border-slate-200 bg-white px-1.5 py-0.5 text-[10px] font-medium text-slate-400 sm:inline-block">/</kbd>
-        </form>
-
-        @include('partials.store-switcher')
     </div>
 
     <div class="flex items-center gap-3">