diff --git a/docs/manual/docs/annexes/standards/iso19115-3.2018.md b/docs/manual/docs/annexes/standards/iso19115-3.2018.md
index baaabc077f1d..396aa2759884 100644
--- a/docs/manual/docs/annexes/standards/iso19115-3.2018.md
+++ b/docs/manual/docs/annexes/standards/iso19115-3.2018.md
@@ -6887,7 +6887,7 @@ Those values are defined in the standard but hidden when editing.
 
 | code                         | label                          | description |
 |------------------------------|--------------------------------|-------------|
-| map staticMap interactiveMap | Map Static map Interactive map |             |
+| map map-static map-interactive | Map Static map Interactive map |             |
 
 ### Scope description {#iso19115-3.2018-elem-mcc-MD_ScopeDescription-7995800501eaf72f941d8e81542f8e98}
 
@@ -19811,7 +19811,7 @@ Those values are defined in the standard but hidden when editing.
 
 | code                         | label                          | description |
 |------------------------------|--------------------------------|-------------|
-| map staticMap interactiveMap | Map Static map Interactive map |             |
+| map map-static map-interactive | Map Static map Interactive map |             |
 
 ### Standard codelists Spatial Representation Type (mcc:MD_SpatialRepresentationTypeCode) {#iso19115-3.2018-cl-mcc-MD_SpatialRepresentationTypeCode}
 
diff --git a/docs/manual/docs/annexes/standards/iso19139.md b/docs/manual/docs/annexes/standards/iso19139.md
index ceb1ef656c99..53a1707aaf46 100644
--- a/docs/manual/docs/annexes/standards/iso19139.md
+++ b/docs/manual/docs/annexes/standards/iso19139.md
@@ -11963,7 +11963,7 @@ Those values are defined in the standard but hidden when editing.
 
 | code                                        | label                                          | description |
 |---------------------------------------------|------------------------------------------------|-------------|
-| map staticMap interactiveMap featureCatalog | Map Static map Interactive map Feature catalog |             |
+| map map-static map-interactive featureCatalog | Map Static map Interactive map Feature catalog |             |
 
 Displayed only if
 
@@ -17436,7 +17436,7 @@ Those values are defined in the standard but hidden when editing.
 
 | code                                        | label                                          | description |
 |---------------------------------------------|------------------------------------------------|-------------|
-| map staticMap interactiveMap featureCatalog | Map Static map Interactive map Feature catalog |             |
+| map map-static map-interactive featureCatalog | Map Static map Interactive map Feature catalog |             |
 
 Displayed only if
 
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/codelists.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/codelists.xml
index fd3ba79087de..e22eec339915 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/codelists.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/codelists.xml
@@ -1694,12 +1694,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
index 98cd9e48a1d2..788c2a4305f3 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
@@ -1726,12 +1726,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Carte statique</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Carte interactive</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml
index 5a2447a7e43b..d4cc5342f647 100644
--- a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml
+++ b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml
@@ -1813,12 +1813,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
@@ -8929,12 +8929,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml
index 147c2608c84c..0b0b5b435e6b 100644
--- a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml
+++ b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml
@@ -584,7 +584,7 @@ La liste des changements d'état sont accessibles ici :
       <insertFileMode js="true">Import de fichiers</insertFileMode>
       <insertMode>Mode d'insertion :</insertMode>
       <insertPasteMode>Copier/Coller</insertPasteMode>
-      <interactiveMap>Carte interactive</interactiveMap>
+      <map-interactive>Carte interactive</map-interactive>
       <interMapInfo>
         <h1>Information et cartes interactives</h1>
         <p>Vous pouvez trouver des cartes interactives en cherchant dans Geonetwork pour des jeux de données numérique avec une carte interactive, ou bien en vous connectant directement à un serveur cartographique existant</p>
@@ -20334,12 +20334,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
@@ -27450,12 +27450,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml
index 034c615c0dc7..a6e50d22f17d 100644
--- a/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml
+++ b/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml
@@ -584,7 +584,7 @@ La liste des changements d'état sont accessibles ici :
       <insertFileMode js="true">Import de fichiers</insertFileMode>
       <insertMode>Mode d'insertion :</insertMode>
       <insertPasteMode>Copier/Coller</insertPasteMode>
