diff --git a/src/pages/MapPage.tsx b/src/pages/MapPage.tsx
index 22b7e89..84164e3 100644
--- a/src/pages/MapPage.tsx
+++ b/src/pages/MapPage.tsx
@@ -1165,53 +1165,58 @@ export default function MapPage() {
 
             {/* Row 2: Entity toggles + Sort/Filter + Add buttons (DESKTOP ONLY) */}
             <div className="hidden md:flex items-center gap-2 mt-2 overflow-x-auto scrollbar-hide -mx-3 px-3 sm:mx-0 sm:px-0">
-              {/* Entity toggles */}
-              <Button
-                variant={showSpots ? 'default' : 'outline'}
-                size="sm"
-                className={cn(
-                  'gap-1 font-bold text-xs px-2.5 h-8 flex-shrink-0 touch-manipulation active:scale-95',
-                  showSpots ? 'bg-red-500 hover:bg-red-600' : 'border-gray-700'
-                )}
-                onClick={() => setShowSpots(!showSpots)}
-              >
-                🛹 <span className="hidden xs:inline">{t('mapPage.spots')}</span>
-              </Button>
-              <Button
-                variant={showShops ? 'default' : 'outline'}
-                size="sm"
-                className={cn(
-                  'gap-1 font-bold text-xs px-2.5 h-8 flex-shrink-0 touch-manipulation active:scale-95',
-                  showShops ? 'bg-purple-600 hover:bg-purple-700' : 'border-gray-700'
-                )}
-                onClick={() => setShowShops(!showShops)}
-              >
-                🏪 <span className="hidden xs:inline">{t('mapPage.shops')}</span>
-              </Button>
-              <Button
-                variant={showGear ? 'default' : 'outline'}
-                size="sm"
-                className={cn(
-                  'gap-1 font-bold text-xs px-2.5 h-8 flex-shrink-0 touch-manipulation active:scale-95',
-                  showGear ? 'bg-orange-500 hover:bg-orange-600' : 'border-gray-700'
-                )}
-                onClick={() => setShowGear(!showGear)}
-              >
-                <ShoppingBag className="h-3.5 w-3.5" />
-                <span className="hidden xs:inline">{t('marketplace.gear')}</span>
-              </Button>
-              <Button
-                variant={showTours ? 'default' : 'outline'}
-                size="sm"
-                className={cn(
-                  'gap-1 font-bold text-xs px-2.5 h-8 flex-shrink-0 touch-manipulation active:scale-95',
-                  showTours ? 'bg-cyan-500 hover:bg-cyan-600' : 'border-gray-700'
-                )}
-                onClick={() => setShowTours(!showTours)}
-              >
-                <Route className="h-3.5 w-3.5" />
-                <span className="hidden xs:inline">Local Tours</span>
-              </Button>
+              {/* Layers — grouped popover (matches the mobile Layers control).
+                  Replaces four separate entity-toggle buttons to declutter the
+                  desktop toolbar while keeping the entity color language. */}
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="gap-1.5 font-bold text-xs px-2.5 h-8 flex-shrink-0 border-gray-700 hover:border-white/30 touch-manipulation active:scale-95"
+                  >
+                    <Layers className="h-3.5 w-3.5" />
+                    <span>Layers</span>
+                    <span className="ml-0.5 min-w-[18px] h-[18px] px-1 text-[10px] font-black bg-[#ccff00] text-black rounded-full flex items-center justify-center leading-none">
+                      {mobileLayerCount}
+                    </span>
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent align="start" className="w-52 p-2 bg-black/95 border-white/15 backdrop-blur-xl">
+                  <p className="text-[10px] font-bold text-muted-foreground uppercase tracking-wider px-1.5 pb-1.5">Show on Map</p>
+                  <div className="space-y-0.5">
+                    {[
+                      { key: 'spots', label: 'Spots', dot: '#ff0040', active: showSpots, toggle: () => setShowSpots(v => !v) },
+                      { key: 'shops', label: 'Shops', dot: '#9333ea', active: showShops, toggle: () => setShowShops(v => !v) },
+                      { key: 'gear',  label: 'Gear',  dot: '#f97316', active: showGear,  toggle: () => setShowGear(v => !v) },
+                      { key: 'tours', label: 'Tours', dot: '#06b6d4', active: showTours, toggle: () => setShowTours(v => !v) },
+                    ].map(({ key, label, dot, active, toggle }) => (
+                      <button
+                        key={key}
+                        onClick={toggle}
+                        className={cn(
+                          'w-full flex items-center gap-2.5 px-1.5 py-2 rounded-lg text-sm font-semibold transition-colors',
+                          active ? 'text-white hover:bg-white/5' : 'text-gray-500 hover:bg-white/5'
+                        )}
+                      >
+                        <span
+                          className={cn('w-2.5 h-2.5 rounded-full flex-shrink-0 transition-opacity', active ? 'opacity-100' : 'opacity-30')}
+                          style={{ backgroundColor: dot }}
+                        />
+                        <span className="flex-1 text-left">{label}</span>
+                        <span
+                          className={cn(
+                            'w-4 h-4 rounded flex items-center justify-center flex-shrink-0 border transition-colors',
+                            active ? 'bg-[#ccff00] border-[#ccff00]' : 'border-white/20'
+                          )}
+                        >
+                          {active && <Check className="h-3 w-3 text-black" strokeWidth={3} />}
+                        </span>
+                      </button>
+                    ))}
+                  </div>
+                </PopoverContent>
+              </Popover>
               
               {/* BTC Map toggle */}
               <Tooltip>
@@ -1548,7 +1553,7 @@ export default function MapPage() {
                     <div className="space-y-0.5">
                       {[
                         { key: 'spots', label: 'Spots', dot: '#ff0040', active: showSpots, toggle: () => setShowSpots(v => !v) },
-                        { key: 'shops', label: 'Shops', dot: '#a855f7', active: showShops, toggle: () => setShowShops(v => !v) },
+                        { key: 'shops', label: 'Shops', dot: '#9333ea', active: showShops, toggle: () => setShowShops(v => !v) },
                         { key: 'gear',  label: 'Gear',  dot: '#f97316', active: showGear,  toggle: () => setShowGear(v => !v) },
                         { key: 'tours', label: 'Tours', dot: '#06b6d4', active: showTours, toggle: () => setShowTours(v => !v) },
                       ].map(({ key, label, dot, active, toggle }) => (
@@ -1594,7 +1599,7 @@ export default function MapPage() {
                     <>
                       {[
                         { label: 'Add Spot',  to: '/create-spot',  bg: 'bg-[#ff0040]', icon: <MapPin className="h-4 w-4 text-white" /> },
-                        { label: 'Add Shop',  to: '/create-shop',  bg: 'bg-[#a855f7]', icon: <Store className="h-4 w-4 text-white" /> },
+                        { label: 'Add Shop',  to: '/create-shop',  bg: 'bg-[#9333ea]', icon: <Store className="h-4 w-4 text-white" /> },
                         { label: 'Offer Tour', to: '/create-tour', bg: 'bg-[#06b6d4]', icon: <Route className="h-4 w-4 text-white" /> },
                       ].map((a, i) => (
                         <Link