diff --git a/assets/layers/fire_hydrants/hydrant_attention.svg b/assets/layers/fire_hydrants/hydrant_attention.svg
index 10db542..a6f2bac 100644
--- a/assets/layers/fire_hydrants/hydrant_attention.svg
+++ b/assets/layers/fire_hydrants/hydrant_attention.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#fff" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
-	<path d="m7.0006 6.5004v4.999h0.9998v-1.9996h1.9996v1.9996h0.9998v-4.999h-0.9998v1.9996h-1.9996v-1.9996z" fill="#fff" style="paint-order:stroke fill markers"/>
-	<path d="m11 5 0.27539 5h1.4492l0.27539-5zm0.99609 5.834a0.83333 0.83333 0 0 0-0.83008 0.83203 0.83333 0.83333 0 0 0 0.83398 0.83398 0.83333 0.83333 0 0 0 0.83398-0.83398 0.83333 0.83333 0 0 0-0.83398-0.83203 0.83333 0.83333 0 0 0-0.0039 0z" fill="#f00" style="paint-order:stroke fill markers"/>
+	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#000" troke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<path d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
+	<path d="m11 5 0.27539 5h1.4492l0.27539-5zm1 5.834a0.83333 0.83333 0 0 0-0.83008 0.83203 0.83333 0.83333 0 0 0 0.83398 0.83398 0.83333 0.83333 0 0 0 0.83398-0.83398 0.83333 0.83333 0 0 0-0.83398-0.83203 0.83333 0.83333 0 0 0-0.0039 0z" fill="#f00" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_disused.svg b/assets/layers/fire_hydrants/hydrant_disused.svg
index 9fc8025..95693b7 100644
--- a/assets/layers/fire_hydrants/hydrant_disused.svg
+++ b/assets/layers/fire_hydrants/hydrant_disused.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#fff" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#000" stroke-width="2" style="paint-order:stroke fill markers"/>
 	<path d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_marker_only.svg b/assets/layers/fire_hydrants/hydrant_marker_only.svg
index 677252e..1c6e188 100644
--- a/assets/layers/fire_hydrants/hydrant_marker_only.svg
+++ b/assets/layers/fire_hydrants/hydrant_marker_only.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#fff" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
-	<path d="m7.0006 6.5004v4.999h0.9998v-1.9996h1.9996v1.9996h0.9998v-4.999h-0.9998v1.9996h-1.9996v-1.9996z" fill="#fff" style="paint-order:stroke fill markers"/>
-	<g stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-		<rect x="9" y="5" width="5" height="4" fill="#f00" style="paint-order:stroke fill markers"/>
-		<rect x="10" y="6" width="3" height="2" fill="#fff" style="paint-order:stroke fill markers"/>
-		<rect x="11" y="9" width="1" height="6" style="paint-order:stroke fill markers"/>
-	</g>
+	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#777" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="paint-order:stroke fill markers"/>
+	<path d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff" style="paint-order:stroke fill markers"/>
+	<rect x="9" y="5" width="5" height="4" fill="#f00"/>
+	<rect x="11" y="9" width="1" height="6"/>
+	<rect x="10" y="6" width="3" height="2" fill="#fff"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_pillar.svg b/assets/layers/fire_hydrants/hydrant_pillar.svg
index 98a7497..27ef663 100644
--- a/assets/layers/fire_hydrants/hydrant_pillar.svg
+++ b/assets/layers/fire_hydrants/hydrant_pillar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<path d="m9 2c-1.662 0-3 1.338-3 3v1h-1c-0.277 0-0.5 0.223-0.5 0.5v3c0 0.277 0.223 0.5 0.5 0.5h1v6l-1 1h8l-1-1v-6h1c0.277 0 0.5-0.223 0.5-0.5v-3c0-0.277-0.223-0.5-0.5-0.5h-1v-1c0-1.662-1.338-3-3-3z" fill="#f00" stroke="#fff" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<path d="m9 2c-1.662 0-3 1.338-3 3v1h-1c-0.277 0-0.5 0.223-0.5 0.5v3c0 0.277 0.223 0.5 0.5 0.5h1v6l-1 1h8l-1-1v-6h1c0.277 0 0.5-0.223 0.5-0.5v-3c0-0.277-0.223-0.5-0.5-0.5h-1v-1c0-1.662-1.338-3-3-3z" fill="#f00" stroke="#000" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
 	<path d="m7 11v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_pillar_without_h.svg b/assets/layers/fire_hydrants/hydrant_pillar_without_h.svg
index 55442b0..0ce34c2 100644
--- a/assets/layers/fire_hydrants/hydrant_pillar_without_h.svg
+++ b/assets/layers/fire_hydrants/hydrant_pillar_without_h.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<path d="m9 2c-1.662 0-3 1.338-3 3v1h-1c-0.277 0-0.5 0.223-0.5 0.5v3c0 0.277 0.223 0.5 0.5 0.5h1v6l-1 1h8l-1-1v-6h1c0.277 0 0.5-0.223 0.5-0.5v-3c0-0.277-0.223-0.5-0.5-0.5h-1v-1c0-1.662-1.338-3-3-3z" fill="#f00" stroke="#fff" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<path d="m9 2c-1.662 0-3 1.338-3 3v1h-1c-0.277 0-0.5 0.223-0.5 0.5v3c0 0.277 0.223 0.5 0.5 0.5h1v6l-1 1h8l-1-1v-6h1c0.277 0 0.5-0.223 0.5-0.5v-3c0-0.277-0.223-0.5-0.5-0.5h-1v-1c0-1.662-1.338-3-3-3z" fill="#f00" stroke="#000" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_underground.svg b/assets/layers/fire_hydrants/hydrant_underground.svg
index c792ec7..771715b 100644
--- a/assets/layers/fire_hydrants/hydrant_underground.svg
+++ b/assets/layers/fire_hydrants/hydrant_underground.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<path d="m6.0977 5.5c-1.9108 0.70406-3.0972 2.0445-3.0977 3.5 0 2.2091 2.6863 4 6 4s6-1.7909 6-4c-8.8e-5 -1.4552-1.1856-2.7956-3.0957-3.5h3.0957v-1.5h-12v1.5z" fill="#f00" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<path d="m6.0977 5.5c-1.9108 0.70406-3.0972 2.0445-3.0977 3.5 0 2.2091 2.6863 4 6 4s6-1.7909 6-4c-8.8e-5 -1.4552-1.1856-2.7956-3.0957-3.5h3.0957v-1.5h-12v1.5z" fill="#f00" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
 	<path d="m7 6v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
 </svg>
diff --git a/assets/layers/fire_hydrants/hydrant_unknown.svg b/assets/layers/fire_hydrants/hydrant_unknown.svg
index 6ef487e..3f6f7e9 100644
--- a/assets/layers/fire_hydrants/hydrant_unknown.svg
+++ b/assets/layers/fire_hydrants/hydrant_unknown.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
-	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#f00" stroke="#fff" stroke-width="2" style="paint-order:stroke fill markers"/>
+	<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#f00" stroke="#000" stroke-width="2" style="paint-order:stroke fill markers"/>
 	<path d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
 </svg>