-      <interactiveMap>Carte interactive</interactiveMap>
+      <map-interactive>Carte interactive</map-interactive>
       <interMapInfo>
         <h1>Information et cartes interactives</h1>
         <p>Vous pouvez trouver des cartes interactives en cherchant dans Geonetwork pour des jeux de données numérique avec une carte interactive, ou bien en vous connectant directement à un serveur cartographique existant</p>
@@ -20334,12 +20334,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
@@ -27450,12 +27450,12 @@ Acteur qui a assuré la réalisation de la ressource,éventuellement en faisant
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>staticMap</code>
+              <code>map-static</code>
               <label>Carte statique</label>
               <description />
             </entry>
             <entry hideInEditMode="true">
-              <code>interactiveMap</code>
+              <code>map-interactive</code>
               <label>Carte interactive</label>
               <description />
             </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ara/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ara/codelists.xml
index 26a2d53b2f49..2c8a1f3382f7 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ara/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ara/codelists.xml
@@ -1539,12 +1539,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/cat/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/cat/codelists.xml
index 593b2d950315..c702f9bdc155 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/cat/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/cat/codelists.xml
@@ -1536,12 +1536,12 @@
       <description />
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Mapa estàtic</label>
       <description />
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Mapa interactiu</label>
       <description />
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/chi/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/chi/codelists.xml
index 5a8ad8cecee5..8651f7229f59 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/chi/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/chi/codelists.xml
@@ -1538,12 +1538,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/dut/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/dut/codelists.xml
index a6d68c0fc0f0..f3c796011206 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/dut/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/dut/codelists.xml
@@ -1615,12 +1615,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/codelists.xml
index c94257f9c439..dd1041e96b89 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/codelists.xml
@@ -1626,12 +1626,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/fin/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/fin/codelists.xml
index a3f437fe6859..e3fdd033c408 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/fin/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/fin/codelists.xml
@@ -1518,12 +1518,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/codelists.xml
index b6536b5fc719..b85fbc7f6f06 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/codelists.xml
@@ -1558,12 +1558,12 @@
       <description></description>
     </entry>
     <entry>
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Carte statique</label>
       <description></description>
     </entry>
     <entry>
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Carte interactive</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ger/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ger/codelists.xml
index fdf6efea6602..bafdec7674de 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ger/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ger/codelists.xml
@@ -1585,12 +1585,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Statische Karte</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interaktive Karte</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/ita/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/ita/codelists.xml
index 664af8b9d985..155e059e3c1c 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/ita/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/ita/codelists.xml
@@ -1607,12 +1607,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/codelists.xml
index c6bcf08174a8..5a6e4a75d327 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/codelists.xml
@@ -1604,12 +1604,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/pol/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/pol/codelists.xml
index 0e485ba94fb6..ad11fa36e91a 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/pol/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/pol/codelists.xml
@@ -1526,12 +1526,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/por/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/por/codelists.xml
index 2150a5c7957b..934e121bdca7 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/por/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/por/codelists.xml
@@ -1542,12 +1542,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/rus/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/rus/codelists.xml
index c11faa922667..56934e812bcc 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/rus/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/rus/codelists.xml
@@ -1537,12 +1537,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Статическая карта</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Интерактивная карта</label>
       <description></description>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/slo/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/slo/codelists.xml
index d60dbfa0697f..ddeff854ae98 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/slo/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/slo/codelists.xml
@@ -1448,12 +1448,12 @@ Informácie o mapách a grafoch, z ktorých dátová sada pochádza </descriptio
       <description/>
     </entry>
     <entry hideineditmode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Statická mapa</label>
       <description/>
     </entry>
     <entry hideineditmode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interaktívna mapa</label>
       <description/>
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/spa/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/spa/codelists.xml
index 5a682d3c1e77..aeec293ff865 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/spa/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/spa/codelists.xml
@@ -1543,12 +1543,12 @@
       <description />
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Mapa estático</label>
       <description />
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Mapa interactivo</label>
       <description />
     </entry>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/codelists.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/codelists.xml
index 5535a16635cc..7308138bb181 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/codelists.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/codelists.xml
@@ -1579,12 +1579,12 @@
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>staticMap</code>
+      <code>map-static</code>
       <label>Static map</label>
       <description></description>
     </entry>
     <entry hideInEditMode="true">
-      <code>interactiveMap</code>
+      <code>map-interactive</code>
       <label>Interactive map</label>
       <description></description>
     </entry>
