diff --git a/components/admin/Geolocation.vue b/components/admin/Geolocation.vue
index 8c1c954e..0be71eff 100644
--- a/components/admin/Geolocation.vue
+++ b/components/admin/Geolocation.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 v-card
-  v-card-title Geolocation and Map settings
+  v-card-title {{$t('admin.geolocation')}}
   v-card-text
     p.mb-6(v-html="$t('admin.geolocation_description')")
 
@@ -25,6 +25,7 @@ v-card
 
         v-col(md=4)
           v-autocomplete.mb-6(v-model="geocoding_countrycodes" :disabled="!(geocoding_provider_type === null || geocoding_provider_type === 'Nominatim')"
+            :append-icon='mdiChevronDown'
             @blur="save('geocoding_countrycodes', geocoding_countrycodes )"
             :label="$t('admin.geocoding_countrycodes')"
             :items="countries"
@@ -60,6 +61,7 @@ v-card
 <script>
 import { mapActions, mapState } from 'vuex'
 import { isoCountries } from '../../server/helpers/geolocation'
+import { mdiChevronDown } from '@mdi/js'
 // import Map from '~/components/Map'
 import "leaflet/dist/leaflet.css"
 
@@ -70,6 +72,7 @@ export default {
   // components: { Map },
   data ({ $store }) {
     return {
+      mdiChevronDown,
       loading: false,
       testGeocodingLoading: false,
       testTileLayerLoading: false,
@@ -161,6 +164,6 @@ export default {
 
 <style>
 #leaflet-map-preview {
-  height: 6rem;
+  height: 20rem;
 }
 </style>
diff --git a/locales/en.json b/locales/en.json
index d333c602..86918dc7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -271,7 +271,6 @@
     "domain": "Domain",
     "known_users": "Known users",
     "created_at": "Created at",
-    "show_geolocation_setup": "Geolocation and map settings",
     "geolocation_description": "<b>1. Define a provider for geocoding service</b>.<br>Currently, among those listed in the <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki of OpenStreetMap</a>, there is support for software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> and <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>You can use one of the related official demos by copying the link in the 'Geocoding provider' field:<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Define a provider for map layers.</b><br>You can find a list of them here: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Geocoding software",
     "geocoding_provider_type_help": "The default software is Nominatim",
@@ -280,7 +279,6 @@
     "geocoding_countrycodes": "Country codes",
     "geocoding_countrycodes_help": "Allows you to set a filter to searches based on area codes",
     "geocoding_test_button": "Test geocoding",
-    "geocoding_test_success": "The service {service_name} is available",
     "geocoding_test_success": "The geocoding service at {service_name} is working",
     "geocoding_test_error": "The geocoding service is not reachable at {service_name}",
     "tilelayer_provider": "Tilelayer provider",
@@ -288,7 +286,8 @@
     "tilelayer_provider_attribution": "Attribution",
     "tilelayer_test_button": "Test tilelayer",
     "tilelayer_test_success": "The tilelayer service at {service_name} is working",
-    "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}"
+    "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}",
+    "geolocation": "Geolocation"
   },
   "auth": {
     "not_confirmed": "Not confirmed yet…",
diff --git a/locales/it.json b/locales/it.json
index d97ea82c..10640c20 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -138,7 +138,7 @@
     "updated": "Evento aggiornato",
     "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.",
     "address_description": "A che indirizzo?",
-    "address_description_osm": "A che indirizzo? ((<a href='http://osm.org/copyright'>OpenStreetMap</a>)",
+    "address_description_osm": "A che indirizzo? (<a href='http://osm.org/copyright'>OpenStreetMap</a>)",
     "coordinates_search_description": "Puoi ricercare il posto per nome, o incollare la coppia di coordinate.",
     "confirmed": "Evento confermato",
     "not_found": "Evento non trovato",
@@ -263,8 +263,7 @@
     "domain": "Domini",
     "known_users": "Utenti conosciuti",
     "created_at": "Creato il",
-    "show_geolocation_setup": "Impostazioni geolocalizzazione e mappa",
-    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/search <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">  [Terms of Service]</a></li><li>https://photon.komoot.io/api/ <a href=\"https://photon.komoot.io/\">  [Terms of Service]</a></li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
+    "geolocation_description": "<b>1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica)</b>.<br>Al momento, tra quelli elencati nella <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">wiki di OpenStreetMap</a>, è presente il supporto per i software <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> e <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':<ul><li>https://nominatim.openstreetmap.org/search [<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Terms of Service</a>]</li><li>https://photon.komoot.io/api/ [<a href=\"https://photon.komoot.io/\">Terms of Service</a>]</li></ul><br><b>2. Definisci un fornitore di layers per la mappa.</b><br>Qui puoi trovarne una lista: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>",
     "geocoding_provider_type": "Software fornitore georeferenziazione",
     "geocoding_provider_type_help": "Il software di default è Nominatim",
     "geocoding_provider": "Fornitore georeferenziazione",
@@ -279,7 +278,8 @@
     "tilelayer_provider_attribution": "Attribuzione",
     "tilelayer_test_button": "Test tilelayer",
     "tilelayer_test_success": "Il servizio di tilelayer all'indirizzo {service_name} sta funzionando",
-    "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}"
+    "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}",
+    "geolocation": "Geo e mappe"
   },
   "auth": {
     "not_confirmed": "Non ancora confermato…",
diff --git a/pages/Admin.vue b/pages/Admin.vue
index 9a2512f7..4597fa86 100644
--- a/pages/Admin.vue
+++ b/pages/Admin.vue
@@ -29,7 +29,8 @@ v-container.container.pa-0.pa-md-3
       //- GEOCODING / MAPS
       v-tab(href='#geolocation' v-if='settings.allow_geolocation') {{$t('admin.geolocation')}}
       v-tab-item(value='geolocation')
-        Geolocation
+        client-only(placeholder='Loading...')
+          Geolocation
             
 
       //- Collections
@@ -77,7 +78,7 @@ export default {
     Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
     Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
     Collections: () => import(/* webpackChunkName: "admin" */'../components/admin/Collections'),
-    Geolocation: () => import(/* webpackChunkName: "admin" */'../components/admin/Geolocation.vue'),
+    [process.client && 'Geolocation']: () => import(/* webpackChunkName: "admin" */'../components/admin/Geolocation.vue'),
     Federation: () => import(/* webpackChunkName: "admin" */'../components/admin/Federation.vue'),
     Moderation: () => import(/* webpackChunkName: "admin" */'../components/admin/Moderation.vue'),
     Plugin: () => import(/* webpackChunkName: "admin" */'../components/admin/Plugin.vue'),