diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json
index 00b6d02d68..7e7f91c3ff 100644
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@@ -100,91 +100,119 @@
         {
           "if": "bicycle_parking=stands",
           "then": {
-            "en": "Staple racks <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>",
-            "nl": "Nietjes <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>",
-            "fr": "Arceaux <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>",
-            "gl": "De roda (Stands) <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>",
-            "de": "Fahrradbügel <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>",
-            "hu": "Korlát <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>",
-            "it": "Archetti <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>",
-            "zh_Hant": "單車架 <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>"
+            "en": "Staple racks",
+            "nl": "Nietjes",
+            "fr": "Arceaux",
+            "gl": "De roda (Stands)",
+            "de": "Fahrradbügel",
+            "hu": "Korlát",
+            "it": "Archetti",
+            "zh_Hant": "單車架"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/staple.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=wall_loops",
           "then": {
-            "en": "Wheel rack/loops <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "nl": "Wielrek/lussen <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "fr": "Pinces-roues <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "gl": "Aros <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "de": "Metallgestänge <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "hu": "Kerékbefogó hurok <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "it": "Scolapiatti <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>",
-            "zh_Hant": "車輪架/圓圈 <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+            "en": "Wheel rack/loops",
+            "nl": "Wielrek/lussen",
+            "fr": "Pinces-roues",
+            "gl": "Aros",
+            "de": "Metallgestänge",
+            "hu": "Kerékbefogó hurok",
+            "it": "Scolapiatti",
+            "zh_Hant": "車輪架/圓圈"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/wall_loops.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=handlebar_holder",
           "then": {
-            "en": "Handlebar holder <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "nl": "Stuurhouder <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "fr": "Support guidon <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "gl": "Cadeado para guiador <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "de": "Halter für Fahrradlenker <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "it": "Blocca manubrio <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>",
-            "zh_Hant": "車把架 <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+            "en": "Handlebar holder",
+            "nl": "Stuurhouder",
+            "fr": "Support guidon",
+            "gl": "Cadeado para guiador",
+            "de": "Halter für Fahrradlenker",
+            "it": "Blocca manubrio",
+            "zh_Hant": "車把架"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/handlebar_holder.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=rack",
           "then": {
-            "en": "Rack <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "nl": "Rek <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "fr": "Râtelier <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "gl": "Cremalleira <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "de": "Gestell <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "zh_Hant": "車架<img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "it": "Rastrelliera <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>",
-            "ru": "Стойка <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+            "en": "Rack",
+            "nl": "Rek",
+            "fr": "Râtelier",
+            "gl": "Cremalleira",
+            "de": "Gestell",
+            "zh_Hant": "車架",
+            "it": "Rastrelliera",
+            "ru": "Стойка"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/rack.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=two_tier",
           "then": {
-            "en": "Two-tiered <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "nl": "Dubbel (twee verdiepingen) <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "fr": "Superposé <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "gl": "Dobre cremalleira <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "de": "Zweistufig <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "hu": "Kétszintű <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "zh_Hant": "兩層<img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "it": "A due piani <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>",
-            "ru": "Двухуровневая <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+            "en": "Two-tiered",
+            "nl": "Dubbel (twee verdiepingen)",
+            "fr": "Superposé",
+            "gl": "Dobre cremalleira",
+            "de": "Zweistufig",
+            "hu": "Kétszintű",
+            "zh_Hant": "兩層",
+            "it": "A due piani",
+            "ru": "Двухуровневая"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/two_tier.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=shed",
           "then": {
-            "en": "Shed <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "nl": "Schuur <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "fr": "Abri <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "gl": "Abeiro <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "de": "Schuppen <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "hu": "Fészer <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "zh_Hant": "車棚 <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "it": "Rimessa <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>",
-            "ru": "Навес <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+            "en": "Shed",
+            "nl": "Schuur",
+            "fr": "Abri",
+            "gl": "Abeiro",
+            "de": "Schuppen",
+            "hu": "Fészer",
+            "zh_Hant": "車棚",
+            "it": "Rimessa",
+            "ru": "Навес"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/shed.svg",
+            "class": "large"
           }
         },
         {
           "if": "bicycle_parking=bollard",
           "then": {
-            "en": "Bollard <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>",
-            "nl": "Paal met ring <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>",
-            "fr": "Potelet <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>",
-            "it": "Colonnina <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>",
-            "de": "Poller <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>",
-            "zh_Hant": "柱子 <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+            "en": "Bollard",
+            "nl": "Paal met ring",
+            "fr": "Potelet",
+            "it": "Colonnina",
+            "de": "Poller",
+            "zh_Hant": "柱子"
+          },
+          "icon": {
+            "path": "./assets/layers/bike_parking/bollard.svg",
+            "class": "large"
           }
         },
         {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index ec39ff1274..82174c4892 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -574,25 +574,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Fahrradbügel <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Fahrradbügel"
                     },
                     "1": {
-                        "then": "Metallgestänge <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Metallgestänge"
                     },
                     "2": {
-                        "then": "Halter für Fahrradlenker <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Halter für Fahrradlenker"
                     },
                     "3": {
-                        "then": "Gestell <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Gestell"
                     },
                     "4": {
-                        "then": "Zweistufig <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Zweistufig"
                     },
                     "5": {
-                        "then": "Schuppen <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Schuppen"
                     },
                     "6": {
-                        "then": "Poller <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "Poller"
                     },
                     "7": {
                         "then": "Ein Bereich auf dem Boden, der für das Abstellen von Fahrrädern gekennzeichnet ist"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4e6a0a2ed7..cabaf4b8c5 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -687,25 +687,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Staple racks <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Staple racks"
                     },
                     "1": {
-                        "then": "Wheel rack/loops <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Wheel rack/loops"
                     },
                     "2": {
-                        "then": "Handlebar holder <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Handlebar holder"
                     },
                     "3": {
-                        "then": "Rack <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Rack"
                     },
                     "4": {
-                        "then": "Two-tiered <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Two-tiered"
                     },
                     "5": {
-                        "then": "Shed <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Shed"
                     },
                     "6": {
-                        "then": "Bollard <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "Bollard"
                     },
                     "7": {
                         "then": "An area on the floor which is  marked for bicycle parking"
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 1d7c4bd760..79c03d20c9 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -539,25 +539,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Arceaux <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Arceaux"
                     },
                     "1": {
-                        "then": "Pinces-roues <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Pinces-roues"
                     },
                     "2": {
-                        "then": "Support guidon <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Support guidon"
                     },
                     "3": {
-                        "then": "Râtelier <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Râtelier"
                     },
                     "4": {
-                        "then": "Superposé <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Superposé"
                     },
                     "5": {
-                        "then": "Abri <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Abri"
                     },
                     "6": {
-                        "then": "Potelet <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "Potelet"
                     },
                     "7": {
                         "then": "Zone au sol qui est marquée pour le stationnement des vélos"
diff --git a/langs/layers/gl.json b/langs/layers/gl.json
index 33e42935ac..be5f07945e 100644
--- a/langs/layers/gl.json
+++ b/langs/layers/gl.json
@@ -89,22 +89,22 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "De roda (Stands) <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "De roda (Stands)"
                     },
                     "1": {
-                        "then": "Aros <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Aros"
                     },
                     "2": {
-                        "then": "Cadeado para guiador <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Cadeado para guiador"
                     },
                     "3": {
-                        "then": "Cremalleira <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Cremalleira"
                     },
                     "4": {
-                        "then": "Dobre cremalleira <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Dobre cremalleira"
                     },
                     "5": {
-                        "then": "Abeiro <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Abeiro"
                     }
                 },
                 "question": "Que tipo de aparcadoiro de bicicletas é?",
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index eb6752e03a..05fe688fa5 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -397,16 +397,16 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Korlát <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Korlát"
                     },
                     "1": {
-                        "then": "Kerékbefogó hurok <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Kerékbefogó hurok"
                     },
                     "4": {
-                        "then": "Kétszintű <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Kétszintű"
                     },
                     "5": {
-                        "then": "Fészer <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Fészer"
                     }
                 },
                 "question": "Milyen típusú ez a kerékpártároló?",
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 29a38b6161..814431ad84 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -419,25 +419,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Archetti <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Archetti"
                     },
                     "1": {
-                        "then": "Scolapiatti <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Scolapiatti"
                     },
                     "2": {
-                        "then": "Blocca manubrio <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Blocca manubrio"
                     },
                     "3": {
-                        "then": "Rastrelliera <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Rastrelliera"
                     },
                     "4": {
-                        "then": "A due piani <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "A due piani"
                     },
                     "5": {
-                        "then": "Rimessa <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Rimessa"
                     },
                     "6": {
-                        "then": "Colonnina <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "Colonnina"
                     },
                     "7": {
                         "then": "Una zona del pavimento che è marcata per il parcheggio delle bici"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 1c87910549..2e501ef8ac 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -687,25 +687,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "Nietjes <img style='width: 25%'' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "Nietjes"
                     },
                     "1": {
-                        "then": "Wielrek/lussen <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "Wielrek/lussen"
                     },
                     "2": {
-                        "then": "Stuurhouder <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "Stuurhouder"
                     },
                     "3": {
-                        "then": "Rek <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Rek"
                     },
                     "4": {
-                        "then": "Dubbel (twee verdiepingen) <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Dubbel (twee verdiepingen)"
                     },
                     "5": {
-                        "then": "Schuur <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Schuur"
                     },
                     "6": {
-                        "then": "Paal met ring <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "Paal met ring"
                     },
                     "7": {
                         "then": "Een oppervlakte die gemarkeerd is om fietsen te parkeren"
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index 0d78ee0754..90e13fc431 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -420,13 +420,13 @@
             "Bicycle parking type": {
                 "mappings": {
                     "3": {
-                        "then": "Стойка <img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "Стойка"
                     },
                     "4": {
-                        "then": "Двухуровневая <img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "Двухуровневая"
                     },
                     "5": {
-                        "then": "Навес <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "Навес"
                     }
                 },
                 "question": "К какому типу относится эта велопарковка?",
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index 1245e609aa..f1e931d5d6 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -379,25 +379,25 @@
             "Bicycle parking type": {
                 "mappings": {
                     "0": {
-                        "then": "單車架 <img style='width: 25%' src='./assets/layers/bike_parking/staple.svg'>"
+                        "then": "單車架"
                     },
                     "1": {
-                        "then": "車輪架/圓圈 <img style='width: 25%'' src='./assets/layers/bike_parking/wall_loops.svg'>"
+                        "then": "車輪架/圓圈"
                     },
                     "2": {
-                        "then": "車把架 <img style='width: 25%'' src='./assets/layers/bike_parking/handlebar_holder.svg'>"
+                        "then": "車把架"
                     },
                     "3": {
-                        "then": "車架<img style='width: 25%'' src='./assets/layers/bike_parking/rack.svg'>"
+                        "then": "車架"
                     },
                     "4": {
-                        "then": "兩層<img style='width: 25%'' src='./assets/layers/bike_parking/two_tier.svg'>"
+                        "then": "兩層"
                     },
                     "5": {
-                        "then": "車棚 <img style='width: 25%'' src='./assets/layers/bike_parking/shed.svg'>"
+                        "then": "車棚"
                     },
                     "6": {
-                        "then": "柱子 <img style='width: 25%'' src='./assets/layers/bike_parking/bollard.svg'>"
+                        "then": "柱子"
                     },
                     "7": {
                         "then": "樓層當中標示為單車停車場的區域"