diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index 74bd40aea..96ffc3438 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -159,6 +159,13 @@
     border-radius: 10px !important;
 }
 
+.ra-24,
+.ra-24 > a,
+.rounded-24,
+.rounded-24 > a {
+    border-radius: 24px !important;
+}
+
 #photoprism div.v-dialog.v-dialog--fullscreen > div.v-card {
     border-radius: 0;
 }
diff --git a/frontend/src/css/maps.css b/frontend/src/css/maps.css
index df163281b..bbeb99a2b 100644
--- a/frontend/src/css/maps.css
+++ b/frontend/src/css/maps.css
@@ -3,25 +3,29 @@
 #photoprism .map-control {
     position: absolute;
     background: transparent;
-    bottom: 35px;
-    right: 30px;
+    top: 10px;
+    left: 10px;
     z-index: 2;
 }
 
 #photoprism.is-rtl .map-control {
-    right: auto;
-    left: 30px;
+    left: auto;
+    right: 10px;
+}
+
+#photoprism .map-control .map-control-search {
+    overflow: hidden;
+    border-radius: 24px;
 }
 
 #photoprism #map .marker {
     box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12) !important;
     background-color: rgba(0, 0, 0, 0.3);
-    border-color: #fff;
     color: rgba(0, 0, 0, 0.87);
     display: block;
-    border-radius: 20%;
+    border-radius: 50%;
     cursor: pointer;
-    border: 1px solid #7f7f7f;
+    border: 1px solid #ffffff99;
 }
 
 #photoprism #map .cluster-marker {
@@ -29,31 +33,30 @@
     grid-template-columns: 1fr 1fr;
     grid-gap: 1px;
     overflow: hidden;
-    background-color: #7f7f7f;
+    background-color: #ffffff99;
     width: 100%;
     height: 100%
 }
 
 #photoprism #map .counter-bubble {
-  border-radius: 100%;
-  position: absolute;
-  width: 24px;
-  height: 24px;
-  font-size: 12px;
-  display: flex;
-  background-color: #bb3719;
-  top: -12px;
-  right: -12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px 0px rgb(0 0 0 / 14%), 0px 1px 5px 0px rgb(0 0 0 / 12%);
+    border-radius: 100%;
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    font-size: 12px;
+    display: flex;
+    color: #ffffff;
+    top: -6px;
+    right: -6px;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px 0px rgb(0 0 0 / 14%), 0px 1px 5px 0px rgb(0 0 0 / 12%);
 }
 
 #photoprism #map .cluster-marker > div {
-  width: 100%;
-  height: 100%;
-  background-size: cover;
+    width: 100%;
+    height: 100%;
+    background-size: cover;
 }
 
 #photoprism .maplibregl-ctrl-attrib-inner a {
diff --git a/frontend/src/css/themes/abyss.css b/frontend/src/css/themes/abyss.css
index 3a37917b2..35ae6cf50 100644
--- a/frontend/src/css/themes/abyss.css
+++ b/frontend/src/css/themes/abyss.css
@@ -33,8 +33,8 @@ body.dark-theme.theme-abyss,
     background: #333;
 }
 
-#photoprism.theme-abyss .theme--light.v-text-field--solo > .v-input__control > .v-input__slot {
-    background: #262626;
+#photoprism.theme-abyss .theme--light.v-text-field--solo>.v-input__control>.v-input__slot {
+    background: rgba(250, 250, 255, 0.1);
 }
 
 #photoprism.theme-abyss .theme--light.v-input--selection-controls.v-input--is-disabled .v-icon {
diff --git a/frontend/src/css/themes/chrome.css b/frontend/src/css/themes/chrome.css
index b3c2b4ceb..f648cb27e 100644
--- a/frontend/src/css/themes/chrome.css
+++ b/frontend/src/css/themes/chrome.css
@@ -69,6 +69,19 @@ body.dark-theme #photoprism.theme-chrome #p-navigation .navigation-menu .theme--
     color: rgba(255, 255, 255, 0.2)!important;
 }
 
