diff --git a/app/components/navigation/MainNavigation.vue b/app/components/navigation/MainNavigation.vue
index e581a26..2475a7f 100644
--- a/app/components/navigation/MainNavigation.vue
+++ b/app/components/navigation/MainNavigation.vue
@@ -24,7 +24,7 @@
         <div v-if="showModeToggle" class="flex items-center px-3 py-2">
           <nav class="flex items-center gap-1">
             <button
-              class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
+              class="px-3 py-1 text-sm font-medium rounded-full transition-colors"
               :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')"
@@ -33,7 +33,7 @@
               {{ $t('catalog.modes.explore') }}
             </button>
             <button
-              class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
+              class="px-3 py-1 text-sm font-medium rounded-full transition-colors"
               :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')"
diff --git a/app/components/page/CatalogPage.vue b/app/components/page/CatalogPage.vue
index 9801721..6ee668f 100644
--- a/app/components/page/CatalogPage.vue
+++ b/app/components/page/CatalogPage.vue
@@ -54,7 +54,7 @@
     <!-- Filter by bounds checkbox (LEFT, next to panel when open) - only in selection mode -->
     <label
       v-if="selectMode !== null"
-      class="absolute top-[116px] left-[420px] z-20 hidden lg:flex items-center gap-2 glass-soft rounded-full px-3 py-1.5 cursor-pointer text-white text-sm hover:bg-white/15 transition-colors"
+      class="absolute top-[116px] left-[calc(1rem+32rem+1rem)] z-20 hidden lg:flex items-center gap-2 glass-soft rounded-full px-3 py-1.5 cursor-pointer text-white text-sm hover:bg-white/15 transition-colors"
     >
       <input
         type="checkbox"
@@ -72,7 +72,7 @@
       <div class="flex gap-1 glass-bright rounded-full p-1">
         <button
           v-if="showOffersToggle"
-          class="flex items-center gap-2 px-3 py-1.5 rounded-md text-sm font-medium transition-colors"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
           :class="mapViewMode === 'offers' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
           @click="setMapViewMode('offers')"
         >
@@ -83,7 +83,7 @@
         </button>
         <button
           v-if="showHubsToggle"
-          class="flex items-center gap-2 px-3 py-1.5 rounded-md text-sm font-medium transition-colors"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
           :class="mapViewMode === 'hubs' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
           @click="setMapViewMode('hubs')"
         >
@@ -94,7 +94,7 @@
         </button>
         <button
           v-if="showSuppliersToggle"
-          class="flex items-center gap-2 px-3 py-1.5 rounded-md text-sm font-medium transition-colors"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
           :class="mapViewMode === 'suppliers' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
           @click="setMapViewMode('suppliers')"
         >
@@ -136,7 +136,7 @@
         <div v-if="!isInfoMode && !hideViewToggle" class="flex gap-1 glass-bright rounded-full p-1">
           <button
             v-if="showOffersToggle"
-            class="flex items-center justify-center w-8 h-8 rounded-md transition-colors"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
             :class="mapViewMode === 'offers' ? 'bg-white/20' : 'hover:bg-white/10'"
             @click="setMapViewMode('offers')"
           >
@@ -146,7 +146,7 @@
           </button>
           <button
             v-if="showHubsToggle"
-            class="flex items-center justify-center w-8 h-8 rounded-md transition-colors"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
             :class="mapViewMode === 'hubs' ? 'bg-white/20' : 'hover:bg-white/10'"
             @click="setMapViewMode('hubs')"
           >
@@ -156,7 +156,7 @@
           </button>
           <button
             v-if="showSuppliersToggle"
-            class="flex items-center justify-center w-8 h-8 rounded-md transition-colors"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
             :class="mapViewMode === 'suppliers' ? 'bg-white/20' : 'hover:bg-white/10'"
             @click="setMapViewMode('suppliers')"
           >