diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index c439da5ba..d57b6e418 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -524,13 +524,13 @@ node|z14-[natural=strait],
 node|z14-[natural=bay],
 node|z16-[natural=wetland],
 area|z16-[natural=wetland],
-{text:name;text-color: @water_label;}
+{text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 area|z10-[natural=water][!tunnel][bbox_area<4000000],
-{text:name;text-color: @water_label;}
+{text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 area|z12-[landuse=reservoir][bbox_area<4000000],
-{text:name;text-color: @water_label;}
+{text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 /*6.1 Area water(ocean,sea,lake,pond etc.)*/
 
@@ -583,18 +583,18 @@ line|z13-14[waterway=stream],
 line|z13-14[waterway=canal],
 line|z13-14[waterway=fish_pass],
 line|z13-14[natural=strait],
-{font-size: 10;text:name;text-color: @water_label;}
+{font-size: 10;text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 line|z15-17[waterway=stream],
 line|z15-17[waterway=canal],
 line|z15-17[waterway=fish_pass],
 line|z15-17[natural=strait],
-{font-size: 11;text:name;text-color: @water_label;}
+{font-size: 11;text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 line|z15-[waterway=river],
 line|z18-[waterway=stream],
 line|z18-[waterway=canal],
 line|z18-[waterway=fish_pass],
 line|z18-[natural=strait],
-{font-size: 12;text:name;text-color: @water_label;}
+{font-size: 12;text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 line[waterway]
 {text-position: line;}
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index f524a5fc1..c125dec0f 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -209,7 +209,7 @@
 
 /* 6.2 Natural labels */
 
-@water_label: #278FA2;
+@water_label: #207A8F;
 @park_label: #3A7921;
 @halo_park_label: #FFFFFF;
 
diff --git a/data/styles/default/light/symbols/drinking-water-m.svg b/data/styles/default/light/symbols/drinking-water-m.svg
index f1221f285..2b81ca5da 100644
--- a/data/styles/default/light/symbols/drinking-water-m.svg
+++ b/data/styles/default/light/symbols/drinking-water-m.svg
@@ -1,4 +1 @@
-<?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="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#14a0c2"/>
-</svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m8.9999 16.875c-2.8251 0-5.4518-2.4231-5.4518-5.4518 0-3.0625 4.1394-8.5484 5.4518-10.298 1.3125 1.75 5.4518 7.2355 5.4518 10.298 0 3.0288-2.6268 5.4518-5.4518 5.4518z" fill="#54a3b6"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/drinking-water-s.svg b/data/styles/default/light/symbols/drinking-water-s.svg
index b7c022ba5..df226f0e3 100644
--- a/data/styles/default/light/symbols/drinking-water-s.svg
+++ b/data/styles/default/light/symbols/drinking-water-s.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
- <path d="m6 10.5c-1.6144 0-3.5-0.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85 0.75 0.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#14a0c2"/>
-</svg>
\ No newline at end of file
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 10.5c-1.6144 0-3.5-.9-3.5-3.15 0-1.575 2.75-4.95 3.5-5.85.75.9 3.5 4.275 3.5 5.85 0 2.25-1.8856 3.15-3.5 3.15z" fill="#54a3b6"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/ford-m.svg b/data/styles/default/light/symbols/ford-m.svg
index e3ef62abb..40777d4b5 100644
--- a/data/styles/default/light/symbols/ford-m.svg
+++ b/data/styles/default/light/symbols/ford-m.svg
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14" height="9" version="1.1" viewBox="0 0 14 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m11.52 1.8815a1.7502 1.7497 0 0 0-3.0391 0l-0.48047 0.84158-0.48047-0.84158a1.7502 1.7497 0 0 0-3.0391 0l-0.48047 0.84158-0.48047-0.84158a1.7502 1.7497 0 0 0-1.5195-0.88063 1.7502 1.7497 0 0 0-1 0.3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l0.48047-0.84158 0.48047 0.84158a1.7502 1.7497 0 0 0 3.0391 0l0.48047-0.84158 0.48047 0.84158a1.7502 1.7497 0 0 0 2.5195 0.54869v-3.1945z" fill="#fff" opacity=".6"/>
- <path d="m12 4.7405-1.3496-2.3635a0.75008 0.75015 0 0 0-1.3008 0l-1.3496 2.3616-1.3496-2.3616a0.75008 0.75015 0 0 0-1.3008 0l-1.3496 2.3616-1.3496-2.3616a0.75008 0.75015 0 0 0-0.65039-0.37699v2.262l1.3496 2.3616a0.75008 0.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a0.75008 0.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a0.75008 0.75015 0 0 0 0.65039 0.36136z" fill="#14a0c2"/>
-</svg>
+<svg height="9" viewBox="0 0 14 9" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m11.52 1.8815a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -3.0391 0l-.48047.84158-.48047-.84158a1.7502 1.7497 0 0 0 -1.5195-.88063 1.7502 1.7497 0 0 0 -1 .3378v3.1867l1.4805 2.5931a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 3.0391 0l.48047-.84158.48047.84158a1.7502 1.7497 0 0 0 2.5195.54869v-3.1945z" fill="#fff" opacity=".6"/><path d="m12 4.7405-1.3496-2.3635a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -1.3008 0l-1.3496 2.3616-1.3496-2.3616a.75008.75015 0 0 0 -.65039-.37699v2.262l1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 1.3008 0l1.3496-2.3616 1.3496 2.3616a.75008.75015 0 0 0 .65039.36136z" fill="#54a3b6"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fountain-m.svg b/data/styles/default/light/symbols/fountain-m.svg
index 31253b8e4..4b53bf770 100644
--- a/data/styles/default/light/symbols/fountain-m.svg
+++ b/data/styles/default/light/symbols/fountain-m.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>fountain-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g fill-rule="nonzero">
-   <g transform="matrix(1.5,0,0,1.5,2.8125,1.5)" fill="#14a0c2">
-    <path d="m7.7656 0c-0.67014 0-1.2662 0.32312-1.6406 0.82173-0.37447-0.49861-0.97048-0.82173-1.6406-0.82173-1.1308 0-2.0508 0.91998-2.0508 2.0508h0.82031c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305v1.2852h0.82031v-1.2852c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305h0.82031c0-1.1308-0.91998-2.0508-2.0508-2.0508z"/>
-    <path d="m2.4336 4.1562v0.82031h0.86157c0.19056 0.93494 1.0192 1.6406 2.0095 1.6406h1.6406c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m0 7.4375v0.82031h0.86157c0.19053 0.93494 1.0191 1.6406 2.0095 1.6406h2.0234v0.82031h2.4609v-0.82031h2.0234c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m10.609 13.18c-0.19056-0.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-0.99036 0-1.819 0.70569-2.0095 1.6406h-0.88892v0.82031h10.691v-0.82031z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="matrix(1.5 0 0 1.5 2.8125 1.5)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fountain-s.svg b/data/styles/default/light/symbols/fountain-s.svg
index f251b17c6..7417ea914 100644
--- a/data/styles/default/light/symbols/fountain-s.svg
+++ b/data/styles/default/light/symbols/fountain-s.svg
@@ -1,13 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>fountain-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g fill-rule="nonzero">
-   <g transform="matrix(1.125 0 0 1.125 5.1094 4.125)" fill="#14a0c2">
-    <path d="m7.7656 0c-0.67014 0-1.2662 0.32312-1.6406 0.82173-0.37447-0.49861-0.97048-0.82173-1.6406-0.82173-1.1308 0-2.0508 0.91998-2.0508 2.0508h0.82031c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305v1.2852h0.82031v-1.2852c0-0.67848 0.55199-1.2305 1.2305-1.2305s1.2305 0.55199 1.2305 1.2305h0.82031c0-1.1308-0.91998-2.0508-2.0508-2.0508z"/>
-    <path d="m2.4336 4.1562v0.82031h0.86157c0.19056 0.93494 1.0192 1.6406 2.0095 1.6406h1.6406c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m0 7.4375v0.82031h0.86157c0.19053 0.93494 1.0191 1.6406 2.0095 1.6406h2.0234v0.82031h2.4609v-0.82031h2.0234c0.99036 0 1.819-0.70569 2.0095-1.6406h0.86157v-0.82031z"/>
-    <path d="m10.609 13.18c-0.19056-0.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-0.99036 0-1.819 0.70569-2.0095 1.6406h-0.88892v0.82031h10.691v-0.82031z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="matrix(1.125 0 0 1.125 5.1094 4.125)"><path d="m7.7656 0c-.67014 0-1.2662.32312-1.6406.82173-.37447-.49861-.97048-.82173-1.6406-.82173-1.1308 0-2.0508.91998-2.0508 2.0508h.82031c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305v1.2852h.82031v-1.2852c0-.67848.55199-1.2305 1.2305-1.2305s1.2305.55199 1.2305 1.2305h.82031c0-1.1308-.91998-2.0508-2.0508-2.0508z"/><path d="m2.4336 4.1562v.82031h.86157c.19056.93494 1.0192 1.6406 2.0095 1.6406h1.6406c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m0 7.4375v.82031h.86157c.19053.93494 1.0191 1.6406 2.0095 1.6406h2.0234v.82031h2.4609v-.82031h2.0234c.99036 0 1.819-.70569 2.0095-1.6406h.86157v-.82031z"/><path d="m10.609 13.18c-.19056-.93494-1.0192-1.6406-2.0095-1.6406h-4.9219c-.99036 0-1.819.70569-2.0095 1.6406h-.88892v.82031h10.691v-.82031z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/geyser-m.svg b/data/styles/default/light/symbols/geyser-m.svg
index e10b40b67..534ac6bca 100644
--- a/data/styles/default/light/symbols/geyser-m.svg
+++ b/data/styles/default/light/symbols/geyser-m.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>geyser-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="geyser-m" fill-rule="nonzero">
-   <g id="geyser" transform="translate(5.1429 5.1429)" fill="#14A0C2">
-    <path id="Path" d="m12.509 0h-11.304c-0.66463 0-1.2054 0.54072-1.2054 1.2054 0 0.66463 0.54072 1.2054 1.2054 1.2054h0.44215c0.1867 0.9158 0.99841 1.6071 1.9686 1.6071h1.301c0.12123 0.342 0.39273 0.61347 0.73473 0.73473v3.918c0.35044-0.016821 0.6818-0.13653 0.96303-0.34918l0.24233-0.18324 0.24233 0.18324c0.28122 0.21265 0.61259 0.33236 0.96303 0.34918v-3.918c0.342-0.12123 0.61347-0.39273 0.73473-0.73473h1.301c0.97015 0 1.7819-0.69134 1.9686-1.6071h0.44215c0.66463 0 1.2054-0.54072 1.2054-1.2054 0-0.66463-0.54072-1.2054-1.2054-1.2054z"/>
-    <path id="Path" d="m13.312 9.4765c-0.46012 0-0.90118-0.12072-1.291-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.291-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.291 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514h-0.40184v1.6763h0.40179c0.38202 0 0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146s0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.3041 0.22993 0.66675 0.35146 1.0487 0.35146 0.38204 0 0.7447-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146s0.74467-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.30407 0.22993 0.66672 0.35146 1.0487 0.35146 0.38204 0 0.7447-0.12153 1.0487-0.35146l0.24233-0.18324 0.24233 0.18324c0.3041 0.22993 0.66675 0.35146 1.0487 0.35146h0.40179v-1.6763h-0.40179z"/>
-    <path id="Path" d="m13.312 11.956c-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.291-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.2911 0.3514-0.46018 0-0.90123-0.12072-1.2911-0.3514-0.38984 0.23068-0.83089 0.3514-1.291 0.3514-0.46021 0-0.90123-0.12072-1.2911-0.3514-0.38987 0.23068-0.83092 0.3514-1.2911 0.3514h-0.40184v1.758h13.714v-1.758h-0.40179z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="translate(5.1429 5.1429)"><path d="m12.509 0h-11.304c-.66463 0-1.2054.54072-1.2054 1.2054 0 .66463.54072 1.2054 1.2054 1.2054h.44215c.1867.9158.99841 1.6071 1.9686 1.6071h1.301c.12123.342.39273.61347.73473.73473v3.918c.35044-.016821.6818-.13653.96303-.34918l.24233-.18324.24233.18324c.28122.21265.61259.33236.96303.34918v-3.918c.342-.12123.61347-.39273.73473-.73473h1.301c.97015 0 1.7819-.69134 1.9686-1.6071h.44215c.66463 0 1.2054-.54072 1.2054-1.2054 0-.66463-.54072-1.2054-1.2054-1.2054z"/><path d="m13.312 9.4765c-.46012 0-.90118-.12072-1.291-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.6763h.40179c.38202 0 .74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146s.74467-.12153 1.0487-.35146l.24233-.18324.24233.18324c.30407.22993.66672.35146 1.0487.35146.38204 0 .7447-.12153 1.0487-.35146l.24233-.18324.24233.18324c.3041.22993.66675.35146 1.0487.35146h.40179v-1.6763h-.40179z"/><path d="m13.312 11.956c-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.291-.3514-.38987.23068-.83092.3514-1.2911.3514-.46021 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.2911.3514-.46018 0-.90123-.12072-1.2911-.3514-.38984.23068-.83089.3514-1.291.3514-.46021 0-.90123-.12072-1.2911-.3514-.38987.23068-.83092.3514-1.2911.3514h-.40184v1.758h13.714v-1.758h-.40179z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/geyser-s.svg b/data/styles/default/light/symbols/geyser-s.svg
index 2b9312ddc..88f548b0d 100644
--- a/data/styles/default/light/symbols/geyser-s.svg
+++ b/data/styles/default/light/symbols/geyser-s.svg
@@ -1,12 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>geyser-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="geyser-s" fill-rule="nonzero">
-   <g id="geyser" transform="translate(3.4286 3.4286)" fill="#14A0C2">
-    <path id="Path" d="m8.3393 0h-7.5357c-0.44309 0-0.80357 0.36048-0.80357 0.80357 0 0.44309 0.36048 0.80357 0.80357 0.80357h0.29477c0.12446 0.61054 0.66561 1.0714 1.3124 1.0714h0.86732c0.080821 0.228 0.26182 0.40898 0.48982 0.48982v2.612c0.23362-0.011214 0.45454-0.091018 0.64202-0.23279l0.16155-0.12216 0.16155 0.12216c0.18748 0.14177 0.40839 0.22157 0.64202 0.23279v-2.612c0.228-0.080821 0.40898-0.26182 0.48982-0.48982h0.86732c0.64677 0 1.1879-0.46089 1.3124-1.0714h0.29477c0.44309 0 0.80357-0.36048 0.80357-0.80357 0-0.44309-0.36048-0.80357-0.80357-0.80357z"/>
-    <path id="Path" d="m8.875 6.3176c-0.30675 0-0.60079-0.080482-0.86068-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.8607-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.8607 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427h-0.26789v1.1175h0.26786c0.25468 0 0.49645-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69916 0.2343 0.25468 0 0.49645-0.081018 0.69914-0.2343l0.16155-0.12216 0.16155 0.12216c0.20273 0.15329 0.4445 0.2343 0.69916 0.2343 0.2547 0 0.49646-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69916 0.2343s0.49645-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20271 0.15329 0.44448 0.2343 0.69914 0.2343 0.2547 0 0.49646-0.081018 0.69916-0.2343l0.16155-0.12216 0.16155 0.12216c0.20273 0.15329 0.4445 0.2343 0.69916 0.2343h0.26786v-1.1175h-0.26786z"/>
-    <path id="Path" d="m8.875 7.9709c-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.8607-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.86071 0.23427-0.30679 0-0.60082-0.080482-0.86071-0.23427-0.25989 0.15379-0.55393 0.23427-0.8607 0.23427-0.3068 0-0.60082-0.080482-0.86071-0.23427-0.25991 0.15379-0.55395 0.23427-0.86071 0.23427h-0.26789v1.172h9.1429v-1.172h-0.26786z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="#54a3b6" transform="translate(3.4286 3.4286)"><path d="m8.3393 0h-7.5357c-.44309 0-.80357.36048-.80357.80357s.36048.80357.80357.80357h.29477c.12446.61054.66561 1.0714 1.3124 1.0714h.86732c.080821.228.26182.40898.48982.48982v2.612c.23362-.011214.45454-.091018.64202-.23279l.16155-.12216.16155.12216c.18748.14177.40839.22157.64202.23279v-2.612c.228-.080821.40898-.26182.48982-.48982h.86732c.64677 0 1.1879-.46089 1.3124-1.0714h.29477c.44309 0 .80357-.36048.80357-.80357s-.36048-.80357-.80357-.80357z"/><path d="m8.875 6.3176c-.30675 0-.60079-.080482-.86068-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.1175h.26786c.25468 0 .49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69914-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69916.2343s.49645-.081018.69916-.2343l.16155-.12216.16155.12216c.20271.15329.44448.2343.69914.2343.2547 0 .49646-.081018.69916-.2343l.16155-.12216.16155.12216c.20273.15329.4445.2343.69916.2343h.26786v-1.1175h-.26786z"/><path d="m8.875 7.9709c-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.8607-.23427-.25991.15379-.55395.23427-.86071.23427-.3068 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.86071.23427-.30679 0-.60082-.080482-.86071-.23427-.25989.15379-.55393.23427-.8607.23427-.3068 0-.60082-.080482-.86071-.23427-.25991.15379-.55395.23427-.86071.23427h-.26789v1.172h9.1429v-1.172h-.26786z"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/waterfall-m.svg b/data/styles/default/light/symbols/waterfall-m.svg
index 1c8d697e0..5e9631e70 100644
--- a/data/styles/default/light/symbols/waterfall-m.svg
+++ b/data/styles/default/light/symbols/waterfall-m.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>waterfall-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g fill-rule="nonzero">
-   <g transform="matrix(1.5 0 0 1.5 -5.2772 -4.1503)" fill="#14a0c2">
-    <path d="m6.5337 14c1.1503 0 1.9171 0.51148 2.6839 0.51123 0.76684 2.56e-4 1.1503-0.51123 2.3005-0.51123s1.5337 0.51097 2.3005 0.51123c0.76684 2.56e-4 1.5337-0.51123 2.6839-0.51123 0.50348 0 1.0417 0.19335 1.5337 0.31952v1.0385s-0.99562-0.33552-1.5337-0.33552c-0.76684 0-1.5337 0.51123-2.6839 0.51123s-1.5337-0.51097-2.3005-0.51123c-0.78714 0.01774-1.1503 0.51123-2.3005 0.51123-1.1503 0-1.9171-0.51148-2.6839-0.51123-0.76684 2.56e-4 -1.5337 0.33552-1.5337 0.33552v-1.0385c0.5063-0.11252 1.0014-0.31952 1.5337-0.31952zm-1.5337 2.3195c0.5063-0.11252 1.0014-0.31952 1.5337-0.31952 1.1503 0 1.9171 0.51148 2.6839 0.51123 0.76684 2.56e-4 1.1503-0.51123 2.3005-0.51123s1.5337 0.51097 2.3005 0.51123c0.76684 2.56e-4 1.5337-0.51123 2.6839-0.51123 0.50348 0 1.0417 0.19335 1.5337 0.31952v1.0385s-0.99562-0.33552-1.5337-0.33552c-0.76684 0-1.5337 0.51123-2.6839 0.51123s-1.5337-0.51097-2.3005-0.51123c-0.78714 0.01774-1.1503 0.51123-2.3005 0.51123-1.1503 0-1.9171-0.51148-2.6839-0.51123-0.76684 2.56e-4 -1.5337 0.33552-1.5337 0.33552zm5.9106-12.32c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.91e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992c-1.91e-4 0.53307 0.38342 1.0661 0.38342 1.8658 0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.92e-4 -0.53307-0.25164-1.0661-0.25164-1.0661zm-2 0c0.084391 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.917e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992 0.38342 1.0661 0.38342 1.8658c0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658s-0.25164-1.0661-0.25164-1.0661zm4 0c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.91e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992c-1.91e-4 0.53307 0.38342 1.0661 0.38342 1.8658 0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.013305-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.92e-4 -0.53307-0.25164-1.0661-0.25164-1.0661zm2.002 0c0.08439 0.35196 0.23964 0.69616 0.23964 1.0661 0 0.79961-0.38361 1.3327-0.38342 1.8658-1.92e-4 0.53307 0.38342 0.79961 0.38342 1.5992s-0.38323 1.0661-0.38342 1.5992 0.38342 1.0661 0.38342 1.8658c0 0.35-0.14501 0.72413-0.23964 1.0661h-0.77884s0.25164-0.69212 0.25164-1.0661c0-0.53307-0.38342-1.0661-0.38342-1.8658 0-0.79961 0.38323-1.0661 0.38342-1.5992-0.0133-0.54719-0.38342-0.79961-0.38342-1.5992 0-0.79961 0.38361-1.3327 0.38342-1.8658-1.91e-4 -0.53307-0.25164-1.0661-0.25164-1.0661z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m6.5337 14c1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552v-1.0385c.5063-.11252 1.0014-.31952 1.5337-.31952zm-1.5337 2.3195c.5063-.11252 1.0014-.31952 1.5337-.31952 1.1503 0 1.9171.51148 2.6839.51123.76684.000256 1.1503-.51123 2.3005-.51123s1.5337.51097 2.3005.51123c.76684.000256 1.5337-.51123 2.6839-.51123.50348 0 1.0417.19335 1.5337.31952v1.0385s-.99562-.33552-1.5337-.33552c-.76684 0-1.5337.51123-2.6839.51123s-1.5337-.51097-2.3005-.51123c-.78714.01774-1.1503.51123-2.3005.51123-1.1503 0-1.9171-.51148-2.6839-.51123-.76684.000256-1.5337.33552-1.5337.33552zm5.9106-12.32c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm-2 0c.084391.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.0001917.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658s-.25164-1.0661-.25164-1.0661zm4 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000191.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992c-.000191.53307.38342 1.0661.38342 1.8658 0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.013305-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000192-.53307-.25164-1.0661-.25164-1.0661zm2.002 0c.08439.35196.23964.69616.23964 1.0661 0 .79961-.38361 1.3327-.38342 1.8658-.000192.53307.38342.79961.38342 1.5992s-.38323 1.0661-.38342 1.5992.38342 1.0661.38342 1.8658c0 .35-.14501.72413-.23964 1.0661h-.77884s.25164-.69212.25164-1.0661c0-.53307-.38342-1.0661-.38342-1.8658 0-.79961.38323-1.0661.38342-1.5992-.0133-.54719-.38342-.79961-.38342-1.5992 0-.79961.38361-1.3327.38342-1.8658-.000191-.53307-.25164-1.0661-.25164-1.0661z" fill="#54a3b6" transform="matrix(1.5 0 0 1.5 -5.2772 -4.1503)"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/waterfall-s.svg b/data/styles/default/light/symbols/waterfall-s.svg
index 42995d27f..10613daee 100644
--- a/data/styles/default/light/symbols/waterfall-s.svg
+++ b/data/styles/default/light/symbols/waterfall-s.svg
@@ -1,8 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>waterfall-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g fill-rule="nonzero">
-   <path d="m2.8382 10.989c1.1912 0 1.9853 0.50738 2.7794 0.50712 0.79412 2.54e-4 1.1912-0.50712 2.3824-0.50712 1.1912 0 1.5882 0.50687 2.3824 0.50712 0.79412 2.54e-4 1.5882-0.50712 2.7794-0.50712 0.52139 0 1.0787 0.1918 1.5882 0.31695v1.0301s-1.031-0.33283-1.5882-0.33283c-0.79412 0-1.5882 0.50712-2.7794 0.50712-1.1912 0-1.5882-0.50687-2.3824-0.50712-0.81515 0.0176-1.1912 0.50712-2.3824 0.50712-1.1912 0-1.9853-0.50738-2.7794-0.50712-0.79412 2.53e-4 -1.5882 0.33283-1.5882 0.33283v-1.0301c0.52431-0.11162 1.0371-0.31695 1.5882-0.31695zm0 3c1.1912 0 1.9853 0.50738 2.7794 0.50712 0.79412 2.54e-4 1.1912-0.50712 2.3824-0.50712 1.1912 0 1.5882 0.50687 2.3824 0.50712 0.79412 2.54e-4 1.5882-0.50712 2.7794-0.50712 0.52139 0 1.0787 0.19179 1.5882 0.31695v1.0301s-1.031-0.33283-1.5882-0.33283c-0.79412 0-1.5882 0.50712-2.7794 0.50712-1.1912 0-1.5882-0.50687-2.3824-0.50712-0.81515 0.0176-1.1912 0.50712-2.3824 0.50712-1.1912 0-1.9853-0.50738-2.7794-0.50712-0.79412 2.53e-4 -1.5882 0.33283-1.5882 0.33283v-1.0301c0.52431-0.11162 1.0371-0.31695 1.5882-0.31695zm2.7923-13.5c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58155 1.322-0.58126 1.8508-2.908e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.908e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.906e-4 -0.5288-0.38148-1.0576-0.38148-1.0576zm3 0c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58155 1.322-0.58126 1.8508-2.907e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.907e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.906e-4 -0.5288-0.38148-1.0576-0.38148-1.0576zm3 0c0.12794 0.34913 0.36329 0.69058 0.36329 1.0576 0 0.7932-0.58156 1.322-0.58126 1.8508-2.91e-4 0.5288 0.58126 0.7932 0.58126 1.5864 0 0.7932-0.58097 1.0576-0.58126 1.5864-2.91e-4 0.5288 0.58126 1.0576 0.58126 1.8508 0 0.34719-0.21983 0.71832-0.36329 1.0576h-1.1807s0.38148-0.68656 0.38148-1.0576c0-0.5288-0.58126-1.0576-0.58126-1.8508 0-0.7932 0.58097-1.0576 0.58126-1.5864-0.02017-0.5428-0.58126-0.7932-0.58126-1.5864 0-0.7932 0.58155-1.322 0.58126-1.8508-2.91e-4 -0.5288-0.38148-1.0576-0.38148-1.0576z" fill="#14a0c2" stroke-width="1.5"/>
-  </g>
- </g>
-</svg>
+<svg height="12" viewBox="0 0 16 16" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m2.8382 10.989c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.1918 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm0 3c1.1912 0 1.9853.50738 2.7794.50712.79412.000254 1.1912-.50712 2.3824-.50712s1.5882.50687 2.3824.50712c.79412.000254 1.5882-.50712 2.7794-.50712.52139 0 1.0787.19179 1.5882.31695v1.0301s-1.031-.33283-1.5882-.33283c-.79412 0-1.5882.50712-2.7794.50712s-1.5882-.50687-2.3824-.50712c-.81515.0176-1.1912.50712-2.3824.50712s-1.9853-.50738-2.7794-.50712c-.79412.000253-1.5882.33283-1.5882.33283v-1.0301c.52431-.11162 1.0371-.31695 1.5882-.31695zm2.7923-13.5c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002908.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002908.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58155 1.322-.58126 1.8508-.0002907.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.0002907.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.0002906-.5288-.38148-1.0576-.38148-1.0576zm3 0c.12794.34913.36329.69058.36329 1.0576 0 .7932-.58156 1.322-.58126 1.8508-.000291.5288.58126.7932.58126 1.5864s-.58097 1.0576-.58126 1.5864c-.000291.5288.58126 1.0576.58126 1.8508 0 .34719-.21983.71832-.36329 1.0576h-1.1807s.38148-.68656.38148-1.0576c0-.5288-.58126-1.0576-.58126-1.8508s.58097-1.0576.58126-1.5864c-.02017-.5428-.58126-.7932-.58126-1.5864s.58155-1.322.58126-1.8508c-.000291-.5288-.38148-1.0576-.38148-1.0576z" fill="#54a3b6" stroke-width="1.5"/></svg>
\ No newline at end of file