diff --git a/assets/layers/ice_cream/ice_cream.json b/assets/layers/ice_cream/ice_cream.json
index d788d62bf..791e759fd 100644
--- a/assets/layers/ice_cream/ice_cream.json
+++ b/assets/layers/ice_cream/ice_cream.json
@@ -38,6 +38,11 @@
         "point",
         "centroid"
       ],
+      "label": {
+        "render": "{name}",
+        "condition": "name~*"
+      },
+      "labelCssClasses": "bg-white rounded px-2",
       "marker": [
         {
           "icon": "circle",
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 82ba198c8..aae30f25b 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -172,11 +172,12 @@
           "then": "circle:white;./assets/layers/id_presets/fas-key.svg"
         }
       ],
+      "labelCssClasses": "bg-white rounded px-2",,
       "label": {
         "mappings": [
           {
             "if": "name~*",
-            "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+            "then": "{name}"
           }
         ]
       },
@@ -366,7 +367,7 @@
         ]
       }
     },
-    "opening_hours_by_appointment",
+    "opening_hours",
     "website",
     "email",
     "phone",