diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
index 667d79d..efd198b 100644
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -92,7 +92,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:20px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_pillar.svg\" /> Pillar type."
+                "en": "<img style=\"width:15px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_pillar.svg\" /> Pillar type."
               }
             },
             {
@@ -102,7 +102,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:20px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_unknown.svg\" /> Pipe type."
+                "en": "<img style=\"width:15px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_unknown.svg\" /> Pipe type."
               }
             },
             {
@@ -112,7 +112,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:20px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_unknown.svg\" /> Wall type."
+                "en": "<img style=\"width:15px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_unknown.svg\" /> Wall type."
               }
             },
             {
@@ -122,7 +122,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:20px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg\" /> Underground type."
+                "en": "<img style=\"width:15px\" src=\"https://mapcomplete.braindeaddev.com/assets/layers/fire/hydrant_underground.svg\" /> Underground type."
               }
             }
           ]
@@ -175,7 +175,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "https://upload.wikimedia.org/wikipedia/commons/6/66/Hydrant_02.svg"
+        "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg"
       },
       "width": {
         "render": "8"
@@ -264,7 +264,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "https://upload.wikimedia.org/wikipedia/commons/e/e8/MUTCD_RS-090.svg"
+        "render": "https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg"
       },
       "width": {
         "render": "8"
@@ -419,7 +419,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "https://upload.wikimedia.org/wikipedia/commons/8/84/British_Columbia_W-318-L.svg"
+        "render": "https://upload.wikimedia.org/wikipedia/commons/1/19/Twemoji12_1f692.svg"
       },
       "width": {
         "render": "8"
@@ -473,7 +473,7 @@
       "tagRenderings": [],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "https://upload.wikimedia.org/wikipedia/commons/1/1e/Emojione_1F6A8.svg"
+        "render": "https://upload.wikimedia.org/wikipedia/commons/e/eb/Twemoji12_26d1.svg"
       },
       "width": {
         "render": "8"