diff --git a/next.config.js b/next.config.js
index 41f8c66..c7c6037 100644
--- a/next.config.js
+++ b/next.config.js
@@ -49,9 +49,9 @@ const nextConfig = {
               "default-src 'self'",
               "script-src 'self' 'unsafe-inline' 'unsafe-eval' blob:",
               "style-src 'self' 'unsafe-inline'",
-              "img-src 'self' data: blob: https://*.tile.openstreetmap.org https://api.maptiler.com https://server.arcgisonline.com https://wmts.geo.admin.ch https://wmts0.geo.admin.ch https://wmts1.geo.admin.ch https://wmts2.geo.admin.ch https://wmts3.geo.admin.ch https://wmts4.geo.admin.ch http://localhost:9000 http://minio:9000",
+              "img-src 'self' data: blob: https://*.tile.openstreetmap.org https://api.maptiler.com https://server.arcgisonline.com https://*.geo.admin.ch http://localhost:9000 http://minio:9000",
               "font-src 'self' data:",
-              "connect-src 'self' ws: wss: https://api.maptiler.com https://*.tile.openstreetmap.org https://api.open-meteo.com https://server.arcgisonline.com https://wmts.geo.admin.ch https://wmts0.geo.admin.ch https://wmts1.geo.admin.ch https://wmts2.geo.admin.ch https://wmts3.geo.admin.ch https://wmts4.geo.admin.ch",
+              "connect-src 'self' ws: wss: https://api.maptiler.com https://*.tile.openstreetmap.org https://api.open-meteo.com https://server.arcgisonline.com https://*.geo.admin.ch",
               "frame-ancestors 'self'",
               "base-uri 'self'",
               "form-action 'self'",
diff --git a/package.json b/package.json
index 499c6e7..1c99256 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lageplan",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Feuerwehr Lageplan - Krokier-App für Einsatzdokumentation",
   "private": true,
   "scripts": {
diff --git a/public/sw.js b/public/sw.js
index 3aab8b4..6324689 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -87,8 +87,8 @@ self.addEventListener('fetch', (event) => {
   // Other API requests: network only
   if (pathname.startsWith('/api/')) return
 
-  // Cache map tiles from OpenStreetMap / MapTiler (Cache First — tiles don't change)
-  if (url.includes('tile.openstreetmap.org') || url.includes('api.maptiler.com')) {
+  // Cache map tiles from OSM / MapTiler / ArcGIS / Swisstopo (Cache First — tiles don't change)
+  if (url.includes('tile.openstreetmap.org') || url.includes('api.maptiler.com') || url.includes('server.arcgisonline.com') || url.includes('geo.admin.ch')) {
     event.respondWith(
       caches.open(TILE_CACHE).then((cache) =>
         cache.match(event.request).then((cached) => {
diff --git a/src/components/map/map-view.tsx b/src/components/map/map-view.tsx
index d12580b..c1ca262 100644
--- a/src/components/map/map-view.tsx
+++ b/src/components/map/map-view.tsx
@@ -696,7 +696,7 @@ export function MapView({
             ],
             tileSize: 256,
             attribution: '© swisstopo',
-            maxzoom: 18,
+            maxzoom: 17,
           },
           'swissimage': {
             type: 'raster',
@@ -705,7 +705,7 @@ export function MapView({
             ],
             tileSize: 256,
             attribution: '© swisstopo SWISSIMAGE',
-            maxzoom: 20,
+            maxzoom: 18,
           },
         },
         layers: [
@@ -2154,39 +2154,34 @@ export function MapView({
         </>
       )}
 
-      {/* Layer toggle: cycle through base maps */}
-      <button
-        onClick={() => {
+      {/* Layer selector dropdown */}
+      <select
+        value={activeBaseLayer}
+        onChange={(e) => {
           if (!map.current) return
-          const layers: Array<'osm' | 'satellite' | 'swisstopo' | 'swissimage'> = ['osm', 'satellite', 'swisstopo', 'swissimage']
-          const currentIdx = layers.indexOf(activeBaseLayer)
-          const nextLayer = layers[(currentIdx + 1) % layers.length]
-          for (const l of layers) {
-            map.current.setLayoutProperty(l, 'visibility', l === nextLayer ? 'visible' : 'none')
+          const newLayer = e.target.value as 'osm' | 'satellite' | 'swisstopo' | 'swissimage'
+          const allLayers: Array<'osm' | 'satellite' | 'swisstopo' | 'swissimage'> = ['osm', 'satellite', 'swisstopo', 'swissimage']
+          for (const l of allLayers) {
+            map.current.setLayoutProperty(l, 'visibility', l === newLayer ? 'visible' : 'none')
           }
-          setActiveBaseLayer(nextLayer)
+          setActiveBaseLayer(newLayer)
         }}
-        className="absolute top-3 right-3 z-10 flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg text-xs font-semibold shadow-lg border transition-colors"
+        className="absolute top-3 right-3 z-10 px-2.5 py-1.5 rounded-lg text-xs font-semibold shadow-lg border transition-colors cursor-pointer appearance-none pr-7"
         style={{
-          background: activeBaseLayer !== 'osm' ? 'rgba(0,0,0,0.7)' : 'rgba(255,255,255,0.95)',
+          background: activeBaseLayer !== 'osm' ? 'rgba(0,0,0,0.75)' : 'rgba(255,255,255,0.95)',
           color: activeBaseLayer !== 'osm' ? '#fff' : '#333',
           borderColor: activeBaseLayer !== 'osm' ? 'rgba(255,255,255,0.3)' : 'rgba(0,0,0,0.15)',
+          backgroundImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='${activeBaseLayer !== 'osm' ? 'white' : '%23333'}' stroke-width='2'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E")`,
+          backgroundRepeat: 'no-repeat',
+          backgroundPosition: 'right 6px center',
         }}
-        title="Kartenstil wechseln"
+        title="Kartenstil wählen"
       >
-        {activeBaseLayer === 'osm' && (
-          <><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><circle cx="12" cy="12" r="10"/><path d="M12 2a14.5 14.5 0 0 0 0 20 14.5 14.5 0 0 0 0-20"/><path d="M2 12h20"/></svg>Satellit</>
-        )}
-        {activeBaseLayer === 'satellite' && (
-          <><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M3 7l6-3 6 3 6-3v13l-6 3-6-3-6 3z"/><path d="M9 4v13"/><path d="M15 7v13"/></svg>Swisstopo</>
-        )}
-        {activeBaseLayer === 'swisstopo' && (
-          <><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><circle cx="12" cy="12" r="10"/><path d="M12 2a14.5 14.5 0 0 0 0 20 14.5 14.5 0 0 0 0-20"/><path d="M2 12h20"/></svg>Luftbild CH</>
-        )}
-        {activeBaseLayer === 'swissimage' && (
-          <><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M3 7l6-3 6 3 6-3v13l-6 3-6-3-6 3z"/><path d="M9 4v13"/><path d="M15 7v13"/></svg>OSM</>
-        )}
-      </button>
+        <option value="osm">🗺️ OpenStreetMap</option>
+        <option value="satellite">🛰️ Satellit (Esri)</option>
+        <option value="swisstopo">🇨🇭 Swisstopo Karte</option>
+        <option value="swissimage">🇨🇭 Swisstopo Luftbild</option>
+      </select>
 
       {/* Zeichnung abschliessen Button (Linie/Polygon/Pfeil) */}
       {(drawMode === 'linestring' || drawMode === 'polygon' || drawMode === 'arrow' || drawMode === 'dangerzone') && drawingPointCount >= 2 && (