+body.dark-theme #photoprism.theme-chrome #map .secondary-dark.theme--light,
+body.dark-theme #photoprism.theme-chrome #map .secondary-dark--text {
+    color: #000000!important;
+    caret-color: #000000!important;
+    stroke: #000000!important;
+}
+
+body.dark-theme #photoprism.theme-chrome .map-control .theme--light {
+    color: #757575;
+    caret-color: #757575;
+    stroke: #757575;
+}
+
 body.dark-theme #photoprism.theme-chrome .v-card .theme--light.v-text-field--box>.v-input__control>.v-input__slot {
     background: rgba(255, 255, 255, 0.04);
 }
diff --git a/frontend/src/css/themes/default.css b/frontend/src/css/themes/default.css
index b05993e34..68b9d7639 100644
--- a/frontend/src/css/themes/default.css
+++ b/frontend/src/css/themes/default.css
@@ -69,7 +69,6 @@ body.dark-theme .theme--light.v-card {
     background: #2f3031;
 }
 
-body.dark-theme .theme--light.v-text-field--solo>.v-input__control>.v-input__slot,
 body.dark-theme .theme--light.v-text-field--solo>.v-input__control>.v-input__slot {
     background: rgba(250, 250, 255, 0.1);
 }
diff --git a/frontend/src/options/themes.js b/frontend/src/options/themes.js
index 85e40e18b..103012ae2 100644
--- a/frontend/src/options/themes.js
+++ b/frontend/src/options/themes.js
@@ -36,6 +36,7 @@ let themes = {
     },
   },
   abyss: {
+    title: "Abyss",
     name: "abyss",
     dark: true,
     sponsor: true,
@@ -131,6 +132,7 @@ let themes = {
     },
   },
   gemstone: {
+    title: "Gemstone",
     name: "gemstone",
     dark: true,
     sponsor: true,
@@ -162,6 +164,7 @@ let themes = {
     },
   },
   grayscale: {
+    title: "Grayscale",
     name: "grayscale",
     dark: true,
     sponsor: false,
@@ -193,6 +196,7 @@ let themes = {
     },
   },
   lavender: {
+    title: "Lavender",
     name: "lavender",
     dark: false,
     sponsor: false,
@@ -224,6 +228,7 @@ let themes = {
     },
   },
   legacy: {
+    title: "Legacy",
     name: "legacy",
     dark: false,
     sponsor: false,
@@ -287,6 +292,7 @@ let themes = {
     },
   },
   neon: {
+    title: "Neon",
     name: "neon",
     dark: true,
     sponsor: true,
@@ -350,6 +356,7 @@ let themes = {
     },
   },
   onyx: {
+    title: "Onyx",
     name: "onyx",
     dark: false,
     sponsor: false,
@@ -381,6 +388,7 @@ let themes = {
     },
   },
   shadow: {
+    title: "Shadow",
     name: "shadow",
     dark: true,
     sponsor: true,
@@ -412,6 +420,7 @@ let themes = {
     },
   },
   vanta: {
+    title: "Vanta",
     name: "vanta",
     dark: true,
     sponsor: true,
@@ -443,6 +452,7 @@ let themes = {
     },
   },
   yellowstone: {
+    title: "Yellowstone",
     name: "yellowstone",
     dark: true,
     sponsor: true,
diff --git a/frontend/src/page/places.vue b/frontend/src/page/places.vue
index fcc976470..f59ae16ab 100644
--- a/frontend/src/page/places.vue
+++ b/frontend/src/page/places.vue
@@ -2,7 +2,7 @@
   <v-container fluid fill-height :class="$config.aclClasses('places')" class="pa-0 p-page p-page-places">
     <div id="map" style="width: 100%; height: 100%;">
       <div v-if="canSearch" class="map-control">
-        <div class="maplibregl-ctrl maplibregl-ctrl-group">
+        <div class="maplibregl-ctrl maplibregl-ctrl-group map-control-search">
           <v-text-field v-model.lazy.trim="filter.q"
                         solo hide-details clearable flat single-line validate-on-blur
                         class="input-search pa-0 ma-0"
@@ -560,7 +560,7 @@ export default {
               imageContainer.append(...images);
 
               const counterBubble = document.createElement('div');
-              counterBubble.className = 'counter-bubble';
+              counterBubble.className = 'counter-bubble primary-button theme--light';
               counterBubble.innerText = clusterFeatures.length > 99 ? '99+' : clusterFeatures.length;
 
               el.append(imageContainer);