diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
index a0b7327c11..7a1101b2e5 100644
--- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -796,9 +796,18 @@
         "id": "Rambu lalu lintas apa yang dimiliki jalur sepeda ini?"
       },
       "condition": {
-        "or": [
-          "cycleway=lane",
-          "cycleway=track"
+        "and": [
+          {
+            "or": [
+              "cycleway=lane",
+              "cycleway=track"
+            ]
+          },
+          {
+            "or": [
+              "_country=be"
+            ]
+          }
         ]
       },
       "mappings": [
@@ -812,7 +821,7 @@
           },
           "hideInAnswer": "_country!=be",
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg",
             "class": "medium"
           }
         },
@@ -826,7 +835,7 @@
           },
           "hideInAnswer": true,
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg",
             "class": "medium"
           }
         },
@@ -844,7 +853,7 @@
             "cycleway:segregated=yes"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D09.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg",
             "class": "medium"
           }
         },
@@ -862,7 +871,7 @@
             "cycleway:segregated=no"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D10.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg",
             "class": "medium"
           }
         },
@@ -885,9 +894,19 @@
         "de": "Welches Verkehrszeichen hat dieser Radweg?"
       },
       "condition": {
-        "or": [
-          "highway=cycleway",
-          "highway=path"
+        "and": [
+          {
+            "or": [
+              "highway=cycleway",
+              "highway=path"
+            ]
+          },
+          {
+            "or": [
+              "_country=be",
+              "_country=nl"
+            ]
+          }
         ]
       },
       "mappings": [
@@ -907,7 +926,7 @@
             "speed_pedelec=yes"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg",
             "class": "medium"
           }
         },
@@ -920,7 +939,7 @@
           },
           "hideInAnswer": true,
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D07.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg",
             "class": "medium"
           }
         },
@@ -941,7 +960,7 @@
             "segregated=yes"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D09.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg",
             "class": "medium"
           }
         },
@@ -962,7 +981,55 @@
             "segregated=no"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_road_sign_D10.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "traffic_sign=NL:G11",
+          "then": {
+            "en": "Compulsory cycleway",
+            "nl": "Verplicht fietspad"
+          },
+          "hideInAnswer": "_country!=nl",
+          "addExtraTags": [
+            "mofa=yes",
+            "moped=no"
+          ],
+          "icon": {
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "traffic_sign=NL:G12a",
+          "then": {
+            "en": "Compulsory (moped)cycleway",
+            "nl": "Verplicht bromfietspad"
+          },
+          "hideInAnswer": "_country!=nl",
+          "addExtraTags": [
+            "mofa=designated",
+            "moped=designated"
+          ],
+          "icon": {
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "traffic_sign=NL:G13",
+          "then": {
+            "en": "Non-compulsory cycleway",
+            "nl": "Onverplicht fietspad"
+          },
+          "hideInAnswer": "_country!=nl",
+          "addExtraTags": [
+            "mofa=no",
+            "moped=no"
+          ],
+          "icon": {
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg",
             "class": "medium"
           }
         },
@@ -979,9 +1046,9 @@
     {
       "id": "cycleway-traffic-signs-supplementary",
       "question": {
-        "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-        "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
-        "de": "Hat das Verkehrszeichen D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
+        "en": "Does the traffic sign D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
+        "nl": "Heeft het verkeersbord D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
+        "de": "Hat das Verkehrszeichen D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
       },
       "condition": {
         "or": [
@@ -1001,7 +1068,7 @@
             "cycleway:moped=designated"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg",
             "class": "medium"
           }
         },
@@ -1016,7 +1083,7 @@
             "cycleway:speed_pedelec=designated"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg",
             "class": "medium"
           }
         },
@@ -1032,7 +1099,7 @@
             "cycleway:speed_pedelec=designated"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg",
             "class": "medium"
           }
         },
@@ -1047,7 +1114,7 @@
             "cycleway:moped=no"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg",
             "class": "medium"
           }
         },
