diff --git a/app/components/navigation/MainNavigation.vue b/app/components/navigation/MainNavigation.vue
index 33ed4ff..9c831c9 100644
--- a/app/components/navigation/MainNavigation.vue
+++ b/app/components/navigation/MainNavigation.vue
@@ -12,11 +12,11 @@
           <span class="font-bold text-xl" :class="useWhiteText ? 'text-white' : 'text-base-content'">Optovia</span>
         </NuxtLink>
 
-        <!-- Service nav links (hide in client area) -->
-        <nav v-if="showModeToggle && !isClientArea" class="flex items-center gap-1">
+        <!-- Service nav links -->
+        <nav v-if="showModeToggle" class="flex items-center gap-1">
           <button
             class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
-            :class="showActiveMode && catalogMode === 'explore'
+            :class="showActiveMode && catalogMode === 'explore' && !isClientArea
               ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
               : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
             @click="$emit('set-catalog-mode', 'explore')"
@@ -25,13 +25,23 @@
           </button>
           <button
             class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
-            :class="showActiveMode && catalogMode === 'quote'
+            :class="showActiveMode && catalogMode === 'quote' && !isClientArea
               ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
               : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
             @click="$emit('set-catalog-mode', 'quote')"
           >
             {{ $t('catalog.modes.quote') }}
           </button>
+          <NuxtLink
+            v-if="loggedIn"
+            :to="localePath('/clientarea/orders')"
+            class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
+            :class="isClientArea
+              ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
+              : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
+          >
+            {{ $t('cabinetNav.cabinet') }}
+          </NuxtLink>
         </nav>
       </div>
 
@@ -177,19 +187,8 @@
         </template>
       </div>
 
-      <!-- Right: Cabinet + AI + Globe + Team + User (top aligned like logo) -->
+      <!-- Right: AI + Globe + Team + User (top aligned like logo) -->
       <div class="flex items-start gap-1 flex-shrink-0 pt-4">
-        <!-- Cabinet button (when logged in and not in client area) -->
-        <NuxtLink
-          v-if="loggedIn && !isClientArea"
-          :to="localePath('/clientarea/orders')"
-          class="w-8 h-8 rounded-full flex items-center justify-center transition-colors"
-          :class="useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200'"
-          :title="$t('cabinetNav.cabinet')"
-        >
-          <Icon name="lucide:layout-dashboard" size="18" />
-        </NuxtLink>
-
         <!-- AI Assistant button -->
         <NuxtLink
           :to="localePath('/clientarea/ai')"