diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 5a5ab9b32..4ecb2532c 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -268,19 +268,7 @@
         },
         "pointRendering": [
           {
-            "marker": [
-              {
-                "mappings": null
-              }
-            ],
-            "iconSize": "40,40",
-            "anchor": "center",
-            "iconBadges": [
-              {
-                "if": "parking_space=disabled",
-                "then": "./assets/layers/toilet/wheelchair.svg"
-              }
-            ]
+            "iconSize": "40,40"
           }
         ],
         "name": {
@@ -599,4 +587,4 @@
   },
   "enableDownload": true,
   "widenFactor": 2
-}
+}
\ No newline at end of file
diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json
index c9a18cfb2..9d96a04da 100644
--- a/assets/themes/parkings/parkings.json
+++ b/assets/themes/parkings/parkings.json
@@ -58,7 +58,13 @@
   "layers": [
     "parking",
     "parking_spaces",
-    "parking_ticket_machine"
+    "parking_ticket_machine",
+    {
+      "builtin": "charging_station",
+      "override": {
+        "minzoom": 18
+      }
+    }
   ],
   "widenFactor": 1.2
 }
\ No newline at end of file