diff --git a/web-ui/src/main/resources/catalog/js/edit/NewMetadataController.js b/web-ui/src/main/resources/catalog/js/edit/NewMetadataController.js
index 8e74109e32a6..724bdded2137 100644
--- a/web-ui/src/main/resources/catalog/js/edit/NewMetadataController.js
+++ b/web-ui/src/main/resources/catalog/js/edit/NewMetadataController.js
@@ -79,7 +79,7 @@
         featureCatalog: "gn-icon-featureCatalog",
         service: "gn-icon-service",
         map: "gn-icon-maps",
-        staticMap: "gn-icon-staticMap",
+        "map-static": "gn-icon-map-static",
         dataset: "gn-icon-dataset",
         series: "gn-icon-series"
       };
@@ -117,7 +117,7 @@
             resourceType: {
               terms: {
                 field: "resourceType",
-                exclude: ["map/static", "theme", "place"],
+                exclude: ["map-static", "theme", "place"],
                 missing: "other"
               }
             }
diff --git a/web-ui/src/main/resources/catalog/locales/az-core.json b/web-ui/src/main/resources/catalog/locales/az-core.json
index d89bd86acde9..e6b66c85c72c 100644
--- a/web-ui/src/main/resources/catalog/locales/az-core.json
+++ b/web-ui/src/main/resources/catalog/locales/az-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Nümayəndəlik növü",
     "cl_spatialRepresentationType": "Nümayəndəlik növü",
     "state": "dövlət",
-    "staticMap": "Statik xəritə",
+    "map-static": "Statik xəritə",
     "surname": "soyad",
     "title": "Başlıq",
     "to": "Kimə",
@@ -587,4 +587,4 @@
     "quality": "Keyfiyyət",
     "download": "Yüklə",
     "links": "Bağlantılar"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ca-core.json b/web-ui/src/main/resources/catalog/locales/ca-core.json
index e912ec20bc17..bfbcf824dca6 100644
--- a/web-ui/src/main/resources/catalog/locales/ca-core.json
+++ b/web-ui/src/main/resources/catalog/locales/ca-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Tipus de representació",
     "cl_spatialRepresentationType": "Tipus de representació",
     "state": "Estat",
-    "staticMap": "Mapa estàtic",
+    "map-static": "Mapa estàtic",
     "surname": "Cognom",
     "title": "Títol",
     "to": "A",
@@ -587,4 +587,4 @@
     "quality": "Qualitat",
     "download": "Download",
     "links": "Enllaços"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/cs-core.json b/web-ui/src/main/resources/catalog/locales/cs-core.json
index 95496bc4da57..a71fbeb6e1de 100644
--- a/web-ui/src/main/resources/catalog/locales/cs-core.json
+++ b/web-ui/src/main/resources/catalog/locales/cs-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Prostorové typy",
     "cl_spatialRepresentationType": "Prostorový typ",
     "state": "Stát",
-    "staticMap": "Statická mapa",
+    "map-static": "Statická mapa",
     "surname": "Příjmení",
     "title": "Název",
     "to": "Komu",
@@ -587,4 +587,4 @@
     "quality": "Kvalita",
     "download": "Download",
     "links": "Odkazy"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/cy-core.json b/web-ui/src/main/resources/catalog/locales/cy-core.json
index 87f1b7c8d901..65aab47a340a 100644
--- a/web-ui/src/main/resources/catalog/locales/cy-core.json
+++ b/web-ui/src/main/resources/catalog/locales/cy-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Math o gynrychiolaeth",
     "cl_spatialRepresentationType": "Math o gynrychiolaeth",
     "state": "Cyflwr",
-    "staticMap": "Map statig",
+    "map-static": "Map statig",
     "surname": "Cyfenw",
     "title": "Teitl",
     "to": "At",
@@ -587,4 +587,4 @@
     "quality": "Ansawdd",
     "download": "Lawrlwytho",
     "links": "Dolenni"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/da-core.json b/web-ui/src/main/resources/catalog/locales/da-core.json
index 098880769879..4bb85737bf28 100644
--- a/web-ui/src/main/resources/catalog/locales/da-core.json
+++ b/web-ui/src/main/resources/catalog/locales/da-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Repræsentationstype",
     "cl_spatialRepresentationType": "Repræsentationstype",
     "state": "Stat",
-    "staticMap": "Statisk kort",
+    "map-static": "Statisk kort",
     "surname": "Efternavn",
     "title": "Titel",
     "to": "Til",
@@ -587,4 +587,4 @@
     "quality": "Kvalitet",
     "download": "Download",
     "links": "Links"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/de-core.json b/web-ui/src/main/resources/catalog/locales/de-core.json
