diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000..e1002670c3
Binary files /dev/null and b/.DS_Store differ
diff --git a/assets/.DS_Store b/assets/.DS_Store
new file mode 100644
index 0000000000..046c7db674
Binary files /dev/null and b/assets/.DS_Store differ
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index c6e5f57f0e..56da2650a2 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -1,7 +1,7 @@
 {
   "id": "parking",
   "name": {
-    "nl": "parking"
+    "nl": "Parking"
   },
   "minzoom": 12,
   "source": {
@@ -10,7 +10,8 @@
         {
           "or": [
             "amenity=parking",
-            "amenity=motorcycle_parking"
+            "amenity=motorcycle_parking",
+            "amenity=bicycle_parking"
           ]
         }
       ]
@@ -22,23 +23,21 @@
     },
     "mappings": [
       {
-        "if": {
-          "and": [
-            "name:nl~*"
-          ]
-        },
+        "if": "amenity=parking",
         "then": {
-          "nl": "{name:nl}"
+          "nl": "Auto Parking"
         }
       },
       {
-        "if": {
-          "and": [
-            "name~*"
-          ]
-        },
+        "if": "amenity=motorcycle_parking",
         "then": {
-          "nl": "{name}"
+          "nl": "Motorfiets Parking"
+        }
+      },
+      {
+        "if": "amenity=bicycle_parking",
+        "then": {
+          "nl": "Fietsenstalling"
         }
       }
     ]
@@ -169,7 +168,7 @@
   ],
   "wayHandling": 1,
   "iconSize": {
-    "render": "30,30,center"
+    "render": "36,36,center"
   },
   "color": {
     "render": "#E1AD01"
@@ -179,6 +178,7 @@
       "tags": [
         "amenity=parking",
         "amenity=motorcycle_parking",
+        "amenity=bicycle_parking",
         "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
       ],
       "title": {
diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json
index ffa2f0dc9a..1ff9b488df 100644
--- a/assets/layers/watermill/watermill.json
+++ b/assets/layers/watermill/watermill.json
@@ -1,7 +1,7 @@
 {
   "id": "watermill",
   "name": {
-    "nl": "watermolens"
+    "nl": "Watermolens"
   },
   "minzoom": 12,
   "source": {
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index 560b9d1435..2f85396c2b 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -608,7 +608,9 @@
     "sources": []
   },
   {
-    "authors": ["Hannah Declerck"],
+    "authors": [
+      "Hannah Declerck"
+    ],
     "path": "filter.svg",
     "license": "CC0",
     "sources": []
diff --git a/assets/themes/.DS_Store b/assets/themes/.DS_Store
new file mode 100644
index 0000000000..7d02d7d4e6
Binary files /dev/null and b/assets/themes/.DS_Store differ
diff --git a/assets/themes/natuurpunt/license_info.json b/assets/themes/natuurpunt/license_info.json
index c24e4be1c2..c192defd61 100644
--- a/assets/themes/natuurpunt/license_info.json
+++ b/assets/themes/natuurpunt/license_info.json
@@ -81,6 +81,24 @@
     "license": "CC0",
     "sources": []
   },
+  {
+    "authors": [],
+    "path": "parkingbike.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [],
+    "path": "parkingmotor.svg",
+    "license": "CC0",
+    "sources": []
+  },
+  {
+    "authors": [],
+    "path": "parkingwheels.svg",
+    "license": "CC0",
+    "sources": []
+  },
   {
     "authors": [],
     "path": "nature_reserve.svg",
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index 06d30fd7c4..993b5e1c66 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -21,7 +21,7 @@
   "version": "0",
   "startLat": 51.20875,
   "startLon": 3.22435,
-  "startZoom": 12,
+  "startZoom": 15,
   "widenFactor": 0.05,
   "socialImage": "",
   "layers": [
@@ -37,7 +37,7 @@
             ]
           }
         },
-        "minzoom": "8",
+        "minzoom": "10",
         "icon": {
           "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
         }
@@ -55,7 +55,7 @@
             ]
           }
         },
-        "minzoom": "8",
+        "minzoom": "10",
         "icon": {
           "render": "circle:#FE6F32;./assets/themes/natuurpunt/information.svg"
         }
@@ -143,6 +143,46 @@
         }
       }
     },
