diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index 874d55a81e..4521e57d9d 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -218,6 +218,29 @@
           }
         }
       ]
+    },
+    {
+      "question": {
+        "en": "Can a cyclist turn right when the light is red?",
+        "nl": "Mag een fietser rechtsaf slaan als het licht rood is?"
+      },
+      "condition": "highway=traffic_signals",
+      "mappings": [
+        {
+          "if": "red_turn:right:bicycle=yes",
+          "then": {
+            "en": "A cyclist can turn right if the light is red",
+            "nl": "Een fietser mag niet rechtsaf slaan als het licht rood is"
+          }
+        },
+        {
+          "if": "red_turn:right:bicycle=no",
+          "then": {
+            "en": "A cyclist can not turn right if the light is red",
+            "nl": "Een fietser mag rechtsaf slaan als het licht rood is"
+          }
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/Cycle_barrier_double.png b/assets/themes/cycle_infra/Cycle_barrier_double.png
new file mode 100644
index 0000000000..76b51a2e65
Binary files /dev/null and b/assets/themes/cycle_infra/Cycle_barrier_double.png differ
diff --git a/assets/themes/cycle_infra/Cycle_barrier_single.png b/assets/themes/cycle_infra/Cycle_barrier_single.png
new file mode 100644
index 0000000000..ec957da7c5
Binary files /dev/null and b/assets/themes/cycle_infra/Cycle_barrier_single.png differ
diff --git a/assets/themes/cycle_infra/Cycle_barrier_squeeze.png b/assets/themes/cycle_infra/Cycle_barrier_squeeze.png
new file mode 100644
index 0000000000..a5ba6c7ed2
Binary files /dev/null and b/assets/themes/cycle_infra/Cycle_barrier_squeeze.png differ
diff --git a/assets/themes/cycle_infra/Cycle_barrier_triple.png b/assets/themes/cycle_infra/Cycle_barrier_triple.png
new file mode 100644
index 0000000000..b64f30c4fe
Binary files /dev/null and b/assets/themes/cycle_infra/Cycle_barrier_triple.png differ
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index adb47c1689..9f257b28e7 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -813,22 +813,28 @@
             {
               "if": "cycle_barrier:type=single",
               "then": {
-                "en": "Single, just two barriers with a space inbetween",
-                "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen"
+                "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'>"
               }
             },
             {
               "if": "cycle_barrier:type=double",
               "then": {
-                "en": "Double, two barriers behind each other",
-                "nl": "Dubbel, twee hekjes achter elkaar"
+                "en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>",
+                "nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
               }
             },
             {
               "if": "cycle_barrier:type=triple",
               "then": {
-                "en": "Triple, three barier behind each other",
-                "nl": "Drievoudig, drie hekjes achter elkaar"
+                "en": "Triple, three barier 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'>"
+              }
+            },
+            {
+              "if": "cycle_barrier:type=squeeze",
+              "then": {
+                "en": "Squeeze gate, gap is smaller at top, then at bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
               }
             }
           ]
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
new file mode 100644
index 0000000000..9efa074568
--- /dev/null
+++ b/assets/themes/cycle_infra/license_info.json
@@ -0,0 +1,52 @@
+[
+  {
+    "authors": [
+      "Supaplex030"
+    ],
+    "path": "Cycle_barrier_single.png",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_single.png"
+    ]
+  },
+  {
+    "authors": [
+      "Supaplex030"
+    ],
+    "path": "Cycle_barrier_double.png",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_double.png"
+    ]
+  },
+  {
+    "authors": [
+      "Supaplex030"
+    ],
+    "path": "Cycle_barrier_triple.png",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_triple.png"
+    ]
+  },
+  {
+    "authors": [
+      "Supaplex030"
+    ],
+    "path": "Cycle_barrier_angular.png",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_angular.png"
+    ]
+  },
+  {
+    "authors": [
+      "Supaplex030"
+    ],
+    "path": "Cycle_barrier_squeeze.png",
+    "license": "CC-BY-SA 4.0",
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Cycle_barrier_squeeze.png"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 04122f5b79..afae48ada7 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -775,6 +775,17 @@
                         "then": "This traffic light does not have a button to request green light"
                     }
                 }
+            },
+            "5": {
+                "question": "Can a cyclist turn right when the light is red?",
+                "mappings": {
+                    "0": {
+                        "then": "A cyclist can turn right if the light is red"
+                    },
+                    "1": {
+                        "then": "A cyclist can not turn right if the light is red"
+                    }
+                }
             }
         }
     },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 72d5473261..87545a440b 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -857,6 +857,17 @@
                         "then": "Dit verkeerlicht heeft niet een knop voor groen licht"
                     }
                 }
+            },
+            "5": {
+                "question": "Mag een fietser rechtsaf slaan als het licht rood is?",
+                "mappings": {
+                    "0": {
+                        "then": "Een fietser mag niet rechtsaf slaan als het licht rood is"
+                    },
+                    "1": {
+                        "then": "Een fietser mag rechtsaf slaan als het licht rood is"
+                    }
+                }
             }
         }
     },
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 25e46f9aee..f493d8db25 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -981,13 +981,16 @@
                         "question": "What kind of cycling barrier is this?",
                         "mappings": {
                             "0": {
-                                "then": "Single, just two barriers with a space inbetween"
+                                "then": "Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
                             },
                             "1": {
-                                "then": "Double, two barriers behind each other"
+                                "then": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
                             },
                             "2": {
-                                "then": "Triple, three barier behind each other"
+                                "then": "Triple, three barier behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
+                            },
+                            "3": {
+                                "then": "Squeeze gate, gap is smaller at top, then at bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>"
                             }
                         }
                     },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index bb7e3ad5a6..eee69b7fdc 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -785,13 +785,13 @@
                         "question": "Wat voor fietshekjes zijn dit?",
                         "mappings": {
                             "0": {
-                                "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen"
+                                "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>"
                             },
                             "1": {
-                                "then": "Dubbel, twee hekjes achter elkaar"
+                                "then": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
                             },
                             "2": {
-                                "then": "Drievoudig, drie hekjes achter elkaar"
+                                "then": "Drievoudig, drie hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>"
                             }
                         }
                     },