diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 76898f88e..09bd0ecda 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -48,6 +48,21 @@
   },
   "pointRendering": [
     {
+      "iconBadges": [
+        {
+          "if": "opening_hours~*",
+          "then": "icons.isOpen"
+        },
+        {
+          "if": {
+            "or": [
+              "wheelchair=yes",
+              "wheelchair=designated"
+            ]
+          },
+          "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
+        }
+      ],
       "iconSize": {
         "render": "20,20",
         "mappings": [