index 6f3ab83dae9b..07d48d9a2f51 100644
--- a/web-ui/src/main/resources/catalog/locales/de-core.json
+++ b/web-ui/src/main/resources/catalog/locales/de-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Darstellungsart",
     "cl_spatialRepresentationType": "Darstellungsart",
     "state": "Bundesland / Kanton",
-    "staticMap": "Statische Karte",
+    "map-static": "Statische Karte",
     "surname": "Nachname",
     "title": "Titel",
     "to": "Bis",
@@ -587,4 +587,4 @@
     "quality": "Qualität",
     "download": "Herunterladen",
     "links": "Links"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/en-core.json b/web-ui/src/main/resources/catalog/locales/en-core.json
index cd03dca04eb6..f79fa4df581a 100644
--- a/web-ui/src/main/resources/catalog/locales/en-core.json
+++ b/web-ui/src/main/resources/catalog/locales/en-core.json
@@ -268,7 +268,7 @@
     "spatialRepresentationType": "Representation type",
     "cl_spatialRepresentationType": "Representation type",
     "state": "State",
-    "staticMap": "Static map",
+    "map-static": "Static map",
     "surname": "Surname",
     "title": "Title",
     "to": "To",
diff --git a/web-ui/src/main/resources/catalog/locales/es-core.json b/web-ui/src/main/resources/catalog/locales/es-core.json
index 2880dd241432..cbaa915f22c4 100644
--- a/web-ui/src/main/resources/catalog/locales/es-core.json
+++ b/web-ui/src/main/resources/catalog/locales/es-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Tipo de Representación",
     "cl_spatialRepresentationType": "Tipo de Representación",
     "state": "Estado",
-    "staticMap": "Mapa estático",
+    "map-static": "Mapa estático",
     "surname": "Apellido",
     "title": "Título",
     "to": "A",
@@ -587,4 +587,4 @@
     "quality": "Calidad",
     "download": "Download",
     "links": "Enlaces"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/fi-core.json b/web-ui/src/main/resources/catalog/locales/fi-core.json
index 760a79bf284c..1ed8f492590d 100644
--- a/web-ui/src/main/resources/catalog/locales/fi-core.json
+++ b/web-ui/src/main/resources/catalog/locales/fi-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Esitysmuoto",
     "cl_spatialRepresentationType": "Esitysmuoto",
     "state": "Tila",
-    "staticMap": "Staattinen kartta",
+    "map-static": "Staattinen kartta",
     "surname": "Sukunimi",
     "title": "Titteli",
     "to": "Vastaanottaja",
@@ -587,4 +587,4 @@
     "quality": "Laatu",
     "download": "Download",
     "links": "Linkit"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/fr-core.json b/web-ui/src/main/resources/catalog/locales/fr-core.json
index 3434b7768e1e..d6cd2a56bb52 100644
--- a/web-ui/src/main/resources/catalog/locales/fr-core.json
+++ b/web-ui/src/main/resources/catalog/locales/fr-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Type de représentation",
     "cl_spatialRepresentationType": "Type de représentation",
     "state": "Région",
-    "staticMap": "Carte statique",
+    "map-static": "Carte statique",
     "surname": "Nom",
     "title": "Titre",
     "to": "à",
@@ -587,4 +587,4 @@
     "quality": "Qualité",
     "download": "Téléchargement",
     "links": "Liens"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/hy-core.json b/web-ui/src/main/resources/catalog/locales/hy-core.json
index 93af8974b84b..eef8e06066eb 100644
--- a/web-ui/src/main/resources/catalog/locales/hy-core.json
+++ b/web-ui/src/main/resources/catalog/locales/hy-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Ներկայացման տեսակը",
     "cl_spatialRepresentationType": "Ներկայացման տեսակը",
     "state": "Պետություն",
-    "staticMap": "Ստատիկ քարտեզ",
+    "map-static": "Ստատիկ քարտեզ",
     "surname": "Ազգանունը",
     "title": "Կոչում",
     "to": "Դեպի",
@@ -587,4 +587,4 @@
     "quality": "Որակ",
     "download": "Բեռնել",
     "links": "Հղումներ"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/is-core.json b/web-ui/src/main/resources/catalog/locales/is-core.json
