diff --git a/health.json b/health.json
index 7f1119b..57e3148 100644
--- a/health.json
+++ b/health.json
@@ -79,6 +79,52 @@
         "</table>"
     ],
     "const": [
+        {
+            "types": [
+                "amenity=hospital",
+                "healthcare=hospital"
+            ],
+            "sign": "<i class=\"fas fa-hospital-alt\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=clinic"
+            ],
+            "sign": "<i class=\"fas fa-hospital\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=centre"
+            ],
+            "sign": "<i class=\"far fa-hospital\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=doctor",
+                "amenity=doctors"
+            ],
+            "sign": "<img data-src='maki:doctor'>"
+        },
+        {
+            "types": [
+                "amenity=pharmacy",
+                "healthcare=pharmacy"
+            ],
+            "sign": "<img data-src='maki:pharmacy'>"
+        },
+        {
+            "types": [
+                "emergency=defibrillator"
+            ],
+            "sign": "<img data-src='maki:defibrillator'>"
+        },
+        {
+            "types": [
+                "healthcare=dentist",
+                "amenity=dentist"
+            ],
+            "sign": "<img data-src='maki:dentist'>"
+        },
         {
             "types": [
                 "amenity=baby_hatch"
@@ -99,57 +145,104 @@
         },
         {
             "types": [
-                "healthcare=clinic"
+                "amenity=nursing_home"
+            ]
+        },
+        {
+            "types": [
+                "amenity=social_facility"
             ],
-            "sign": "🏥"
+            "sign": "<i class=\"fas fa-users\"></i>"
         },
         {
             "types": [
-                "emergency=defibrillator"
+                "amenity=veterinary"
             ],
-            "sign": "<img data-src='maki:defibrillator'>"
+            "sign": "<img data-src='maki:veterinary'>"
         },
         {
             "types": [
-                "healthcare=dentist"
+                "healthcare=physiotherapist"
             ],
-            "sign": "<img data-src='maki:dentist'>"
+            "sign": "<i class=\"fas fa-user-injured\"></i>"
         },
         {
             "types": [
-                "healthcare=doctor",
-                "amenity=doctors"
+                "healthcare=psychotherapist"
             ],
-            "sign": "<img data-src='maki:doctor'>"
+            "sign": "<i class=\"fas fa-couch\"></i>"
         },
         {
             "types": [
-                "amenity=hospital",
-                "healthcare=hospital"
+                "healthcare=alternative"
             ],
-            "sign": "🏥"
+            "sign": ""
         },
         {
             "types": [
-                "amenity=nursing_home"
-            ]
+                "healthcare=audiologist"
+            ],
+            "sign": "<i class=\"fas fa-headphones-alt\"></i>"
         },
         {
             "types": [
-                "amenity=pharmacy"
+                "healthcare=birthing_center"
             ],
-            "sign": "<img data-src='maki:pharmacy'>"
+            "sign": "<i class=\"fas fa-baby\"></i>"
         },
         {
             "types": [
-                "amenity=social_facility"
-            ]
+                "healthcare=dialysis"
+            ],
+            "sign": ""
         },
         {
             "types": [
-                "amenity=veterinary"
+                "healthcare=laboratory"
             ],
-            "sign": "<img data-src='maki:veterinary'>"
+            "sign": "<i class=\"fas fa-vials\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=midwife"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=nutrition_counseling"
+            ],
+            "sign": "<i class=\"fas fa-carrot\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=occupational_therapist"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=optometrist"
+            ],
+            "sign": "<i class=\"fas fa-eye\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=podiatrist"
+            ],
+            "sign": ""
+        },
+        {
+            "types": [
+                "healthcare=rehabilitation"
+            ],
+            "sign": "<i class=\"fas fa-crutch\"></i>"
+        },
+        {
+            "types": [
+                "healthcare=speech_therapist"
+            ],
+            "sign": ""
         }
     ],
     "filter": {