diff --git a/assets/layers/parking_spaces/license_info.json b/assets/layers/parking_spaces/license_info.json
new file mode 100644
index 000000000..e623b60ab
--- /dev/null
+++ b/assets/layers/parking_spaces/license_info.json
@@ -0,0 +1,10 @@
+[
+  {
+    "path": "parking_space.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/parking_spaces/parking_space.svg b/assets/layers/parking_spaces/parking_space.svg
new file mode 100644
index 000000000..fc1cb2ff4
--- /dev/null
+++ b/assets/layers/parking_spaces/parking_space.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="500"
+   height="500"
+   viewBox="0 0 132.29166 132.29167"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="Parking_space.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="105.28861"
+     inkscape:cy="436.23499"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2066"
+     inkscape:window-x="2149"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#1d5485;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 26.458333,121.70833 0,-111.124997 h 79.374997 l 0,111.124997"
+       id="path833"
+       sodipodi:nodetypes="cccc" />
+    <g
+       aria-label="P"
+       id="text833"
+       style="font-style:normal;font-weight:normal;font-size:68.771px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.71928">
+      <path
+         d="m 82.499093,56.25664 q 0,3.32438 -1.175286,6.178645 -1.141706,2.820686 -3.22364,4.90262 -2.585629,2.585629 -6.111486,3.895233 -3.525857,1.276025 -8.898592,1.276025 H 56.44133 V 91.145836 H 49.792571 V 41.145824 h 13.566155 q 4.499665,0 7.622567,0.772331 3.122902,0.738751 5.540633,2.350571 2.854265,1.914037 4.398926,4.768302 1.578241,2.854265 1.578241,7.219612 z m -6.917396,0.167898 q 0,-2.585628 -0.906649,-4.499665 -0.906649,-1.914037 -2.753526,-3.122902 -1.611821,-1.040968 -3.693755,-1.477502 -2.048355,-0.470115 -5.204837,-0.470115 h -6.5816 v 19.979858 h 5.607792 q 4.029551,0 6.54802,-0.705172 2.51847,-0.738751 4.09671,-2.316992 1.578241,-1.61182 2.216253,-3.391538 0.671592,-1.779719 0.671592,-3.995972 z"
+         style="stroke-width:1.71928"
+         id="path835" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/parking_spaces/parking_spaces.json b/assets/layers/parking_spaces/parking_spaces.json
new file mode 100644
index 000000000..1405789f5
--- /dev/null
+++ b/assets/layers/parking_spaces/parking_spaces.json
@@ -0,0 +1,155 @@
+{
+  "id": "parking_spaces",
+  "name": {
+    "en": "Parking Spaces"
+  },
+  "description": {
+    "en": "Layer showing individual parking spaces."
+  },
+  "minzoom": 20,
+  "source": {
+    "osmTags": "amenity=parking_space"
+  },
+  "tagRenderings": [
+    {
+      "id": "type",
+      "question": {
+        "en": "What kind of parking space is this?"
+      },
+      "mappings": [
+        {
+          "if": "parking_space=",
+          "then": {
+            "en": "This is a normal parking space"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "parking_space=normal",
+          "then": {
+            "en": "This is a normal parking space."
+          }
+        },
+        {
+          "if": "parking_space=disabled",
+          "then": {
+            "en": "This is a disabled parking space."
+          }
+        },
+        {
+          "if": "parking_space=private",
+          "then": {
+            "en": "This is a private parking space."
+          }
+        },
+        {
+          "if": "parking_space=charging",
+          "then": {
+            "en": "This is parking space reserved for charging vehicles."
+          }
+        },
+        {
+          "if": "parking_space=delivery",
+          "then": {
+            "en": "This is parking space reserved for deliveries."
+          }
+        },
+        {
+          "if": "parking_space=hgv",
+          "then": {
+            "en": "This is parking space reserved for heavy goods vehicles."
+          }
+        },
+        {
+          "if": "parking_space=caravan",
+          "then": {
+            "en": "This is parking space reserved for caravans or RVs."
+          }
+        },
+        {
+          "if": "parking_space=bus",
+          "then": {
+            "en": "This is parking space reserved for buses."
+          }
+        },
+        {
+          "if": "parking_space=motorcycle",
+          "then": {
+            "en": "This is parking space reserved for motorcycles."
+          }
+        },
+        {
+          "if": "parking_space=parent",
+          "then": {
+            "en": "This is a parking space reserved for parents with children."
+          }
+        },
+        {
+          "if": "parking_space=staff",
+          "then": {
+            "en": "This is a parking space reserved for staff."
+          }
+        },
+        {
+          "if": "parking_space=taxi",
+          "then": {
+            "en": "This is a parking space reserved for taxis."
+          }
+        },
+        {
+          "if": "parking_space=trailer",
+          "then": {
+            "en": "This is a parking space reserved for vehicles towing a trailer."
+          }
+        },
+        {
+          "if": "parking_space=car_sharing",
+          "then": {
+            "en": "This is a parking space reserved for car sharing."
+          }
+        }
+      ]
+    },
+    {
+      "id": "capacity",
+      "render": {
+        "en": "This parking spaces has {capacity} spaces."
+      },
+      "mappings": [
+        {
+          "if": "capacity=1",
+          "then": {
+            "en": "This parking space has 1 space."
+          }
+        }
+      ]
+    }
+  ],
+  "title": {
+    "render": {
+      "en": "Parking Space"
+    }
+  },
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "./assets/layers/parking_spaces/parking_space.svg",
+        "mappings": [
+          {
+            "if": "parking_space=disabled",
+            "then": "./assets/layers/toilet/wheelchair.svg"
+          }
+        ]
+      },
+      "iconSize": "20,20,center",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    },
+    {
+      "color": "#696969",
+      "width": "1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json
index 4a03f647b..ec190ff97 100644
--- a/assets/themes/parkings/parkings.json
+++ b/assets/themes/parkings/parkings.json
@@ -45,6 +45,7 @@
   "startZoom": 12,
   "widenFactor": 1.2,
   "layers": [
-    "parking"
+    "parking",
+    "parking_spaces"
   ]
 }
\ No newline at end of file