+    {
+      "builtin": [
+        "parking"
+      ],
+      "override": {
+        "minzoom": "16",
+        "icon": {
+          "render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg",
+          "mappings": [
+            {
+              "if": "amenity=bicycle_parking",
+              "then": "circle:#FE6F32;./assets/themes/natuurpunt/parkingbike.svg"
+            }
+          ]
+        },
+        "iconOverlays": [
+          {
+            "if": "amenity=motorcycle_parking",
+            "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingmotor.svg",
+            "badge": true
+          },
+          {
+            "if": "capacity:disabled=yes",
+            "then": "circle:#335D9F;./assets/themes/natuurpunt/parkingwheels.svg",
+            "badge": true
+          }
+        ]
+      }
+    },
+    {
+      "builtin": [
+        "information_board"
+      ],
+      "override": {
+        "minzoom": "16",
+        "icon": {
+          "render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
+        }
+      }
+    },
     {
       "builtin": [
         "bench"
@@ -164,28 +204,6 @@
           "render": "circle:#FE6F32;./assets/themes/natuurpunt/watermill.svg"
         }
       }
-    },
-    {
-      "builtin": [
-        "parking"
-      ],
-      "override": {
-        "minzoom": "18",
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/parking.svg"
-        }
-      }
-    },
-    {
-      "builtin": [
-        "information_board"
-      ],
-      "override": {
-        "minzoom": "18",
-        "icon": {
-          "render": "circle:#FE6F32;./assets/themes/natuurpunt/information_board.svg"
-        }
-      }
     }
   ],
   "roamingRenderings": []