@@ -1062,7 +1129,7 @@
             "cycleway:speed_pedelec=no"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg",
             "class": "medium"
           }
         },
@@ -1078,7 +1145,7 @@
             "cycleway:speed_pedelec=no"
           ],
           "icon": {
-            "path": "./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg",
+            "path": "./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg",
             "class": "medium"
           }
         },
diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D07.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_road_sign_D07.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg
diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D09.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_road_sign_D09.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D09.svg
diff --git a/assets/themes/cycle_infra/Belgian_road_sign_D10.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_road_sign_D10.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D10.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M13.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M14.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M15.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M16.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M6.svg
diff --git a/assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg b/assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg
similarity index 100%
rename from assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg
rename to assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_traffic_sign_M7.svg
diff --git a/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json b/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json
new file mode 100644
index 0000000000..494e4ad579
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/traffic_sign/be/license_info.json
@@ -0,0 +1,92 @@
+[
+  {
+    "path": "Belgian_road_sign_D07.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D07.svg"
+    ]
+  },
+  {
+    "path": "Belgian_road_sign_D09.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D09.svg"
+    ]
+  },
+  {
+    "path": "Belgian_road_sign_D10.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D10.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M13.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M13.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M14.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M14.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M15.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M15.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M16.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M16.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M6.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M6.svg"
+    ]
+  },
+  {
+    "path": "Belgian_traffic_sign_M7.svg",
+    "license": "CC0",
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M7.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg
new file mode 100644
index 0000000000..a7c5deddf5
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G11.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" standalone="no"?>
+<svg id="Nederlands_verkeersbord_G11" width="300" height="300" viewBox="0 0 300 300"
+xmlns="http://www.w3.org/2000/svg" version="1.1">
+
+<circle id="blauwe_cirkel" cx="150" cy="150" r="150" fill="#0e518d" />
+
+<g id="fiets">
+<path fill="#f7fbf5"
+	d="M 40.13024,168.25261 C 40.13024,144.4042 59.47123,125.06102 83.31697,125.06102 C 107.16273,125.06102 126.47002,144.4042 126.47002,168.25261 C 126.47002,192.10103 107.16273,211.4105 83.31697,211.4105 C 59.47123,211.4105 40.13024,192.10103 40.13024,168.25261 z M 83.24961,200.78318 C 101.24339,200.78318 115.84386,186.18106 115.84386,168.18523 C 115.84386,150.18948 101.24339,135.58738 83.24961,135.58738 C 65.25585,135.58738 50.65537,150.18948 50.65537,168.18523 C 50.65537,186.18106 65.25585,200.78318 83.24961,200.78318 z" />
+<path fill="#f7fbf5"
+	d="M 139.52961,83.418936 L 139.52961,72.858975 L 120.77803,72.858975 C 112.35793,72.858975 109.92452,83.418936 109.92452,83.418936 C 104.07254,100.12626 80.0584,168.0253 80.0584,168.0253 C 77.625,174.13897 87.35863,177.59154 89.66573,171.73897 C 91.93076,165.8863 119.36345,88.547344 119.36345,88.547344 C 121.24115,82.694764 126.6637,83.418936 126.6637,83.418936 L 139.52961,83.418936" />
+<path fill="#f7fbf5"
+	d="M 222.37504,162.92214 C 218.13973,153.77683 202.41099,120.12632 192.44999,98.745219 L 110.64865,98.745219 L 104.07254,116.14311 L 154.78685,173.4484 L 216.39678,173.4484 C 228.39543,173.4484 222.37504,162.92214 222.37504,162.92214" />
+<path fill="#0e518d"
+	d="M 210.93213,162.85475 C 203.89293,148.05893 193.43515,125.49049 185.96651,109.56627 L 111.92851,109.43995 L 159.35898,162.85475 L 210.93213,162.85475" />
+<path fill="#f7fbf5"
+	d="M 210.24168,83.418936 L 210.24168,91.839986 L 173.79945,91.705217 C 167.51806,91.705217 167.38334,83.418936 173.79945,83.418936 C 177.09172,83.418936 210.24168,83.418936 210.24168,83.418936" />
+<path fill="#f7fbf5"
+	d="M 175.01195,168.25261 C 175.01195,144.4042 194.35294,125.06102 218.19869,125.06102 C 242.01917,125.06102 261.35175,144.4042 261.35175,168.25261 C 261.35175,192.10103 242.01917,211.4105 218.19869,211.4105 C 194.35294,211.4105 175.01195,192.10103 175.01195,168.25261 z M 218.13973,200.78318 C 236.12509,200.78318 250.73399,186.18106 250.73399,168.18523 C 250.73399,150.18948 236.12509,135.58738 218.13973,135.58738 C 200.14597,135.58738 185.53708,150.18948 185.53708,168.18523 C 185.53708,186.18106 200.14597,200.78318 218.13973,200.78318" />
+<path fill="#f7fbf5"
+	d="M 162.18812,171.14948 L 200.21333,90.290476 L 190.67336,85.818943 L 152.52184,167.13266 L 162.18812,171.14948" />
+</g>
+
+<circle id="witte_bies" cx="150" cy="150" r="141.942"
+	fill="none" stroke="#f7fbf5" stroke-width="6.736" />
+
+</svg>
\ No newline at end of file
diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg
new file mode 100644
index 0000000000..b3a11bf13c
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G12a.svg
@@ -0,0 +1,47 @@
+<svg id="Nederlands_verkeersbord_G12a" width="300" height="300" viewBox="0 0 300 300"
+xmlns="http://www.w3.org/2000/svg" version="1.1">
+
+<circle id="blauwe cirkel" cx="150" cy="150" r="150" fill="#0e518d" />
+
+<g id="bromfiets">
+<path fill="#f7fbf5"
+	d="M 195.07351,136.48858 C 209.01546,136.48858 220.32348,125.18025 220.32348,111.23791 C 220.32348,97.3037 209.01546,86.027885 195.07351,86.027885 C 181.13968,86.027885 169.86418,97.3037 169.86418,111.23791 C 169.86418,125.18025 181.13968,136.48858 195.07351,136.48858" />
+<path fill="#0e518d"
+	d="M 195.07351,128.04188 C 204.34917,128.04188 211.87701,120.51383 211.87701,111.23791 C 211.87701,101.97011 204.34917,94.474585 195.07351,94.474585 C 185.83849,94.474585 178.31065,101.97011 178.31065,111.23791 C 178.31065,120.51383 185.83849,128.04188 195.07351,128.04188" />
+<path fill="#f7fbf5"
+	d="M 107.21076,136.48858 C 121.15271,136.48858 132.45261,125.18025 132.45261,111.23791 C 132.45261,97.3037 121.15271,86.027885 107.21076,86.027885 C 93.26881,86.027885 81.96079,97.3037 81.96079,111.23791 C 81.96079,125.18025 93.26881,136.48858 107.21076,136.48858" />
+<path fill="#0e518d"
+	d="M 107.21076,128.04188 C 116.4783,128.04188 124.00614,120.51383 124.00614,111.23791 C 124.00614,101.97011 116.4783,94.474585 107.21076,94.474585 C 97.9351,94.474585 90.43977,101.97011 90.43977,111.23791 C 90.43977,120.51383 97.9351,128.04188 107.21076,128.04188" />
+<path fill="#f7fbf5"
+	d="M 144.5573,52.17605 L 133.31432,52.17605 C 133.31432,52.17605 127.50179,51.631364 124.42074,59.411434 L 103.2436,110.35178 C 103.2436,110.35178 101.58521,114.16458 105.04833,115.40029 C 108.47895,116.66851 111.02345,112.16469 111.02345,112.16469 L 132.93224,60.874769 L 144.5573,60.874769 L 144.5573,52.17605" />
+<path fill="#f7fbf5"
+	d="M 125.15239,70.849841 L 144.17522,71.199416 L 151.79249,83.361362 L 145.97995,100.03526 L 150.87386,107.08366 L 196.00027,107.27064 C 196.00027,107.27064 199.99993,107.08366 199.99993,110.88833 C 199.99993,114.70114 196.34983,115.40029 196.34983,115.40029 L 151.60551,115.5954 C 151.60551,115.5954 145.97995,116.66851 142.01279,109.43313 C 142.01279,109.43313 123.53463,79.166466 123.33953,79.166466 C 123.15255,79.166466 125.15239,70.849841 125.15239,70.849841" />
+<path fill="#f7fbf5"
+	d="M 212.86067,71.036823 L 213.21024,80.979377 L 189.29349,82.247601 C 189.29349,82.247601 183.29398,82.979269 180.59501,86.442497 C 177.86353,89.873206 174.08335,88.40987 172.97775,85.865292 C 171.89653,83.361362 167.35219,75.386182 167.35219,75.386182 C 167.35219,75.386182 165.73444,71.036823 171.35186,71.036823 L 212.86067,71.036823" />
+<path fill="#f7fbf5"
+	d="M 108.12938,86.792071 L 108.47895,81.515933 C 108.47895,81.515933 100.16256,80.629802 96.69943,82.784157 L 98.3497,87.865184 L 108.12938,86.792071" />
+</g>
+
+<g id="fiets">
+<path fill="#f7fbf5"
+	d="M 109.14556,233.02809 C 124.10369,233.02809 136.23278,220.89867 136.23278,205.90761 C 136.23278,190.94907 124.10369,178.81963 109.14556,178.81963 C 94.18743,178.81963 82.05834,190.94907 82.05834,205.90761 C 82.05834,220.89867 94.18743,233.02809 109.14556,233.02809" />
+<path fill="#0e518d"
+	d="M 109.11304,226.32927 C 120.42106,226.32927 129.56666,217.18342 129.56666,205.87509 C 129.56666,194.56676 120.42106,185.42091 109.11304,185.42091 C 97.81316,185.42091 88.66756,194.56676 88.66756,205.87509 C 88.66756,217.18342 97.81316,226.32927 109.11304,226.32927" />
+<path fill="#f7fbf5"
+	d="M 144.42723,152.68283 L 144.42723,146.04904 L 132.68023,146.04904 C 127.37172,146.04904 125.88403,152.68283 125.88403,152.68283 C 122.20141,163.16194 107.1132,205.77753 107.1132,205.77753 C 105.593,209.62285 111.69007,211.78534 113.11272,208.10261 C 114.54349,204.41176 131.78599,155.89404 131.78599,155.89404 C 132.96476,152.21131 136.36285,152.68283 136.36285,152.68283 L 144.42723,152.68283" />
+<path fill="#f7fbf5"
+	d="M 196.43925,202.57446 C 193.7728,196.85931 183.89556,175.70598 177.67655,162.30833 L 126.32302,162.30833 L 122.20141,173.20205 L 154.01995,209.17573 L 192.69159,209.17573 C 200.21942,209.17573 196.43925,202.57446 196.43925,202.57446" />
+<path fill="#0e518d"
+	d="M 189.26911,202.54194 C 184.85483,193.23349 178.27813,179.07165 173.61184,169.07219 L 127.11971,169.00715 L 156.90589,202.54194 L 189.26911,202.54194" />
+<path fill="#f7fbf5"
+	d="M 188.82199,152.68283 L 188.82199,157.95897 L 165.95394,157.86141 C 162.0193,157.86141 161.92174,152.68283 165.95394,152.68283 C 168.0188,152.68283 188.82199,152.68283 188.82199,152.68283" />
+<path fill="#f7fbf5"
+	d="M 166.71809,205.90761 C 166.71809,190.94907 178.84719,178.81963 193.80532,178.81963 C 208.79596,178.81963 220.92506,190.94907 220.92506,205.90761 C 220.92506,220.89867 208.79596,233.02809 193.80532,233.02809 C 178.84719,233.02809 166.71809,220.89867 166.71809,205.90761 z M 193.7728,226.32927 C 205.08082,226.32927 214.25893,217.18342 214.25893,205.87509 C 214.25893,194.56676 205.08082,185.42091 193.7728,185.42091 C 182.50543,185.42091 173.32731,194.56676 173.32731,205.87509 C 173.32731,217.18342 182.50543,226.32927 193.7728,226.32927" />
+<path fill="#f7fbf5"
+	d="M 158.68624,207.75304 L 182.52982,156.96715 L 176.5303,154.17868 L 152.58917,205.24098 L 158.68624,207.75304" />
+</g>
+
+<circle id="witte bies" cx="150" cy="150" r="141.942"
+	fill="none" stroke="#f7fbf5" stroke-width="6.736" />
+
+</svg>
\ No newline at end of file
diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg
new file mode 100644
index 0000000000..04265f6aa7
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/Nederlands_verkeersbord_G13.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no"?>
+<svg id="Nederlands_verkeersbord_G13" width="300" height="100" viewBox="0 0 300 100"
+xmlns="http://www.w3.org/2000/svg" version="1.1">
+
+<rect id="blauw_vlak"
+width="300" height="100" fill="#0e518d" />
+
+  <path id="letter_f" fill="#f7fbf5"
+     d="M 26.149505,71.540996 L 26.149505,47.622659 L 22.596029,47.622659 L 22.596029,40.697107 L 26.149505,40.697107 L 26.149505,39.05364 C 26.367214,32.303918 28.855425,30.515191 33.894043,30.515191 C 35.50361,30.515191 37.058739,30.90504 38.691626,31.14201 L 38.691626,36.546372 C 37.571933,36.485222 36.421132,36.607532 35.293662,36.607532 C 32.984291,36.607532 32.890995,38.159281 32.859888,40.039727 L 32.859888,40.697107 L 38.753833,40.697107 L 38.753833,47.622659 L 32.859888,47.622659 L 32.859888,71.540996 L 26.149505,71.540996" />
+  <path id="letter_i" fill="#f7fbf5"
+     d="M 51.420366,71.540996 L 58.954965,71.540996 L 58.954965,40.727687 L 51.420366,40.727687 L 51.420366,71.540996 z M 55.245978,38.39624 C 57.345408,38.39624 59.017173,36.752773 59.017173,34.727095 C 59.017173,32.663178 57.345408,31.0197 55.245978,31.0197 C 53.185434,31.0197 51.513671,32.663178 51.513671,34.727095 C 51.513671,36.752773 53.185434,38.39624 55.245978,38.39624" />
+  <path id="letter_e" fill="#f7fbf5"
+     d="M 95.461654,66.702293 C 93.370004,70.554907 89.295563,72.465925 84.225826,72.465925 C 75.050572,72.465925 71.411559,65.479224 71.411559,56.375126 C 71.411559,47.355108 75.625971,39.802758 84.684603,39.802758 C 93.214481,39.978577 97.28893,45.80336 97.28893,54.341799 L 97.28893,57.238916 L 77.904234,57.238916 C 77.297725,61.152679 78.635136,66.404164 84.163628,66.404164 C 89.544381,66.404164 90.788486,63.507068 90.788486,63.270088 L 95.461654,66.702293 z M 90.819575,52.759492 C 90.905119,48.165387 88.99231,44.610893 84.319142,44.610893 C 80.3069,44.610893 77.904234,48.280048 77.904234,52.759492 L 90.819575,52.759492" />
+  <path id="letter_t" fill="#f7fbf5"
+     d="M 113.08126,40.819418 L 113.08126,32.877216 L 119.79165,31.0197 L 119.79165,40.819418 L 128.02606,40.880577 L 128.02606,46.61364 L 119.79165,46.667149 L 119.79165,63.002548 C 119.79165,65.211685 121.4323,65.930244 123.83499,65.930244 C 126.29208,65.930244 127.96386,63.063698 127.96386,62.910819 L 126.81306,70.379099 C 125.95773,73.390865 113.3223,75.661153 113.08126,64.676606 L 113.08126,46.789449 L 107.00848,46.728299 L 107.00848,40.880577 L 113.08126,40.819418" />
+  <path id="letter_s" fill="#f7fbf5"
+     d="M 159.2453,47.653228 C 157.18474,46.728299 152.16945,45.298851 149.9534,45.298851 C 147.94728,45.298851 146.2522,46.25437 146.2522,47.981928 C 146.2522,50.703223 150.59101,51.865123 155.02312,53.539169 C 159.49412,55.182647 163.7474,57.422365 163.7474,62.314579 C 163.7474,68.200531 157.79125,72.557655 150.77761,72.557655 C 145.28023,72.557655 139.50292,69.39301 137.47349,65.035886 L 142.87755,62.857318 C 144.39382,65.150535 147.30969,66.794024 150.77761,66.794024 C 153.84122,66.794024 156.48494,65.540384 156.48494,62.910819 C 156.48494,61.244409 155.54409,60.464722 153.84122,59.539782 L 146.73428,56.436276 C 142.54321,54.57877 139.47181,52.881782 139.47181,48.639316 C 139.47181,43.624803 144.48712,39.649868 150.59101,39.649868 C 156.15059,39.649868 162.13006,42.875674 161.98233,42.875674 L 159.2453,47.653228" />
+  <path id="letter_p" fill="#f7fbf5"
+     d="M 177.44032,46.25437 C 177.37812,44.396852 177.23038,42.546985 177.44032,40.605377 L 184.18181,40.605377 L 184.15849,42.875674 L 184.18181,42.875674 C 185.18486,41.652616 187.2843,39.833338 191.6231,39.802758 C 201.25712,39.711018 203.53537,47.775538 203.53537,56.138176 C 203.53537,64.049787 198.5823,71.456907 191.50647,71.540996 C 188.59061,71.602145 186.70891,71.242876 184.36843,68.047651 L 184.15849,68.047651 L 184.15849,78.649987 L 177.44032,82.082184 L 177.44032,46.25437 z M 184.15849,62.253429 C 185.09934,63.690527 187.8908,65.723855 191.47537,65.150535 C 193.62922,64.791275 197.15159,61.810069 197.15159,56.015867 C 197.15159,50.252225 195.26989,45.97918 191.53758,45.86452 C 187.85969,45.74221 185.06823,46.8506 184.15849,48.608746 L 184.15849,62.253429" />
+  <path id="letter_a" fill="#f7fbf5"
+     d="M 214.70901,46.61364 C 216.13973,41.622046 220.81288,39.802758 226.25584,39.802758 C 232.69409,39.802758 239.07012,41.713776 239.07012,50.313375 L 239.07012,65.035886 C 239.07012,66.404164 239.13232,68.97258 239.31116,71.540996 C 239.31116,71.540996 232.56969,71.724457 232.56969,71.571576 C 232.66299,70.738357 232.53858,68.643881 232.63188,66.946902 L 233.17616,66.946902 C 231.23226,70.822438 227.74098,72.465925 223.4255,72.465925 C 216.34968,72.465925 212.70287,67.061563 212.70287,61.06095 C 212.70287,53.89846 219.93425,50.642064 224.12531,50.787305 C 228.68184,50.970764 232.53858,52.400201 232.53858,52.400201 C 232.53858,47.056989 232.81072,44.373923 226.4969,44.373923 C 223.48772,44.373923 220.33081,45.62755 220.02755,48.731047 L 214.70901,46.61364 z M 224.28082,55.595428 C 219.05559,55.595428 218.50352,60.671101 218.50352,60.671101 C 218.50352,64.493146 220.72735,66.977483 224.24972,66.977483 C 228.13755,66.977483 231.80765,64.676606 232.53858,62.016459 L 232.53858,57.238916 C 232.53858,57.238916 229.41276,55.595428 224.28082,55.595428" />
+  <path id="letter_d" fill="#f7fbf5"
+     d="M 278.25162,65.899664 C 278.31382,67.718951 278.46156,69.56882 278.25162,71.540996 L 271.51013,71.540996 L 271.54124,69.2707 L 271.51013,69.2707 C 270.47597,70.470828 268.40765,72.320695 264.06884,72.351267 C 254.44258,72.435355 252.1643,64.347906 252.1643,55.985287 C 252.1643,48.073657 257.10963,40.697107 264.18548,40.574807 C 267.10134,40.521298 268.99082,40.880577 271.32352,44.068153 L 271.54124,44.068153 L 271.54124,33.504036 L 278.25162,30.04126 L 278.25162,65.899664 z M 271.54124,49.862376 C 270.60038,48.432927 267.80115,46.43018 264.21657,46.995839 C 262.06271,47.324539 258.54036,50.343944 258.54036,56.107597 C 258.54036,61.9018 260.39096,66.289503 264.16214,66.289503 C 267.83226,66.289503 270.63148,65.303415 271.54124,63.537648 L 271.54124,49.862376" />
+
+<path id="witte_bies" style="fill:none;stroke:#f7fbf5;stroke-width:6.70733976"
+     d="M 276.30771,92.233521 C 285.02421,92.233521 292.10005,85.277409 292.10005,76.70839 L 292.10005,23.26096 C 292.10005,14.691942 285.02421,7.7358299 276.30771,7.7358299 L 23.661293,7.7358299 C 14.944785,7.7358299 7.868942,14.691942 7.868942,23.26096 L 7.868942,76.70839 C 7.868942,85.277409 14.944785,92.233521 23.661293,92.233521 L 276.30771,92.233521 z" />
+
+</svg>
\ No newline at end of file
diff --git a/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json b/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json
new file mode 100644
index 0000000000..7ec57b5916
--- /dev/null
+++ b/assets/layers/cycleways_and_roads/traffic_sign/nl/license_info.json
@@ -0,0 +1,32 @@
+[
+  {
+    "path": "Nederlands_verkeersbord_G11.svg",
+    "license": "CC0",
+    "authors": [
+      "Ministerie van Infrastructuur en Waterstaat"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Nederlands_verkeersbord_G11.svg"
+    ]
+  },
+  {
+    "path": "Nederlands_verkeersbord_G12a.svg",
+    "license": "CC0",
+    "authors": [
+      "Ministerie van Infrastructuur en Waterstaat"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Nederlands_verkeersbord_G12a.svg"
+    ]
+  },
+  {
+    "path": "Nederlands_verkeersbord_G13.svg",
+    "license": "CC0",
+    "authors": [
+      "Ministerie van Infrastructuur en Waterstaat"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Nederlands_verkeersbord_G13.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
index d750dfa3f7..0b84e1df2a 100644
--- a/assets/themes/cycle_infra/license_info.json
+++ b/assets/themes/cycle_infra/license_info.json
@@ -1,94 +1,4 @@
 [
-  {
-    "path": "Belgian_road_sign_D07.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D07.svg"
-    ]
-  },
-  {
-    "path": "Belgian_road_sign_D09.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D09.svg"
-    ]
-  },
-  {
-    "path": "Belgian_road_sign_D10.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D10.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M13.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M13.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M14.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M14.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M15.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M15.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M16.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M16.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M6.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M6.svg"
-    ]
-  },
-  {
-    "path": "Belgian_traffic_sign_M7.svg",
-    "license": "CC0",
-    "authors": [
-      "Belgische Wetgever"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M7.svg"
-    ]
-  },
   {
     "path": "Cycle_barrier_double.svg",
     "license": "CC0",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 3c845d54d8..c9d9bdfa12 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -1607,7 +1607,7 @@
                     "3": {
                         "then": "Gemeinsamer Fuß-/Radweg"
                     },
-                    "4": {
+                    "7": {
                         "then": "Kein Verkehrsschild vorhanden"
                     }
                 },
@@ -1619,7 +1619,7 @@
                         "then": "Kein zusätzliches Verkehrszeichen vorhanden"
                     }
                 },
-                "question": "Hat das Verkehrszeichen D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
+                "question": "Hat das Verkehrszeichen D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
             },
             "cycleways_and_roads-cycleway:buffer": {
                 "question": "Wie breit ist der Abstand zwischen Radweg und Straße?",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index c8c77fd702..952f1efe78 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2675,6 +2675,15 @@
                         "then": "Unsegregated foot/cycleway"
                     },
                     "4": {
+                        "then": "Compulsory cycleway"
+                    },
+                    "5": {
+                        "then": "Compulsory (moped)cycleway"
+                    },
+                    "6": {
+                        "then": "Non-compulsory cycleway"
+                    },
+                    "7": {
                         "then": "No traffic sign present"
                     }
                 },
