diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg
new file mode 100644
index 0000000000..001b5eac12
--- /dev/null
+++ b/assets/layers/kerbs/KerbIcon.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.46875"
+   height="14.006409"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="kerb05.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.103137"
+     inkscape:cy="8.2391685"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-334.84375px"
+       originy="-479.73718px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-334.84375,-558.61859)">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.56912518;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 335.15288,572.3216 4.00775,0 0,-3.59195 -1.19172,-3.53528 -0.81215,-0.0566 -2.00388,0 z"
+       id="path2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.56912518;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 334.98545,565.19437 11.02133,-6.28593 c 1.62563,0.0118 2.38113,-0.13278 3.00583,0.89799 l 1.00194,2.69397 0,3.59197 -11.02133,6.28592 0,-3.59195 -1.00194,-2.69397 c -0.46801,-1.25837 -1.61212,-0.898 -3.00583,-0.898 z"
+       id="path3777"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccsc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.47427094;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 338.99322,568.78634 11.02133,-6.28594"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
new file mode 100644
index 0000000000..2c73adeb79
--- /dev/null
+++ b/assets/layers/kerbs/kerbs.json
@@ -0,0 +1,92 @@
+{
+  "id": "kerbs",
+  "name": {
+    "en": "Kerbs",
+    "nl": "Stoepranden"
+  },
+  "description": {
+    "en": "A layer showing kerbs.",
+    "nl": "Een laag met stoepranden."
+  },
+  "source": {
+    "osmTags": "barrier=kerb"
+  },
+  "minzoom": 13,
+  "title": {
+    "render": {
+      "en": "Kerb",
+      "nl": "Stoeprand"
+    }
+  },
+  "mapRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "icon": "./assets/layers/kerbs/KerbIcon.svg",
+      "iconBadges": [
+        {
+          "if": "kerb=raised",
+          "then": "square:#f44e42"
+        },
+        {
+          "if": "kerb=lowered",
+          "then": "triangle:#11ff00"
+        },
+        {
+          "if": "kerb=flush",
+          "then": "circle:#11ff00"
+        }
+      ]
+    }
+  ],
+  "tagRenderings": [
+    {
+      "id": "kerb-type",
+      "question": {
+        "en": "What is the height of this kerb?",
+        "nl": "Hoe hoog is deze stoeprand?"
+      },
+      "mappings": [
+        {
+          "if": "kerb=raised",
+          "then": {
+            "en": "Raised (>3 cm)",
+            "nl": "Hoog (>3 cm)"
+          }
+        },
+        {
+          "if": "kerb=lowered",
+          "then": {
+            "en": "Lowered (~3 cm)",
+            "nl": "Verlaagd (~3 cm)"
+          }
+        },
+        {
+          "if": "kerb=flush",
+          "then": {
+            "en": "Flush (0cm)",
+            "nl": "Vlak (0cm)"
+          }
+        },
+        {
+          "if": "kerb=no",
+          "then": {
+            "en": "None",
+            "nl": "Geen"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "kerb=yes",
+          "then": {
+            "en": "Yes",
+            "nl": "Ja"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/kerbs/license_info.json b/assets/layers/kerbs/license_info.json
new file mode 100644
index 0000000000..8fc0aa4fe3
--- /dev/null
+++ b/assets/layers/kerbs/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "KerbIcon.svg",
+    "license": "CC0",
+    "authors": [
+      "Treeem"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:KerbIcon.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json
new file mode 100644
index 0000000000..721a000ac4
--- /dev/null
+++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json
@@ -0,0 +1,21 @@
+{
+  "id": "kerbs_and_crossings",
+  "maintainer": "Robin van der Linde",
+  "version": "20211215",
+  "title": {
+    "en": "Crossings and Kerbs",
+    "nl": "Oversteekplaatsen en stoepranden"
+  },
+  "description": {
+    "en": "A map showing kerbs and crossings.",
+    "nl": "Een kaart met stoepranden en oversteekplaatsen."
+  },
+  "icon": "./assets/layers/kerbs/KerbIcon.svg",
+  "startZoom": 19,
+  "startLat": 53.23776,
+  "startLon": 6.53812,
+  "layers": [
+    "crossings",
+    "kerbs"
+  ]
+}
\ No newline at end of file