diff --git a/data/styles/default/dark/symbols/charging-station-m.svg b/data/styles/default/dark/symbols/charging-station-m.svg
index f1da3d335..787a8bfcc 100644
--- a/data/styles/default/dark/symbols/charging-station-m.svg
+++ b/data/styles/default/dark/symbols/charging-station-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>charging-station-m</title>
- <g id="Page-2:-Night" transform="scale(1.5)" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="charging-station-m" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#717065"/>
-   <path id="Shape" d="m11.674 5.8797 0.0044-0.00444-1.4175-1.4175c-0.12887-0.12887-0.34217-0.12887-0.47103 0-0.12887 0.12887-0.12887 0.34217 0 0.47103l0.70215 0.7021c-0.46659 0.17775-0.78209 0.65323-0.70211 1.2042 0.071099 0.48881 0.48881 0.8843 0.97762 0.93762 0.20885 0.022219 0.39105-0.013331 0.56435-0.088874v3.2039c0 0.2444-0.19997 0.44437-0.44437 0.44437s-0.44437-0.19997-0.44437-0.44437v-1.9997c0-0.48881-0.39993-0.88874-0.88874-0.88874h-0.44437v-3.1106c0-0.48881-0.39993-0.88874-0.88874-0.88874h-2.6662c-0.48881 0-0.88874 0.39993-0.88874 0.88874v6.6656c0 0.2444 0.19997 0.44437 0.44437 0.44437h3.555c0.2444 0 0.44437-0.19997 0.44437-0.44437v-2.8884h0.66656v2.1596c0 0.58213 0.41771 1.1109 0.99539 1.1687 0.66656 0.06666 1.2265-0.45326 1.2265-1.1065v-4.2215c0-0.30662-0.12442-0.58657-0.32439-0.78654zm-0.78654 1.2309c-0.2444 0-0.44437-0.19997-0.44437-0.44437s0.19997-0.44437 0.44437-0.44437 0.44437 0.19997 0.44437 0.44437-0.19997 0.44437-0.44437 0.44437zm-4.4437 2.7196v-1.1643h-0.51991c-0.16886 0-0.27551-0.17775-0.19552-0.32883l1.1865-2.2219c0.10665-0.19997 0.41771-0.12442 0.41771 0.10665v1.3331h0.50658c0.16886 0 0.27551 0.18219 0.19108 0.33328l-1.1731 2.053c-0.11109 0.19552-0.41326 0.11554-0.41326-0.11109z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M6.667 5.333a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2V12a.68.68 0 0 0-.01-.112 2.023 2.023 0 0 0 1.226-1.221H20a1.33 1.33 0 0 0 1.333-1.334H20V6.667a.667.667 0 1 0-1.333 0v2.666h-1.334V6.667a.667.667 0 1 0-1.333 0v2.666h-1.333A1.33 1.33 0 0 0 16 10.667h.117a2.022 2.022 0 0 0 1.227 1.221.682.682 0 0 0-.01.112v4.667a.657.657 0 0 1-.667.666.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333Zm.666 1.334h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zm3.521 5a.32.32 0 0 1 .206.08c.103.104.104.26.002.365l-1.596 1.846 1.2 1.206a.238.238 0 0 1-.023.362l-2.62 2.073a.329.329 0 0 1-.416-.013.255.255 0 0 1-.003-.365l1.597-1.843L8 14.169a.238.238 0 0 1 .023-.362l2.62-2.073a.323.323 0 0 1 .211-.067z" style="fill:#777;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-dispenser-m.svg b/data/styles/default/dark/symbols/fuel-dispenser-m.svg
index cb715a27d..a159c3f55 100644
--- a/data/styles/default/dark/symbols/fuel-dispenser-m.svg
+++ b/data/styles/default/dark/symbols/fuel-dispenser-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#777777"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#777;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-m.svg b/data/styles/default/dark/symbols/fuel-m.svg
index 68de88c97..323c0825a 100644
--- a/data/styles/default/dark/symbols/fuel-m.svg
+++ b/data/styles/default/dark/symbols/fuel-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>fuel-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="fuel-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0-0.22552 0.22552-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765 0-0.42771 0.34994-0.77765 0.77765-0.77765s0.77765 0.34994 0.77765 0.77765c0 0.42771-0.34994 0.77765-0.77765 0.77765z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero;fill:#000;fill-opacity:1"/><circle cx="12" cy="12" r="11" fill="#717065" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#000;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-s.svg b/data/styles/default/dark/symbols/fuel-s.svg
index cdf4f2e20..c86d00b65 100644
--- a/data/styles/default/dark/symbols/fuel-s.svg
+++ b/data/styles/default/dark/symbols/fuel-s.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>fuel-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="fuel-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#717065"/>
-   <path id="Shape" d="m12.176 5.5263 0.0051843-0.0051843-1.6538-1.6538c-0.15035-0.15035-0.39919-0.15035-0.54954 0-0.15035 0.15035-0.15035 0.39919 0 0.54954l0.81912 0.81912c-0.54435 0.20737-0.91244 0.7621-0.81912 1.405 0.082949 0.57028 0.57028 1.0317 1.1406 1.0939 0.24366 0.025922 0.45622-0.015553 0.65841-0.10369v3.7379c0 0.28514-0.23329 0.51843-0.51843 0.51843s-0.51843-0.23329-0.51843-0.51843v-2.3329c0-0.57028-0.46659-1.0369-1.0369-1.0369h-0.51843v-3.629c0-0.57028-0.46659-1.0369-1.0369-1.0369h-3.1106c-0.57028 0-1.0369 0.46659-1.0369 1.0369v7.7765c0 0.28514 0.23329 0.51843 0.51843 0.51843h4.1475c0.28514 0 0.51843-0.23329 0.51843-0.51843v-3.3698h0.77765v2.5196c0 0.67915 0.48733 1.2961 1.1613 1.3635 0.77765 0.077765 1.4309-0.5288 1.4309-1.2909v-4.9251c0-0.35772-0.14516-0.68433-0.37846-0.91763zm-4.0282 1.4361h-3.1106v-2.0737c0-0.28514 0.23329-0.51843 0.51843-0.51843h2.0737c0.28514 0 0.51843 0.23329 0.51843 0.51843v2.0737zm3.1106 0c-0.28514 0-0.51843-0.23329-0.51843-0.51843 0-0.28514 0.23329-0.51843 0.51843-0.51843s0.51843 0.23329 0.51843 0.51843c0 0.28514-0.23329 0.51843-0.51843 0.51843z" fill="#000"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667;fill:#000;fill-opacity:1"/><circle cx="8" cy="8" r="7.333" fill="#717065" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149a1.7 1.7 0 0 1 .439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#000;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/charging-station-m.svg b/data/styles/default/light/symbols/charging-station-m.svg
index 17a359e42..a69d5bf40 100644
--- a/data/styles/default/light/symbols/charging-station-m.svg
+++ b/data/styles/default/light/symbols/charging-station-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>charging-station-m</title>
- <g transform="scale(1.5)" fill="none" fill-rule="evenodd">
-  <g id="charging-station-m" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#717065"/>
-   <path id="Shape" d="m11.674 5.8797 0.0044-0.00444-1.4175-1.4175c-0.12887-0.12887-0.34217-0.12887-0.47103 0-0.12887 0.12887-0.12887 0.34217 0 0.47103l0.70215 0.7021c-0.46659 0.17775-0.78209 0.65323-0.70211 1.2042 0.071099 0.48881 0.48881 0.8843 0.97762 0.93762 0.20885 0.022219 0.39105-0.013331 0.56435-0.088874v3.2039c0 0.2444-0.19997 0.44437-0.44437 0.44437s-0.44437-0.19997-0.44437-0.44437v-1.9997c0-0.48881-0.39993-0.88874-0.88874-0.88874h-0.44437v-3.1106c0-0.48881-0.39993-0.88874-0.88874-0.88874h-2.6662c-0.48881 0-0.88874 0.39993-0.88874 0.88874v6.6656c0 0.2444 0.19997 0.44437 0.44437 0.44437h3.555c0.2444 0 0.44437-0.19997 0.44437-0.44437v-2.8884h0.66656v2.1596c0 0.58213 0.41771 1.1109 0.99539 1.1687 0.66656 0.06666 1.2265-0.45326 1.2265-1.1065v-4.2215c0-0.30662-0.12442-0.58657-0.32439-0.78654zm-0.78654 1.2309c-0.2444 0-0.44437-0.19997-0.44437-0.44437s0.19997-0.44437 0.44437-0.44437 0.44437 0.19997 0.44437 0.44437-0.19997 0.44437-0.44437 0.44437zm-4.4437 2.7196v-1.1643h-0.51991c-0.16886 0-0.27551-0.17775-0.19552-0.32883l1.1865-2.2219c0.10665-0.19997 0.41771-0.12442 0.41771 0.10665v1.3331h0.50658c0.16886 0 0.27551 0.18219 0.19108 0.33328l-1.1731 2.053c-0.11109 0.19552-0.41326 0.11554-0.41326-0.11109z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M6.667 5.333a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2V12a.68.68 0 0 0-.01-.112c.569-.2 1.022-.653 1.226-1.221H20a1.33 1.33 0 0 0 1.333-1.334H20V6.667a.667.667 0 1 0-1.333 0v2.666h-1.334V6.667a.667.667 0 1 0-1.333 0v2.666h-1.333A1.33 1.33 0 0 0 16 10.667h.117a2.022 2.022 0 0 0 1.227 1.221.682.682 0 0 0-.01.112v4.667c0 .376-.291.666-.667.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333Zm.666 1.334h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zm3.521 5a.32.32 0 0 1 .206.08c.103.104.104.26.002.365l-1.596 1.846 1.2 1.206a.238.238 0 0 1-.023.362l-2.62 2.073a.329.329 0 0 1-.416-.013.255.255 0 0 1-.003-.365l1.597-1.843L8 14.169a.238.238 0 0 1 .023-.362l2.62-2.073a.323.323 0 0 1 .211-.067z" style="fill:#717065;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fuel-dispenser-m.svg b/data/styles/default/light/symbols/fuel-dispenser-m.svg
index 7088c713c..48d59a604 100644
--- a/data/styles/default/light/symbols/fuel-dispenser-m.svg
+++ b/data/styles/default/light/symbols/fuel-dispenser-m.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#717065"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666V10.667H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#717065;fill-opacity:1;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fuel-m.svg b/data/styles/default/light/symbols/fuel-m.svg
index abd6a59ec..bd60a686e 100644
--- a/data/styles/default/light/symbols/fuel-m.svg
+++ b/data/styles/default/light/symbols/fuel-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>fuel-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="fuel-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0-0.22552 0.22552-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765 0-0.42771 0.34994-0.77765 0.77765-0.77765s0.77765 0.34994 0.77765 0.77765c0 0.42771-0.34994 0.77765-0.77765 0.77765z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero"/><circle cx="12" cy="12" r="11" fill="#717065" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#fff;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/fuel-s.svg b/data/styles/default/light/symbols/fuel-s.svg
index 88f9cc6ef..dc24b3cd9 100644
--- a/data/styles/default/light/symbols/fuel-s.svg
+++ b/data/styles/default/light/symbols/fuel-s.svg
@@ -1,10 +1 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>fuel-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="fuel-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#717065"/>
-   <path id="Shape" d="m12.176 5.5263 0.0051843-0.0051843-1.6538-1.6538c-0.15035-0.15035-0.39919-0.15035-0.54954 0-0.15035 0.15035-0.15035 0.39919 0 0.54954l0.81912 0.81912c-0.54435 0.20737-0.91244 0.7621-0.81912 1.405 0.082949 0.57028 0.57028 1.0317 1.1406 1.0939 0.24366 0.025922 0.45622-0.015553 0.65841-0.10369v3.7379c0 0.28514-0.23329 0.51843-0.51843 0.51843s-0.51843-0.23329-0.51843-0.51843v-2.3329c0-0.57028-0.46659-1.0369-1.0369-1.0369h-0.51843v-3.629c0-0.57028-0.46659-1.0369-1.0369-1.0369h-3.1106c-0.57028 0-1.0369 0.46659-1.0369 1.0369v7.7765c0 0.28514 0.23329 0.51843 0.51843 0.51843h4.1475c0.28514 0 0.51843-0.23329 0.51843-0.51843v-3.3698h0.77765v2.5196c0 0.67915 0.48733 1.2961 1.1613 1.3635 0.77765 0.077765 1.4309-0.5288 1.4309-1.2909v-4.9251c0-0.35772-0.14516-0.68433-0.37846-0.91763zm-4.0282 1.4361h-3.1106v-2.0737c0-0.28514 0.23329-0.51843 0.51843-0.51843h2.0737c0.28514 0 0.51843 0.23329 0.51843 0.51843v2.0737zm3.1106 0c-0.28514 0-0.51843-0.23329-0.51843-0.51843 0-0.28514 0.23329-0.51843 0.51843-0.51843s0.51843 0.23329 0.51843 0.51843c0 0.28514-0.23329 0.51843-0.51843 0.51843z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667"/><circle cx="8" cy="8" r="7.333" fill="#717065" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149c.212.212.362.474.439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#fff;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke"/></svg>
\ No newline at end of file