diff --git a/assets/themes/natuurpunt/parkingbike.svg b/assets/themes/natuurpunt/parkingbike.svg
new file mode 100644
index 0000000000..e22f683e53
--- /dev/null
+++ b/assets/themes/natuurpunt/parkingbike.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-11 8 36 1"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M9.25,2.5h0a3,3,0,0,0-.8-1.29A4,4,0,0,0,6.92.33,7.23,7.23,0,0,0,4.55,0H.45A.45.45,0,0,0,0,.45V12.12a.45.45,0,0,0,.45.45h2a.45.45,0,0,0,.45-.45V8.26a0,0,0,0,1,0,0H4.62a7,7,0,0,0,2.32-.34A3.92,3.92,0,0,0,8.45,7a3.23,3.23,0,0,0,.8-1.37A5.55,5.55,0,0,0,9.47,4,5,5,0,0,0,9.25,2.5ZM6.87,4.87h0a1.36,1.36,0,0,1-.41.68A2,2,0,0,1,5.69,6a3.84,3.84,0,0,1-1.16.15H3a.45.45,0,0,1-.45-.45V2.54A.45.45,0,0,1,3,2.09H4.51a4.7,4.7,0,0,1,1.16.13,2.22,2.22,0,0,1,.77.38,1.43,1.43,0,0,1,.42.64A2.88,2.88,0,0,1,7,4.05,3.54,3.54,0,0,1,6.87,4.87Z"/><path class="cls-1" d="M9.64,16.78a.29.29,0,0,0,.22-.12l3-3.82a.29.29,0,0,0-.47-.35l-2.85,3.7-3.61-.07,1.65-3.48,4.74-.25a.3.3,0,1,0,0-.59l-4.92.27a.3.3,0,0,0-.25.17l-1.92,4a.28.28,0,0,0,0,.28.27.27,0,0,0,.24.14l4.21.09Z"/><path class="cls-1" d="M5.46,19A2.62,2.62,0,1,1,8,16.35,2.61,2.61,0,0,1,5.46,19Zm-.08-4.65a2,2,0,1,0,2.07,2,2,2,0,0,0-2.07-2Z"/><path class="cls-1" d="M14.16,18.88a2.62,2.62,0,1,1,2.57-2.66,2.62,2.62,0,0,1-2.57,2.66Zm-.08-4.65a2,2,0,1,0,2.07,2,2,2,0,0,0-2.07-2Z"/><path class="cls-1" d="M14.12,17h.09a.31.31,0,0,0,.18-.38L12,10,10.52,9.8a.28.28,0,0,0-.32.25.29.29,0,0,0,.26.33l1.15.13,2.22,6.26a.29.29,0,0,0,.29.19Z"/><line class="cls-1" x1="9.54" y1="16.31" x2="6.79" y2="11.31"/><polygon class="cls-1" points="9.28 16.45 9.8 16.17 7.05 11.17 6.53 11.45 9.28 16.45 9.28 16.45"/><path class="cls-1" d="M8.61,11.23s0-.18-.36-.26a17.6,17.6,0,0,0-2.17,0l0,.57,2.39.05S8.74,11.4,8.61,11.23Z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/parkingmotor.svg b/assets/themes/natuurpunt/parkingmotor.svg
new file mode 100644
index 0000000000..0fc18d9a68
--- /dev/null
+++ b/assets/themes/natuurpunt/parkingmotor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-23 6 60 1"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M9.25,2.5h0a3,3,0,0,0-.8-1.29A4,4,0,0,0,6.92.33,7.23,7.23,0,0,0,4.55,0H.45A.45.45,0,0,0,0,.45V12.12a.45.45,0,0,0,.45.45h2a.45.45,0,0,0,.45-.45V8.26a0,0,0,0,1,0,0H4.62a7,7,0,0,0,2.32-.34A3.92,3.92,0,0,0,8.45,7a3.23,3.23,0,0,0,.8-1.37A5.55,5.55,0,0,0,9.47,4,5,5,0,0,0,9.25,2.5ZM6.87,4.87h0a1.36,1.36,0,0,1-.41.68A2,2,0,0,1,5.69,6a3.84,3.84,0,0,1-1.16.15H3a.45.45,0,0,1-.45-.45V2.54A.45.45,0,0,1,3,2.09H4.51a4.7,4.7,0,0,1,1.16.13,2.22,2.22,0,0,1,.77.38,1.43,1.43,0,0,1,.42.64A2.88,2.88,0,0,1,7,4.05,3.54,3.54,0,0,1,6.87,4.87Z"/><path id="Icon_awesome-motorcycle" data-name="Icon awesome-motorcycle" class="cls-1" d="M15.37,12.93a2.38,2.38,0,0,0-.84.13L13.88,12h1.63a.47.47,0,0,0,.47-.47h0v-.63a.48.48,0,0,0-.47-.48h-.9a.48.48,0,0,0-.35.16l-.74.82-.44-.75a.5.5,0,0,0-.41-.23H11.09a.33.33,0,0,0-.32.32V11a.33.33,0,0,0,.32.32H12.4l.38.63h-3a2.22,2.22,0,0,0-2-.79H6.68a.48.48,0,0,0-.48.48h0a.48.48,0,0,0,.47.47H7.78a1,1,0,0,1,.94.49L8.5,13a2.52,2.52,0,1,0,1.7,3.14.29.29,0,0,0,0-.09h1.66a.48.48,0,0,0,.48-.47v0a3,3,0,0,1,1.1-2.47l.25.41a2.53,2.53,0,1,0,3.56.28A2.5,2.5,0,0,0,15.37,12.93ZM7.78,17a1.58,1.58,0,1,1,0-3.16l.24,0-.81,1.49a.47.47,0,0,0,.41.7h1.6A1.57,1.57,0,0,1,7.78,17Zm9.15-1.49a1.58,1.58,0,0,1-3.16-.09,1.61,1.61,0,0,1,.44-1.09l1,1.63a.32.32,0,0,0,.44.11l.27-.16a.32.32,0,0,0,.1-.44l-1-1.59a1.55,1.55,0,0,1,.31,0,1.57,1.57,0,0,1,1.58,1.57Z"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/themes/natuurpunt/parkingwheels.svg b/assets/themes/natuurpunt/parkingwheels.svg
new file mode 100644
index 0000000000..3e08f733bb
--- /dev/null
+++ b/assets/themes/natuurpunt/parkingwheels.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-24 7 60 1"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M7.54,11.73a1,1,0,1,1,1-1A.95.95,0,0,1,7.54,11.73Zm3.37,4.9H7.82a1,1,0,0,1-1-.86l-.16-2.89a.92.92,0,1,1,1.83-.11l.06,1h1.78a.44.44,0,0,1,.44.43.44.44,0,0,1-.44.43H8.63l0,.54H11a.56.56,0,0,1,.46.27l1.73,2.92a.56.56,0,0,1-.19.76.57.57,0,0,1-.77-.19Zm0,.86.53.89A3.58,3.58,0,1,1,6.35,14l0,.87A2.83,2.83,0,1,0,11,17.49Z"/><path class="cls-1" d="M9.25,2.5h0a3,3,0,0,0-.8-1.29A4,4,0,0,0,6.92.33,7.23,7.23,0,0,0,4.55,0H.45A.45.45,0,0,0,0,.45V12.12a.45.45,0,0,0,.45.45h2a.45.45,0,0,0,.45-.45V8.26a0,0,0,0,1,0,0H4.62a7,7,0,0,0,2.32-.34A3.92,3.92,0,0,0,8.45,7a3.23,3.23,0,0,0,.8-1.37A5.55,5.55,0,0,0,9.47,4,5,5,0,0,0,9.25,2.5ZM6.87,4.87h0a1.36,1.36,0,0,1-.41.68A2,2,0,0,1,5.69,6a3.84,3.84,0,0,1-1.16.15H3a.45.45,0,0,1-.45-.45V2.54A.45.45,0,0,1,3,2.09H4.51a4.7,4.7,0,0,1,1.16.13,2.22,2.22,0,0,1,.77.38,1.43,1.43,0,0,1,.42.64A2.88,2.88,0,0,1,7,4.05,3.54,3.54,0,0,1,6.87,4.87Z"/></g></g></svg>
\ No newline at end of file