diff --git a/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
new file mode 100644
index 000000000..eb6ab3ea3
--- /dev/null
+++ b/assets/layers/cyclist_waiting_aid/cyclist_waiting_aid.json
@@ -0,0 +1,148 @@
+{
+  "credits": "Robin van der Linde",
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "pin",
+          "color": "#538EE8"
+        },
+        {
+          "icon": "./assets/layers/cyclist_waiting_aid/waiting_aid.svg"
+        }
+      ],
+      "anchor": "bottom"
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What kind of components does this waiting aid have?"
+      },
+      "id": "type",
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "footrest=yes",
+          "then": {
+            "en": "There is a board or peg to rest your foot on here"
+          },
+          "ifnot": "footrest="
+        },
+        {
+          "if": "handrest=yes",
+          "then": {
+            "en": "There is a rail or a handle to hold on to here"
+          },
+          "ifnot": "handrest="
+        }
+      ]
+    },
+    {
+      "question": {
+        "en": "On what side of the road is this located?"
+      },
+      "id": "side",
+      "mappings": [
+        {
+          "if": "side=left",
+          "then": {
+            "en": "This waiting aid is located on the left side"
+          }
+        },
+        {
+          "if": "side=right",
+          "then": {
+            "en": "This waiting aid is located on the right side"
+          }
+        },
+        {
+          "if": "side=both",
+          "then": {
+            "en": "There are waiting aids on both sides of the road"
+          }
+        }
+      ]
+    },
+    {
+      "condition": "direction~*",
+      "id": "direction",
+      "mappings": [
+        {
+          "if": "direction=forward",
+          "then": {
+            "en": "This waiting aid can be used when going forward on this way"
+          }
+        },
+        {
+          "if": "direction=backward",
+          "then": {
+            "en": "This waiting aid can be used when going backward on this way"
+          }
+        }
+      ],
+      "render": {
+        "en": "This waiting aid can be used when going in {direction} direction"
+      }
+    }
+  ],
+  "lineRendering": [
+    {
+      "width": 1,
+      "color": "blue"
+    }
+  ],
+  "credits:uid": 5093765,
+  "id": "cyclist_waiting_aid",
+  "description": {
+    "en": "Various pieces of infrastructure that aid cyclists while they wait at a traffic light."
+  },
+  "source": {
+    "osmTags": "highway=cyclist_waiting_aid"
+  },
+  "name": {
+    "en": "Cyclist Waiting Aids"
+  },
+  "title": {
+    "render": {
+      "en": "Cyclist Waiting Aid"
+    }
+  },
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "highway=",
+        "side=",
+        "footrest=",
+        "handrest=",
+        "material=",
+        "height=",
+        "support=",
+        "count=",
+        "capacity="
+      ]
+    }
+  },
+  "allowMove": false,
+  "presets": [
+    {
+      "title": {
+        "en": "a cyclist waiting aid"
+      },
+      "tags": [
+        "highway=cyclist_waiting_aid"
+      ],
+      "description": {
+        "en": "A footrest, handrail or other aid, to improve comfort while waiting at traffic lights"
+      },
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/cyclist_waiting_aid/license_info.json b/assets/layers/cyclist_waiting_aid/license_info.json
new file mode 100644
index 000000000..45b87f4de
--- /dev/null
+++ b/assets/layers/cyclist_waiting_aid/license_info.json
@@ -0,0 +1,10 @@
+[
+  {
+    "path": "waiting_aid.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/cyclist_waiting_aid/waiting_aid.svg b/assets/layers/cyclist_waiting_aid/waiting_aid.svg
new file mode 100644
index 000000000..f154e0c64
--- /dev/null
+++ b/assets/layers/cyclist_waiting_aid/waiting_aid.svg
@@ -0,0 +1,21 @@
+<svg width="314" height="374" viewBox="0 0 314 374" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_2)">
+<path d="M157 0C70.2969 0 0.0117188 70.1211 0.0117188 156.621C0.0117188 231.017 52.0255 293.253 121.742 309.223L147.246 364.684C152.957 377.105 170.652 377.105 176.367 364.684L203.199 306.334C267.352 286.654 313.988 227.075 313.988 156.621C313.988 70.1211 243.703 0 157 0Z" fill="#538EE8"/>
+<line x1="48.5355" y1="202.464" x2="90.9619" y2="244.891" stroke="white" stroke-width="10"/>
+<line x1="90.9619" y1="167.536" x2="48.5355" y2="209.962" stroke="white" stroke-width="10"/>
+<line x1="200.536" y1="216.464" x2="242.962" y2="258.891" stroke="white" stroke-width="10"/>
+<line x1="242.962" y1="181.536" x2="200.536" y2="223.962" stroke="white" stroke-width="10"/>
+<path d="M59 197L213 210" stroke="white" stroke-width="10"/>
+<path d="M84 74L246 85" stroke="white" stroke-width="10"/>
+<path d="M89 172V72" stroke="white" stroke-width="10"/>
+<path d="M241 185V85" stroke="white" stroke-width="10"/>
+<path d="M66 190L220 203" stroke="white" stroke-width="10"/>
+<path d="M73 184L227 197" stroke="white" stroke-width="10"/>
+<path d="M81 177L235 190" stroke="white" stroke-width="10"/>
+</g>
+<defs>
+<clipPath id="clip0_1_2">
+<rect width="314" height="374" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/assets/layers/cyclist_waiting_aid/waiting_aid.svg.license b/assets/layers/cyclist_waiting_aid/waiting_aid.svg.license
new file mode 100644
index 000000000..2c50b6981
--- /dev/null
+++ b/assets/layers/cyclist_waiting_aid/waiting_aid.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Robin van der Linde
+SPDX-License-Identifier: CC0
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 638efa2ab..4e50ccfec 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -56,13 +56,18 @@
   "startLon": 3.75,
   "hideFromOverview": false,
   "layers": [
-    "cycleways_and_roads",
-    "barrier",
-    "crossings",
-    "bicycle_counter"
+    {
+      "builtin": [
+        "cycleways_and_roads",
+        "barrier",
+        "crossings",
+        "bicycle_counter",
+        "cyclist_waiting_aid"
+      ],
+      "override": {
+        "minzoom": 16
+      }
+    }
   ],
-  "overrideAll": {
-    "minzoom": 16
-  },
   "enableDownload": true
-}
+}
\ No newline at end of file