index 4e2a6103b54a..ef7c448a2c76 100644
--- a/web-ui/src/main/resources/catalog/locales/is-core.json
+++ b/web-ui/src/main/resources/catalog/locales/is-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Framsetning tegund",
     "cl_spatialRepresentationType": "Framsetning tegund",
     "state": "Ástand",
-    "staticMap": "Kyrrstætt kort",
+    "map-static": "Kyrrstætt kort",
     "surname": "Eftirnafn",
     "title": "Titill",
     "to": "Til",
@@ -587,4 +587,4 @@
     "quality": "Gæði",
     "download": "Niðurhal",
     "links": "Links"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/it-core.json b/web-ui/src/main/resources/catalog/locales/it-core.json
index 803f562287b1..5c78a605d4a5 100644
--- a/web-ui/src/main/resources/catalog/locales/it-core.json
+++ b/web-ui/src/main/resources/catalog/locales/it-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Tipo di rappresentazione",
     "cl_spatialRepresentationType": "Tipo di rappresentazione",
     "state": "Stato",
-    "staticMap": "Mappa statica",
+    "map-static": "Mappa statica",
     "surname": "Cognome",
     "title": "Titolo",
     "to": "A",
@@ -587,4 +587,4 @@
     "quality": "Qualità",
     "download": "Scaricare",
     "links": "Collegamenti"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ka-core.json b/web-ui/src/main/resources/catalog/locales/ka-core.json
index d37d389498aa..27bd4c9146d7 100644
--- a/web-ui/src/main/resources/catalog/locales/ka-core.json
+++ b/web-ui/src/main/resources/catalog/locales/ka-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "წარმომადგენლობის ტიპი",
     "cl_spatialRepresentationType": "წარმომადგენლობის ტიპი",
     "state": "სახელმწიფო",
-    "staticMap": "სტატიკური რუკა",
+    "map-static": "სტატიკური რუკა",
     "surname": "გვარი",
     "title": "სათაური",
     "to": "რომ",
@@ -587,4 +587,4 @@
     "quality": "ხარისხიანი",
     "download": "ჩამოტვირთვა",
     "links": "ბმულები"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ko-core.json b/web-ui/src/main/resources/catalog/locales/ko-core.json
index 17e553255091..c935187d77e6 100644
--- a/web-ui/src/main/resources/catalog/locales/ko-core.json
+++ b/web-ui/src/main/resources/catalog/locales/ko-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "표현 형태",
     "cl_spatialRepresentationType": "표현 형태",
     "state": "주",
-    "staticMap": "정적 지도",
+    "map-static": "정적 지도",
     "surname": "성",
     "title": "제목",
     "to": "종료",
@@ -587,4 +587,4 @@
     "quality": "품질",
     "download": "Download",
     "links": "링크"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/nl-core.json b/web-ui/src/main/resources/catalog/locales/nl-core.json
index ca82b2f980bb..073e10f99cef 100644
--- a/web-ui/src/main/resources/catalog/locales/nl-core.json
+++ b/web-ui/src/main/resources/catalog/locales/nl-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Representatie type",
     "cl_spatialRepresentationType": "Representatie type",
     "state": "Staat",
-    "staticMap": "Vaste kaart",
+    "map-static": "Vaste kaart",
     "surname": "Achternaam",
     "title": "Titel",
     "to": "Tot",
@@ -587,4 +587,4 @@
     "quality": "Kwaliteit",
     "download": "Download bestand",
     "links": "Links"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/pt-core.json b/web-ui/src/main/resources/catalog/locales/pt-core.json
index 4d168294cef1..7c670bf19092 100644
--- a/web-ui/src/main/resources/catalog/locales/pt-core.json
+++ b/web-ui/src/main/resources/catalog/locales/pt-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Tipo de representação",
     "cl_spatialRepresentationType": "Tipo de representação",
     "state": "Estado",
-    "staticMap": "Mapa estático",
+    "map-static": "Mapa estático",
     "surname": "Sobrenome",
     "title": "Título",
     "to": "Até",
@@ -587,4 +587,4 @@
     "quality": "Qualidade",
     "download": "Download",
     "links": "Links"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ro-core.json b/web-ui/src/main/resources/catalog/locales/ro-core.json
index 692d62290a2d..1461214bc020 100644
--- a/web-ui/src/main/resources/catalog/locales/ro-core.json
+++ b/web-ui/src/main/resources/catalog/locales/ro-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Tipul de reprezentare",
     "cl_spatialRepresentationType": "Tipul de reprezentare",
     "state": "Stat",
