diff --git a/assets/layers/fitness_centre/fitness_centre.json b/assets/layers/fitness_centre/fitness_centre.json
index 1ce8b8330..7e9739127 100644
--- a/assets/layers/fitness_centre/fitness_centre.json
+++ b/assets/layers/fitness_centre/fitness_centre.json
@@ -74,7 +74,16 @@
       ],
       "icon": "circle:white;./assets/layers/fitness_centre/gym.svg",
       "iconSize": "40,40,center",
-      "label": "{name}"
+      "label": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>",
+      "iconBadges": [
+        {
+          "if": "opening_hours~*",
+          "then": "isOpen"
+        }
+      ]
     }
+  ],
+  "filter": [
+    "open_now"
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json
index 7f58076e9..3ec9023ab 100644
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@@ -323,25 +323,7 @@
         "en": "The fitness station is maintained by {operator}."
       }
     },
-    {
-      "id": "opening_hours",
-      "question": {
-        "en": "When is this fitness station opened?"
-      },
-      "freeform": {
-        "key": "opening_hours",
-        "type": "opening_hours"
-      },
-      "render": "{opening_hours_table()}",
-      "mappings": [
-        {
-          "if": "opening_hours=24/7",
-          "then": {
-            "en": "24/7"
-          }
-        }
-      ]
-    }
+    "opening_hours"
   ],
   "presets": [
     {
@@ -362,7 +344,21 @@
         "centroid"
       ],
       "icon": "circle:white;./assets/layers/fitness_station/fitness.svg",
-      "iconSize": "40,40,center"
+      "iconSize": "40,40,center",
+      "iconBadges": [
+        {
+          "if": {
+            "and": [
+              "opening_hours!=24/7",
+              "opening_hours~*"
+            ]
+          },
+          "then": "isOpen"
+        }
+      ]
     }
+  ],
+  "filter": [
+    "open_now"
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index b1cfeb67c..d5ec6eeeb 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -580,5 +580,8 @@
       "width": "1",
       "fill": "false"
     }
+  ],
+  "filter": [
+    "open_now"
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/sports_centre/sports_centre.json b/assets/layers/sports_centre/sports_centre.json
index b730d9889..2971a4db5 100644
--- a/assets/layers/sports_centre/sports_centre.json
+++ b/assets/layers/sports_centre/sports_centre.json
@@ -42,7 +42,16 @@
   "mapRendering": [
     {
       "icon": "circle:white;./assets/layers/sports_centre/sports_centre.svg",
-      "location": ["point", "centroid"]
+      "iconBadges": [
+        {
+          "if": "opening_hours~*",
+          "then": "isOpen"
+        }
+      ],
+      "location": [
+        "point",
+        "centroid"
+      ]
     },
     {
       "color": "darkgreen",
diff --git a/assets/themes/sports/sports.json b/assets/themes/sports/sports.json
index 4306a108b..f17d93c39 100644
--- a/assets/themes/sports/sports.json
+++ b/assets/themes/sports/sports.json
@@ -46,7 +46,12 @@
             }
           }
         ],
-        "minzoom": 12
+        "minzoom": 12,
+        "mapRendering": [
+          {
+            "icon": "./assets/layers/id_presets/maki-shop.svg"
+          }
+        ]
       }
     }
   ]