diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 054d6a7b77..28772fd1d6 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -972,64 +972,8 @@
     "mapRendering": [
         {
             "location": [
-                "point",
-                "centroid"
-            ],
-            "icon": {
-                "render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
-                "mappings": [
-                    {
-                        "if": "bicycle=yes",
-                        "then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
-                    },
-                    {
-                        "if": {
-                            "or": [
-                                "car=yes",
-                                "motorcar=yes"
-                            ]
-                        },
-                        "then": "pin:#fff;./assets/themes/charging_stations/car.svg"
-                    }
-                ]
-            },
-            "iconBadges": [
-                {
-                    "if": {
-                        "or": [
-                            "disused:amenity=charging_station",
-                            "operational_status=broken"
-                        ]
-                    },
-                    "then": "cross:#c22;"
-                },
-                {
-                    "if": {
-                        "or": [
-                            "proposed:amenity=charging_station",
-                            "planned:amenity=charging_station"
-                        ]
-                    },
-                    "then": "./assets/layers/charging_station/under_construction.svg"
-                },
-                {
-                    "if": {
-                        "and": [
-                            "bicycle=yes",
-                            {
-                                "or": [
-                                    "motorcar=yes",
-                                    "car=yes"
-                                ]
-                            }
-                        ]
-                    },
-                    "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
-                }
-            ],
-            "iconSize": {
-                "render": "50,50,bottom"
-            }
+                "point"
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 617650f6a3..4395794732 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -33,8 +33,7 @@
                     "operational_status=closed"
                 ]
             },
-            "then": "close:#c33",
-            "badge": true
+            "then": "close:#c33"
         }
     ],
     "iconSize": "40,40,bottom",
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 0e6b5db97f..b0df677b3c 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -35,8 +35,7 @@
     "iconOverlays": [
         {
             "if": "opening_hours~*",
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         },
         {
             "if": {
@@ -47,8 +46,7 @@
             },
             "then": {
                 "render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
-            },
-            "badge": true
+            }
         }
     ],
     "label": {
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index a0156e78e0..cf44f3723c 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -482,8 +482,7 @@
                     "opening_hours~*"
                 ]
             },
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         }
     ],
     "width": {
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 54d158fbb8..a5458a6800 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -280,8 +280,7 @@
     "iconOverlays": [
         {
             "if": "opening_hours~*",
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         }
     ],
     "width": {
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index 86ddcaadc2..f34979561f 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -423,8 +423,7 @@
                     "opening_hours~*"
                 ]
             },
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         },
         {
             "if": {
@@ -434,8 +433,7 @@
                     "access=no"
                 ]
             },
-            "then": "circle:white;./assets/layers/sport_pitch/lock.svg",
-            "badge": true
+            "then": "circle:white;./assets/layers/sport_pitch/lock.svg"
         }
     ],
     "width": {
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index 948e68cfda..7a572044fc 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -676,7 +676,39 @@
           }
         }
       ],
-      "wayHandling": 2
+      "wayHandling": 2,
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:white;./assets/themes/campersite/caravan.svg",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "fee=no"
+                  ]
+                },
+                "then": "circle:white;./assets/themes/campersite/caravan_green.svg"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     },
     {
       "id": "dumpstations",
@@ -1075,6 +1107,27 @@
             "de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom."
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
+          },
+          "iconSize": {
+            "render": "32,32,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
       ]
     }
   ],
diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
index b53683b3ba..09f793af5f 100644
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -318,7 +318,29 @@
           }
         }
       ],
-      "wayHandling": 2
+      "wayHandling": 2,
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/hydrant.svg"
+          },
+          "iconSize": {
+            "render": "20,20,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     },
     {
       "id": "extinguisher",
@@ -435,7 +457,20 @@
           }
         }
       ],
-      "wayHandling": 1
+      "wayHandling": 1,
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
+          },
+          "iconSize": {
+            "render": "20,20,center"
+          },
+          "location": [
+            "point"
+          ]
+        }
+      ]
     },
     {
       "id": "fire_stations",
@@ -659,6 +694,28 @@
             "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions."
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
+          },
+          "iconSize": {
+            "render": "35,35,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#c22"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
       ]
     },
     {
@@ -860,7 +917,29 @@
           }
         }
       ],