-    "staticMap": "Harta statica",
+    "map-static": "Harta statica",
     "surname": "Nume de familie",
     "title": "Titlu",
     "to": "La",
@@ -587,4 +587,4 @@
     "quality": "Calitate",
     "download": "Descarca",
     "links": "Legături"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ru-core.json b/web-ui/src/main/resources/catalog/locales/ru-core.json
index 2642a35b831b..de09fb132234 100644
--- a/web-ui/src/main/resources/catalog/locales/ru-core.json
+++ b/web-ui/src/main/resources/catalog/locales/ru-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Типы представлений",
     "cl_spatialRepresentationType": "Типы представлений",
     "state": "Государство",
-    "staticMap": "Статическая карта",
+    "map-static": "Статическая карта",
     "surname": "Фамилия",
     "title": "Титул",
     "to": "К",
@@ -587,4 +587,4 @@
     "quality": "Качество",
     "download": "Download",
     "links": "Ссылки"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/sk-core.json b/web-ui/src/main/resources/catalog/locales/sk-core.json
index 6042ab0fc42d..d47127c17c3e 100644
--- a/web-ui/src/main/resources/catalog/locales/sk-core.json
+++ b/web-ui/src/main/resources/catalog/locales/sk-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Priestorové typy",
     "cl_spatialRepresentationType": "Priestorový typ",
     "state": "Štát",
-    "staticMap": "Statická mapa",
+    "map-static": "Statická mapa",
     "surname": "Priezvisko",
     "title": "Názov",
     "to": "Komu",
@@ -587,4 +587,4 @@
     "quality": "Kvalita",
     "download": "Stiahnuť",
     "links": "Webová adresa"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/sv-core.json b/web-ui/src/main/resources/catalog/locales/sv-core.json
index 0454efe30750..9ed6113a41c3 100644
--- a/web-ui/src/main/resources/catalog/locales/sv-core.json
+++ b/web-ui/src/main/resources/catalog/locales/sv-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Representationstyp",
     "cl_spatialRepresentationType": "Representationstyp",
     "state": "Län",
-    "staticMap": "Statisk karta",
+    "map-static": "Statisk karta",
     "surname": "Efternamn",
     "title": "Titel",
     "to": "Till",
@@ -587,4 +587,4 @@
     "quality": "Kvalitet",
     "download": "Download",
     "links": "Länkar"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/uk-core.json b/web-ui/src/main/resources/catalog/locales/uk-core.json
index 8898b6b2c094..e542dfad10b2 100644
--- a/web-ui/src/main/resources/catalog/locales/uk-core.json
+++ b/web-ui/src/main/resources/catalog/locales/uk-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "Тип представництва",
     "cl_spatialRepresentationType": "Тип представництва",
     "state": "Держава",
-    "staticMap": "Статична карта",
+    "map-static": "Статична карта",
     "surname": "Прізвище",
     "title": "Назва",
     "to": "до",
@@ -587,4 +587,4 @@
     "quality": "якість",
     "download": "Завантажити",
     "links": "Посилання"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/zh-core.json b/web-ui/src/main/resources/catalog/locales/zh-core.json
index 3cc4c0b5ad26..b7f0280f6b32 100644
--- a/web-ui/src/main/resources/catalog/locales/zh-core.json
+++ b/web-ui/src/main/resources/catalog/locales/zh-core.json
@@ -266,7 +266,7 @@
     "spatialRepresentationType": "表示类型",
     "cl_spatialRepresentationType": "表示类型",
     "state": "州",
-    "staticMap": "静态地图",
+    "map-static": "静态地图",
     "surname": "姓",
     "title": "标题",
     "to": "至",
@@ -587,4 +587,4 @@
     "quality": "质量",
     "download": "Download",
     "links": "链接"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/style/gn_icons.less b/web-ui/src/main/resources/catalog/style/gn_icons.less
index 6eb3ddf60f7d..2fd57538a1c1 100644
--- a/web-ui/src/main/resources/catalog/style/gn_icons.less
+++ b/web-ui/src/main/resources/catalog/style/gn_icons.less
@@ -18,10 +18,8 @@
 }
 .gn-icon-map:before,
 .gn-icon-map-static:before,
-.gn-icon-staticMap:before,
 .gn-icon-maps:before,
-.gn-icon-map-interactive:before,
-.gn-icon-interactiveMap:before {
+.gn-icon-map-interactive:before {
   content: @fa-var-map;
 }
 .gn-icon-featureCatalog:before {