@@ -2704,7 +2713,7 @@
                         "then": "No supplementary traffic sign present"
                     }
                 },
-                "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?"
+                "question": "Does the traffic sign D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?"
             },
             "cycleways_and_roads-cycleway:buffer": {
                 "question": "How wide is the gap between the cycleway and the road?",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index b13733fc49..f3ae9e73a5 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2691,6 +2691,15 @@
                         "then": "Gedeeld voet-/fietspad"
                     },
                     "4": {
+                        "then": "Verplicht fietspad"
+                    },
+                    "5": {
+                        "then": "Verplicht bromfietspad"
+                    },
+                    "6": {
+                        "then": "Onverplicht fietspad"
+                    },
+                    "7": {
                         "then": "Geen verkeersbord aanwezig"
                     }
                 },
@@ -2720,7 +2729,7 @@
                         "then": "Geen onderbord aanwezig"
                     }
                 },
-                "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
+                "question": "Heeft het verkeersbord D7 (<img src='./assets/layers/cycleways_and_roads/traffic_sign/be/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
             },
             "cycleways_and_roads-cycleway:buffer": {
                 "question": "Hoe breed is de ruimte tussen het fietspad en de weg?",
diff --git a/package.json b/package.json
index cc39c8affe..0c5268bbda 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "main": "index.js",
   "scripts": {
     "start": "npm run generate:layeroverview && npm run strt",
-    "strt": "export NODE_OPTIONS=--max_old_space_size=8364 && parcel serve *.html UI/** Logic/** assets/*.json assets/svg/* assets/generated/* assets/layers/*/*.svg assets/layers/*/*.jpg assets/layers/*/*.png assets/layers/*/*.css assets/tagRenderings/*.json assets/themes/*/*.svg assets/themes/*/*.ttf assets/themes/*/*/*.ttf aassets/themes/*/*.otf assets/themes/*/*/*.otf ssets/themes/*/*.css assets/themes/*/*.jpg assets/themes/*/*.png vendor/* vendor/*/*",
+    "strt": "export NODE_OPTIONS=--max_old_space_size=8364 && parcel serve *.html UI/** Logic/** assets/*.json assets/svg/* assets/generated/* assets/layers/*/*.svg assets/layers/*/*/*/*.svg assets/layers/*/*.jpg assets/layers/*/*.png assets/layers/*/*.css assets/tagRenderings/*.json assets/themes/*/*.svg assets/themes/*/*.ttf assets/themes/*/*/*.ttf aassets/themes/*/*.otf assets/themes/*/*/*.otf ssets/themes/*/*.css assets/themes/*/*.jpg assets/themes/*/*.png vendor/* vendor/*/*",
     "strttest": "export NODE_OPTIONS=--max_old_space_size=8364 && parcel serve test.html",
     "watch:css": "tailwindcss -i index.css -o css/index-tailwind-output.css --watch",
     "generate:css": "tailwindcss -i index.css -o css/index-tailwind-output.css",