diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 499a2157f6..9bb38a52f2 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -246,41 +246,57 @@
         {
           "if": "cycle_barrier=single",
           "then": {
-            "en": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
-            "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
-            "de": "Einfach, nur zwei Barrieren mit einem Zwischenraum <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
-            "hu": "Egyszeres: csak két korlát, közöttük térköz <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>",
-            "fr": "Simple, deux barrières côte à côte <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+            "en": "Single, just two barriers with a space inbetween",
+            "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen",
+            "de": "Einfach, nur zwei Barrieren mit einem Zwischenraum",
+            "hu": "Egyszeres: csak két korlát, közöttük térköz",
+            "fr": "Simple, deux barrières côte à côte"
+          },
+          "icon": {
+            "path": "./assets/themes/cycle_infra/Cycle_barrier_single.png",
+            "class": "large"
           }
         },
         {
           "if": "cycle_barrier=double",
           "then": {
-            "en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
-            "nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
-            "de": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
-            "hu": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
+            "en": "Double, two barriers behind each other",
+            "nl": "Dubbel, twee hekjes achter elkaar",
+            "de": "Doppelt, zwei Barrieren hintereinander",
+            "hu": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után",
             "fr": "Double, deux barrières successives"
+          },
+          "icon": {
+            "path": "./assets/themes/cycle_infra/Cycle_barrier_double.svg",
+            "class": "large"
           }
         },
         {
           "if": "cycle_barrier=triple",
           "then": {
-            "en": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
-            "nl": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
-            "de": "Dreifach, drei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
-            "hu": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>",
-            "fr": "Triple, trois barrières successives <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+            "en": "Triple, three barriers behind each other",
+            "nl": "Drievoudig, drie hekjes achter elkaar",
+            "de": "Dreifach, drei Barrieren hintereinander",
+            "hu": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után",
+            "fr": "Triple, trois barrières successives"
+          },
+          "icon": {
+            "path": "./assets/themes/cycle_infra/Cycle_barrier_triple.png",
+            "class": "large"
           }
         },
         {
           "if": "cycle_barrier=squeeze",
           "then": {
-            "en": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
-            "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
-            "de": "Eine Durchfahrtsbeschränkung, Durchfahrtsbreite ist oben kleiner als unten <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
-            "hu": "Szűkítőkapu: a rés felül keskenyebb, mint alul <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>",
-            "fr": "Poire, l’espace en hauteur est plus faible qu’au sol <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+            "en": "Squeeze gate, gap is smaller at top, than at the bottom",
+            "nl": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem",
+            "de": "Eine Durchfahrtsbeschränkung, Durchfahrtsbreite ist oben kleiner als unten",
+            "hu": "Szűkítőkapu: a rés felül keskenyebb, mint alul",
+            "fr": "Poire, l’espace en hauteur est plus faible qu’au sol"
+          },
+          "icon": {
+            "path": "./assets/themes/cycle_infra/Cycle_barrier_squeeze.png",
+            "class": "large"
           }
         }
       ],
diff --git a/langs/layers/de.json b/langs/layers/de.json
index c33afc8910..ec39ff1274 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -183,16 +183,16 @@
             "Cycle barrier type": {
                 "mappings": {
                     "0": {
-                        "then": "Einfach, nur zwei Barrieren mit einem Zwischenraum <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                        "then": "Einfach, nur zwei Barrieren mit einem Zwischenraum"
                     },
                     "1": {
-                        "then": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
+                        "then": "Doppelt, zwei Barrieren hintereinander"
                     },
                     "2": {
-                        "then": "Dreifach, drei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                        "then": "Dreifach, drei Barrieren hintereinander"
                     },
                     "3": {
-                        "then": "Eine Durchfahrtsbeschränkung, Durchfahrtsbreite ist oben kleiner als unten <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                        "then": "Eine Durchfahrtsbeschränkung, Durchfahrtsbreite ist oben kleiner als unten"
                     }
                 },
                 "question": "Um welche Art Fahrradhindernis handelt es sich?"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 809de500a2..4e6a0a2ed7 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -183,16 +183,16 @@
             "Cycle barrier type": {
                 "mappings": {
                     "0": {
-                        "then": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                        "then": "Single, just two barriers with a space inbetween"
                     },
                     "1": {
-                        "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
+                        "then": "Double, two barriers behind each other"
                     },
                     "2": {
-                        "then": "Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                        "then": "Triple, three barriers behind each other"
                     },
                     "3": {
-                        "then": "Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                        "then": "Squeeze gate, gap is smaller at top, than at the bottom"
                     }
                 },
                 "question": "What kind of cycling barrier is this?"
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index c802184b56..1d7c4bd760 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -183,16 +183,16 @@
             "Cycle barrier type": {
                 "mappings": {
                     "0": {
-                        "then": "Simple, deux barrières côte à côte <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                        "then": "Simple, deux barrières côte à côte"
                     },
                     "1": {
                         "then": "Double, deux barrières successives"
                     },
                     "2": {
-                        "then": "Triple, trois barrières successives <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                        "then": "Triple, trois barrières successives"
                     },
                     "3": {
-                        "then": "Poire, l’espace en hauteur est plus faible qu’au sol <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                        "then": "Poire, l’espace en hauteur est plus faible qu’au sol"
                     }
                 },
                 "question": "Quel est ce type de barrière cyclable ?"
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 6cbee3e47b..eb6752e03a 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -183,16 +183,16 @@
             "Cycle barrier type": {
                 "mappings": {
                     "0": {
-                        "then": "Egyszeres: csak két korlát, közöttük térköz <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                        "then": "Egyszeres: csak két korlát, közöttük térköz"
                     },
                     "1": {
-                        "then": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
+                        "then": "Kétszeres: két, egymáshoz képest eltolt korlát egymás után"
                     },
                     "2": {
-                        "then": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                        "then": "Háromszoros: három, egymáshoz képest eltolt korlát egymás után"
                     },
                     "3": {
-                        "then": "Szűkítőkapu: a rés felül keskenyebb, mint alul <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                        "then": "Szűkítőkapu: a rés felül keskenyebb, mint alul"
                     }
                 },
                 "question": "Milyen fajta kerékpárakadály ez?"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 46d32efabc..1c87910549 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -183,16 +183,16 @@
             "Cycle barrier type": {
                 "mappings": {
                     "0": {
-                        "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
+                        "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen"
                     },
                     "1": {
-                        "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
+                        "then": "Dubbel, twee hekjes achter elkaar"
                     },
                     "2": {
-                        "then": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                        "then": "Drievoudig, drie hekjes achter elkaar"
                     },
                     "3": {
-                        "then": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
+                        "then": "Knijppoort, ruimte is smaller aan de top, dan aan de bodem"
                     }
                 },
                 "question": "Wat voor fietshekjes zijn dit?"