-      "wayHandling": 2
+      "wayHandling": 2,
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
+          },
+          "iconSize": {
+            "render": "35,35,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
+      ]
     }
   ],
   "defaultBackgroundId": "HDM_HOT"
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index c7e910d48b..05490dc114 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -229,6 +229,23 @@
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
+          "label": {
+            "mappings": [
+              {
+                "if": "generator:output:electricity~^[0-9]+.*[W]$",
+                "then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
+              }
+            ]
+          },
+          "iconSize": "40, 40, bottom",
+          "location": [
+            "point"
+          ]
+        }
       ]
     }
   ],
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 7cc368b83b..cce2b5ccbd 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -80,7 +80,29 @@
             "razed:amenity=post_box"
           ]
         }
-      }
+      },
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/postboxes/postbox.svg"
+          },
+          "iconSize": {
+            "render": "40,40,bottom"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
+      ]
     },
     {
       "id": "postoffices",
@@ -133,8 +155,7 @@
       "iconOverlays": [
         {
           "if": "opening_hours~*",
-          "then": "isOpen",
-          "badge": true
+          "then": "isOpen"
         }
       ],
       "width": {
@@ -169,6 +190,34 @@
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "square:white;./assets/themes/postboxes/post_office.svg"
+          },
+          "iconBadges": [
+            {
+              "if": "opening_hours~*",
+              "then": "isOpen"
+            }
+          ],
+          "iconSize": {
+            "render": "40,40,bottom"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
       ]
     }
   ]
diff --git a/assets/themes/sidewalks/sidewalks.json b/assets/themes/sidewalks/sidewalks.json
index 60a245ccc4..940caba80f 100644
--- a/assets/themes/sidewalks/sidewalks.json
+++ b/assets/themes/sidewalks/sidewalks.json
@@ -41,49 +41,11 @@
       "tagRenderings": [],
       "mapRendering": [
         {
-          "color": "#ffffff55",
-          "width": 8
+          "location": [
+            "point"
+          ]
         },
-        {
-          "color": {
-            "render": "#888"
-          },
-          "width": {
-            "render": 6,
-            "mappings": [
-              {
-                "if": {
-                  "or": [
-                    "sidewalk:left=",
-                    "sidewalk:left=no",
-                    "sidewalk:left=separate"
-                  ]
-                },
-                "then": 0
-              }
-            ]
-          },
-          "offset": -6
-        },
-        {
-          "color": "#888",
-          "width": {
-            "render": 6,
-            "mappings": [
-              {
-                "if": {
-                  "or": [
-                    "sidewalk:right=",
-                    "sidewalk:right=no",
-                    "sidewalk:right=separate"
-                  ]
-                },
-                "then": 0
-              }
-            ]
-          },
-          "offset": 6
-        }
+        {}
       ],
       "allowSplit": true
     }
diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json
index ad89688451..537562380b 100644
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@@ -112,6 +112,29 @@
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
+            "mappings": [
+              {
+                "if": "_embedding_object:id~*",
+                "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
+              },
+              {
+                "if": "_imported=yes",
+                "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        }
       ]
     },
     {
@@ -258,7 +281,60 @@
             "then": "#ff0"
           }
         ]
-      }
+      },
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/uk_addresses/housenumber_ok.svg",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    {
+                      "and": [
+                        "addr:housenumber=",
+                        "nohousenumber!=yes"
+                      ]
+                    },
+                    "addr:street="
+                  ]
+                },
+                "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    {
+                      "and": [
+                        "addr:housenumber=",
+                        "nohousenumber!=yes"
+                      ]
+                    },
+                    "addr:street="
+                  ]
+                },
+                "then": "#ff0"
+              }
+            ]
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     },
     {
       "id": "named_streets",
@@ -276,7 +352,22 @@
       },
       "width": {
         "render": "0"
-      }
+      },
+      "mapRendering": [
+        {
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#ccc"
+          },
+          "width": {
+            "render": "0"
+          }
+        }
+      ]
     }
   ]
 }
\ No newline at end of file