diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/clear/style-clear/symbols/car-repair-m.svg
index 295ec8a105..f9adfb4b36 100644
--- a/data/styles/clear/style-clear/symbols/car-repair-m.svg
+++ b/data/styles/clear/style-clear/symbols/car-repair-m.svg
@@ -1,14 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>car-repair-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="car-repair-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#717065" cx="8" cy="8" r="7.33333333"></circle>
-            <g id="Group" transform="translate(4.000000, 3.333333)" fill="#FFFFFF">
-                <path d="M1.47368421,5.89473684 L1.47368421,5.40350877 L6.38596491,5.40350877 L6.38596491,5.89473684 C6.38596491,6.16491228 6.60701754,6.38596491 6.87719298,6.38596491 L6.87719298,6.38596491 C7.14736842,6.38596491 7.36842105,6.16491228 7.36842105,5.89473684 L7.36842105,2.79508772 C7.36842105,2.79508772 6.71017544,0.815438596 6.60210526,0.49122807 C6.57754386,0.412631579 6.54315789,0.34877193 6.50877193,0.294736842 C6.49894737,0.284912281 6.49403509,0.275087719 6.48421053,0.260350877 C6.29754386,0.0049122807 6.0322807,0 6.0322807,0 L1.82736842,0 C1.82736842,0 1.56210526,0.0049122807 1.3754386,0.265263158 C1.36561404,0.275087719 1.36070175,0.284912281 1.35087719,0.294736842 C1.31649123,0.34877193 1.28210526,0.412631579 1.25754386,0.49122807 C1.14947368,0.815438596 0.49122807,2.79508772 0.49122807,2.79508772 L0.49122807,5.89473684 C0.49122807,6.16491228 0.712280702,6.38596491 0.98245614,6.38596491 L0.98245614,6.38596491 C1.25263158,6.38596491 1.47368421,6.16491228 1.47368421,5.89473684 Z M2.45614035,4.1754386 C2.18596491,4.1754386 1.96491228,3.95438596 1.96491228,3.68421053 C1.96491228,3.41403509 2.18596491,3.19298246 2.45614035,3.19298246 C2.72631579,3.19298246 2.94736842,3.41403509 2.94736842,3.68421053 C2.94736842,3.95438596 2.72631579,4.1754386 2.45614035,4.1754386 Z M5.40350877,4.1754386 C5.13333333,4.1754386 4.9122807,3.95438596 4.9122807,3.68421053 C4.9122807,3.41403509 5.13333333,3.19298246 5.40350877,3.19298246 C5.67368421,3.19298246 5.89473684,3.41403509 5.89473684,3.68421053 C5.89473684,3.95438596 5.67368421,4.1754386 5.40350877,4.1754386 Z M2.12701754,0.98245614 L5.73263158,0.98245614 L5.84561404,1.32140351 L6.05684211,1.96491228 L1.80280702,1.96491228 L2.12701754,0.98245614 Z" id="Shape"></path>
-                <path d="M0,7.37333333 L0,7.37333333 C0,7.63859649 0.221052632,7.85964912 0.486315789,7.85964912 L3.43859649,7.85964912 L3.43859649,8.84701754 C3.43859649,9.11719298 3.65964912,9.33333333 3.92491228,9.33333333 L3.92982456,9.33333333 C4.2,9.33333333 4.41614035,9.1122807 4.41614035,8.84701754 L4.41614035,7.85964912 L7.36842105,7.85964912 C7.63859649,7.85964912 7.85473684,7.63859649 7.85473684,7.37333333 L7.85473684,7.37333333 C7.85473684,7.10315789 7.63368421,6.88701754 7.36842105,6.88701754 L0.486315789,6.88701754 C0.221052632,6.88210526 0,7.10315789 0,7.37333333 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="car-repair-m.svg"
+   id="svg1276"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs1280" />
+  <title
+     id="title1266">car-repair-m</title>
+  <g
+     transform="scale(1.5)"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-1">
+    <g
+       fill-rule="nonzero"
+       id="car-repair-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         opacity="0.6"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#717065"
+         id="circle1269" />
+      <g
+         fill="#ffffff"
+         transform="translate(4,3.333333)"
+         id="Group">
+        <path
+           id="Shape"
+           d="m 1.4736842,5.8947368 v -0.491228 h 4.9122807 v 0.491228 c 0,0.2701755 0.2210526,0.4912281 0.4912281,0.4912281 v 0 c 0.2701754,0 0.491228,-0.2210526 0.491228,-0.4912281 V 2.7950877 c 0,0 -0.6582456,-1.9796491 -0.7663157,-2.30385963 -0.024561,-0.0785965 -0.058947,-0.14245614 -0.093333,-0.19649123 -0.00982,-0.009825 -0.014737,-0.0196491 -0.024561,-0.034386 C 6.2975439,0.00491228 6.0322807,0 6.0322807,0 H 1.8273684 c 0,0 -0.2652631,0.00491228 -0.4519298,0.26526316 -0.00982,0.009825 -0.014737,0.0196491 -0.024561,0.0294737 C 1.3164916,0.34877196 1.2821056,0.4126316 1.2575446,0.49122809 1.1494737,0.8154386 0.49122807,2.7950877 0.49122807,2.7950877 v 3.0996491 c 0,0.2701755 0.22105263,0.4912281 0.49122807,0.4912281 v 0 c 0.27017546,0 0.49122806,-0.2210526 0.49122806,-0.4912281 z M 2.4561404,4.1754386 c -0.2701755,0 -0.4912281,-0.2210526 -0.4912281,-0.4912281 0,-0.2701754 0.2210526,-0.491228 0.4912281,-0.491228 0.2701754,0 0.491228,0.2210526 0.491228,0.491228 0,0.2701755 -0.2210526,0.4912281 -0.491228,0.4912281 z m 2.9473684,0 c -0.2701755,0 -0.4912281,-0.2210526 -0.4912281,-0.4912281 0,-0.2701754 0.2210526,-0.491228 0.4912281,-0.491228 0.2701754,0 0.491228,0.2210526 0.491228,0.491228 0,0.2701755 -0.2210526,0.4912281 -0.491228,0.4912281 z M 2.1270175,0.98245614 H 5.7326316 L 5.845614,1.3214035 6.0568421,1.9649123 H 1.802807 Z" />
+        <path
+           id="Path"
+           d="m 0,7.3733333 v 0 C 0,7.6385965 0.22105263,7.8596491 0.48631579,7.8596491 H 3.4385965 v 0.9873684 c 0,0.2701755 0.2210526,0.4863158 0.4863158,0.4863158 h 0.00491 c 0.2701777,0 0.486318,-0.2210526 0.486318,-0.4863158 V 7.8596491 H 7.368421 c 0.2701755,0 0.4863158,-0.2210526 0.4863158,-0.4863158 v 0 c 0,-0.2701754 -0.2210526,-0.4863158 -0.4863158,-0.4863158 H 0.48631579 C 0.22105263,6.8821053 0,7.1031579 0,7.3733333 Z" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/charging-station-m.svg b/data/styles/clear/style-clear/symbols/charging-station-m.svg
index 74895e1015..753a8f8ab1 100644
--- a/data/styles/clear/style-clear/symbols/charging-station-m.svg
+++ b/data/styles/clear/style-clear/symbols/charging-station-m.svg
@@ -1,11 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>charging-station-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="charging-station-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#717065" cx="8" cy="8" r="7.33333333"></circle>
-            <path d="M11.6743963,5.87968905 L11.67884,5.87524534 L10.2612967,4.45770206 C10.1324292,4.32883449 9.91913112,4.32883449 9.79026355,4.45770206 C9.66139597,4.58656963 9.66139597,4.79986768 9.79026355,4.92873525 L10.4923696,5.63084133 C10.0257801,5.8085897 9.71027678,6.28406661 9.79026355,6.83508656 C9.86136289,7.32389459 10.2790716,7.71938472 10.7678796,7.77270924 C10.9767339,7.79492778 11.158926,7.75937811 11.3322307,7.68383505 L11.3322307,10.8877495 C11.3322307,11.1321535 11.1322638,11.3321204 10.8878598,11.3321204 C10.6434557,11.3321204 10.4434888,11.1321535 10.4434888,10.8877495 L10.4434888,8.88808028 C10.4434888,8.39927225 10.043555,7.99933841 9.55474695,7.99933841 L9.11037601,7.99933841 L9.11037601,4.88874187 C9.11037601,4.39993384 8.71044217,4 8.22163415,4 L5.55540854,4 C5.06660051,4 4.66666667,4.39993384 4.66666667,4.88874187 L4.66666667,11.5543059 C4.66666667,11.7987099 4.86663359,11.9986768 5.1110376,11.9986768 L8.66600508,11.9986768 C8.91040909,11.9986768 9.11037601,11.7987099 9.11037601,11.5543059 L9.11037601,8.66589482 L9.77693242,8.66589482 L9.77693242,10.8255376 C9.77693242,11.4076635 10.1946411,11.9364649 10.7723233,11.9942331 C11.4388797,12.0608888 11.9987871,11.5409748 11.9987871,10.8877495 L11.9987871,6.66622561 C11.9987871,6.35960966 11.8743632,6.07965598 11.6743963,5.87968905 Z M10.8878598,7.11059654 C10.6434557,7.11059654 10.4434888,6.91062962 10.4434888,6.66622561 C10.4434888,6.42182159 10.6434557,6.22185467 10.8878598,6.22185467 C11.1322638,6.22185467 11.3322307,6.42182159 11.3322307,6.66622561 C11.3322307,6.91062962 11.1322638,7.11059654 10.8878598,7.11059654 Z M6.44415041,9.83014666 L6.44415041,8.66589482 L5.92423641,8.66589482 C5.75537546,8.66589482 5.64872643,8.48814644 5.7287132,8.33706032 L6.9151836,6.11520565 C7.02183262,5.91523873 7.33289228,5.99078179 7.33289228,6.22185467 L7.33289228,7.55496748 L7.83947514,7.55496748 C8.0083361,7.55496748 8.11498512,7.73715956 8.03055464,7.88824568 L6.85741538,9.9412394 C6.74632264,10.1367626 6.44415041,10.0567758 6.44415041,9.83014666 L6.44415041,9.83014666 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="charging-station-m.svg"
+   id="svg1782"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs1786" />
+  <title
+     id="title1774">charging-station-m</title>
+  <g
+     transform="scale(1.5)"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-1">
+    <g
+       fill-rule="nonzero"
+       id="charging-station-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         opacity="0.6"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#717065"
+         id="circle1777" />
+      <path
+         fill="#ffffff"
+         id="Shape"
+         d="m 11.674396,5.879689 0.0044,-0.00444 -1.417543,-1.4175432 c -0.128868,-0.1288676 -0.3421659,-0.1288676 -0.4710334,0 -0.1288676,0.1288675 -0.1288676,0.3421656 0,0.4710331 L 10.49237,5.6308413 c -0.46659,0.1777484 -0.7820932,0.6532253 -0.7021064,1.2042453 0.071099,0.488808 0.4888084,0.8842981 0.9776164,0.9376226 0.208854,0.022219 0.391046,-0.013331 0.564351,-0.088874 V 10.88775 c 0,0.244403 -0.199967,0.44437 -0.444371,0.44437 -0.244404,0 -0.444371,-0.199967 -0.444371,-0.44437 V 8.8880803 c 0,-0.4888081 -0.399934,-0.8887419 -0.888742,-0.8887419 H 9.110376 V 4.8887419 C 9.110376,4.3999338 8.7104422,4 8.2216342,4 H 5.5554085 C 5.0666005,4 4.6666667,4.3999338 4.6666667,4.8887419 v 6.6655641 c 0,0.244404 0.1999669,0.444371 0.4443709,0.444371 h 3.5549675 c 0.244404,0 0.4443709,-0.199967 0.4443709,-0.444371 V 8.6658948 h 0.6665564 v 2.1596432 c 0,0.582126 0.4177086,1.110927 0.9953906,1.168695 0.666557,0.06666 1.226464,-0.453258 1.226464,-1.106483 V 6.6662256 c 0,-0.3066159 -0.124424,-0.5865696 -0.324391,-0.7865366 z M 10.88786,7.1105965 c -0.244404,0 -0.444371,-0.1999669 -0.444371,-0.4443709 0,-0.244404 0.199967,-0.4443709 0.444371,-0.4443709 0.244404,0 0.444371,0.1999669 0.444371,0.4443709 0,0.244404 -0.199967,0.4443709 -0.444371,0.4443709 z M 6.4441504,9.8301467 V 8.6658948 h -0.519914 c -0.1688609,0 -0.27551,-0.1777484 -0.1955232,-0.3288345 L 6.9151836,6.1152056 C 7.0218326,5.9152387 7.3328923,5.9907818 7.3328923,6.2218547 v 1.3331128 h 0.5065828 c 0.168861,0 0.27551,0.1821921 0.1910795,0.3332782 L 6.8574154,9.9412394 C 6.7463226,10.136763 6.4441504,10.056776 6.4441504,9.8301467 Z" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg
index 15601f5933..22a105db2f 100644
--- a/data/styles/clear/style-clear/symbols/museum-m.svg
+++ b/data/styles/clear/style-clear/symbols/museum-m.svg
@@ -1,11 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>museum-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="museum-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#7F5933" cx="8" cy="8" r="7.33333333"></circle>
-            <path d="M12.4333333,7.43066667 C12.564,7.43066667 12.6666667,7.328 12.6666667,7.19733333 L12.6666667,6.61866667 C12.6666667,6.544 12.6293333,6.46933333 12.5686667,6.42733333 L8.266,3.41733333 C8.10733333,3.30533333 7.89266667,3.30533333 7.72933333,3.41733333 L3.43133333,6.42733333 C3.37066667,6.46933333 3.33333333,6.544 3.33333333,6.61866667 L3.33333333,7.19733333 C3.33333333,7.328 3.436,7.43066667 3.56666667,7.43066667 L4.26666667,7.43066667 L4.26666667,11.6306667 L3.8,11.6306667 C3.54333333,11.6306667 3.33333333,11.8406667 3.33333333,12.0973333 C3.33333333,12.354 3.54333333,12.564 3.8,12.564 L12.2,12.564 C12.4566667,12.564 12.6666667,12.354 12.6666667,12.0973333 C12.6666667,11.8406667 12.4566667,11.6306667 12.2,11.6306667 L11.7333333,11.6306667 L11.7333333,7.43066667 L12.4333333,7.43066667 Z M9.86666667,10.2306667 C9.86666667,10.4873333 9.65666667,10.6973333 9.4,10.6973333 C9.14333333,10.6973333 8.93333333,10.4873333 8.93333333,10.2306667 L8.93333333,8.83066667 L8.38733333,9.64733333 C8.20066667,9.92266667 7.79466667,9.92266667 7.61266667,9.64733333 L7.06666667,8.83066667 L7.06666667,10.2306667 C7.06666667,10.4873333 6.85666667,10.6973333 6.6,10.6973333 C6.34333333,10.6973333 6.13333333,10.4873333 6.13333333,10.2306667 L6.13333333,8.03733333 C6.13333333,7.70133333 6.404,7.43066667 6.74,7.43066667 L6.74,7.43066667 C6.94066667,7.43066667 7.132,7.53333333 7.244,7.70133333 L8,8.83066667 L8.75133333,7.70133333 C8.868,7.53333333 9.05466667,7.43066667 9.26,7.43066667 L9.26,7.43066667 C9.596,7.43066667 9.86666667,7.70133333 9.86666667,8.03733333 L9.86666667,10.2306667 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="museum-m.svg"
+   id="svg2086"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs2090" />
+  <title
+     id="title2078">museum-m</title>
+  <g
+     transform="scale(1.5)"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-1">
+    <g
+       fill-rule="nonzero"
+       id="museum-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         opacity="0.6"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#7f5933"
+         id="circle2081" />
+      <path
+         fill="#ffffff"
+         id="Shape"
+         d="m 12.433333,7.4306667 c 0.130667,0 0.233334,-0.1026667 0.233334,-0.2333334 V 6.6186667 c 0,-0.074667 -0.03733,-0.1493334 -0.098,-0.1913334 l -4.302667,-3.01 c -0.1586667,-0.112 -0.3733333,-0.112 -0.5366667,0 l -4.298,3.01 c -0.060667,0.042 -0.098,0.1166667 -0.098,0.1913334 v 0.5786666 c 0,0.1306667 0.1026667,0.2333334 0.2333334,0.2333334 h 0.7 V 11.630667 H 3.8 c -0.2566667,0 -0.4666667,0.21 -0.4666667,0.466666 0,0.256667 0.21,0.466667 0.4666667,0.466667 h 8.4 c 0.256667,0 0.466667,-0.21 0.466667,-0.466667 0,-0.256666 -0.21,-0.466666 -0.466667,-0.466666 H 11.733333 V 7.4306667 Z M 9.8666667,10.230667 c 0,0.256666 -0.21,0.466666 -0.4666667,0.466666 -0.2566667,0 -0.4666667,-0.21 -0.4666667,-0.466666 V 8.8306667 l -0.546,0.8166666 c -0.1866666,0.2753334 -0.5926666,0.2753334 -0.7746666,0 l -0.546,-0.8166666 v 1.4000003 c 0,0.256666 -0.21,0.466666 -0.4666667,0.466666 -0.2566667,0 -0.4666667,-0.21 -0.4666667,-0.466666 V 8.0373333 c 0,-0.336 0.2706667,-0.6066666 0.6066667,-0.6066666 v 0 c 0.2006667,0 0.392,0.1026666 0.504,0.2706666 L 8,8.8306667 8.7513333,7.7013333 C 8.868,7.5333333 9.0546667,7.4306667 9.26,7.4306667 v 0 c 0.336,0 0.6066667,0.2706666 0.6066667,0.6066666 z" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg
index c73dbfed84..ddb0b47e58 100644
--- a/data/styles/clear/style-night/symbols/car-repair-m.svg
+++ b/data/styles/clear/style-night/symbols/car-repair-m.svg
@@ -1,14 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>car-repair-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="car-repair-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#717065" cx="8" cy="8" r="7.33333333"></circle>
-            <g id="Group" transform="translate(4.000000, 3.333333)" fill="#FFFFFF">
-                <path d="M1.47368421,5.89473684 L1.47368421,5.40350877 L6.38596491,5.40350877 L6.38596491,5.89473684 C6.38596491,6.16491228 6.60701754,6.38596491 6.87719298,6.38596491 L6.87719298,6.38596491 C7.14736842,6.38596491 7.36842105,6.16491228 7.36842105,5.89473684 L7.36842105,2.79508772 C7.36842105,2.79508772 6.71017544,0.815438596 6.60210526,0.49122807 C6.57754386,0.412631579 6.54315789,0.34877193 6.50877193,0.294736842 C6.49894737,0.284912281 6.49403509,0.275087719 6.48421053,0.260350877 C6.29754386,0.0049122807 6.0322807,0 6.0322807,0 L1.82736842,0 C1.82736842,0 1.56210526,0.0049122807 1.3754386,0.265263158 C1.36561404,0.275087719 1.36070175,0.284912281 1.35087719,0.294736842 C1.31649123,0.34877193 1.28210526,0.412631579 1.25754386,0.49122807 C1.14947368,0.815438596 0.49122807,2.79508772 0.49122807,2.79508772 L0.49122807,5.89473684 C0.49122807,6.16491228 0.712280702,6.38596491 0.98245614,6.38596491 L0.98245614,6.38596491 C1.25263158,6.38596491 1.47368421,6.16491228 1.47368421,5.89473684 Z M2.45614035,4.1754386 C2.18596491,4.1754386 1.96491228,3.95438596 1.96491228,3.68421053 C1.96491228,3.41403509 2.18596491,3.19298246 2.45614035,3.19298246 C2.72631579,3.19298246 2.94736842,3.41403509 2.94736842,3.68421053 C2.94736842,3.95438596 2.72631579,4.1754386 2.45614035,4.1754386 Z M5.40350877,4.1754386 C5.13333333,4.1754386 4.9122807,3.95438596 4.9122807,3.68421053 C4.9122807,3.41403509 5.13333333,3.19298246 5.40350877,3.19298246 C5.67368421,3.19298246 5.89473684,3.41403509 5.89473684,3.68421053 C5.89473684,3.95438596 5.67368421,4.1754386 5.40350877,4.1754386 Z M2.12701754,0.98245614 L5.73263158,0.98245614 L5.84561404,1.32140351 L6.05684211,1.96491228 L1.80280702,1.96491228 L2.12701754,0.98245614 Z" id="Shape"></path>
-                <path d="M0,7.37333333 L0,7.37333333 C0,7.63859649 0.221052632,7.85964912 0.486315789,7.85964912 L3.43859649,7.85964912 L3.43859649,8.84701754 C3.43859649,9.11719298 3.65964912,9.33333333 3.92491228,9.33333333 L3.92982456,9.33333333 C4.2,9.33333333 4.41614035,9.1122807 4.41614035,8.84701754 L4.41614035,7.85964912 L7.36842105,7.85964912 C7.63859649,7.85964912 7.85473684,7.63859649 7.85473684,7.37333333 L7.85473684,7.37333333 C7.85473684,7.10315789 7.63368421,6.88701754 7.36842105,6.88701754 L0.486315789,6.88701754 C0.221052632,6.88210526 0,7.10315789 0,7.37333333 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="car-repair-m.svg"
+   id="svg3173"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs3177" />
+  <title
+     id="title3163">car-repair-m</title>
+  <g
+     transform="scale(1.5)"
+     opacity="0.6"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-2:-Night">
+    <g
+       fill-rule="nonzero"
+       id="car-repair-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#717065"
+         id="circle3166" />
+      <g
+         fill="#ffffff"
+         transform="translate(4,3.333333)"
+         id="Group">
+        <path
+           id="Shape"
+           d="m 1.4736842,5.8947368 v -0.491228 h 4.9122807 v 0.491228 c 0,0.2701755 0.2210526,0.4912281 0.4912281,0.4912281 v 0 c 0.2701754,0 0.491228,-0.2210526 0.491228,-0.4912281 V 2.7950877 c 0,0 -0.6582456,-1.9796491 -0.7663157,-2.30385963 -0.024561,-0.0785965 -0.058947,-0.14245614 -0.093333,-0.19649123 -0.00982,-0.009825 -0.014737,-0.0196491 -0.024561,-0.034386 C 6.2975439,0.00491228 6.0322807,0 6.0322807,0 H 1.8273684 c 0,0 -0.2652631,0.00491228 -0.4519298,0.26526316 -0.00982,0.009825 -0.014737,0.0196491 -0.024561,0.0294737 C 1.3164916,0.34877196 1.2821056,0.4126316 1.2575446,0.49122809 1.1494737,0.8154386 0.49122807,2.7950877 0.49122807,2.7950877 v 3.0996491 c 0,0.2701755 0.22105263,0.4912281 0.49122807,0.4912281 v 0 c 0.27017546,0 0.49122806,-0.2210526 0.49122806,-0.4912281 z M 2.4561404,4.1754386 c -0.2701755,0 -0.4912281,-0.2210526 -0.4912281,-0.4912281 0,-0.2701754 0.2210526,-0.491228 0.4912281,-0.491228 0.2701754,0 0.491228,0.2210526 0.491228,0.491228 0,0.2701755 -0.2210526,0.4912281 -0.491228,0.4912281 z m 2.9473684,0 c -0.2701755,0 -0.4912281,-0.2210526 -0.4912281,-0.4912281 0,-0.2701754 0.2210526,-0.491228 0.4912281,-0.491228 0.2701754,0 0.491228,0.2210526 0.491228,0.491228 0,0.2701755 -0.2210526,0.4912281 -0.491228,0.4912281 z M 2.1270175,0.98245614 H 5.7326316 L 5.845614,1.3214035 6.0568421,1.9649123 H 1.802807 Z" />
+        <path
+           id="Path"
+           d="m 0,7.3733333 v 0 C 0,7.6385965 0.22105263,7.8596491 0.48631579,7.8596491 H 3.4385965 v 0.9873684 c 0,0.2701755 0.2210526,0.4863158 0.4863158,0.4863158 h 0.00491 c 0.2701777,0 0.486318,-0.2210526 0.486318,-0.4863158 V 7.8596491 H 7.368421 c 0.2701755,0 0.4863158,-0.2210526 0.4863158,-0.4863158 v 0 c 0,-0.2701754 -0.2210526,-0.4863158 -0.4863158,-0.4863158 H 0.48631579 C 0.22105263,6.8821053 0,7.1031579 0,7.3733333 Z" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/charging-station-m.svg b/data/styles/clear/style-night/symbols/charging-station-m.svg
index 3b789f301e..8406711f50 100644
--- a/data/styles/clear/style-night/symbols/charging-station-m.svg
+++ b/data/styles/clear/style-night/symbols/charging-station-m.svg
@@ -1,11 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>charging-station-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="charging-station-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#717065" cx="8" cy="8" r="7.33333333"></circle>
-            <path d="M11.6743963,5.87968905 L11.67884,5.87524534 L10.2612967,4.45770206 C10.1324292,4.32883449 9.91913112,4.32883449 9.79026355,4.45770206 C9.66139597,4.58656963 9.66139597,4.79986768 9.79026355,4.92873525 L10.4923696,5.63084133 C10.0257801,5.8085897 9.71027678,6.28406661 9.79026355,6.83508656 C9.86136289,7.32389459 10.2790716,7.71938472 10.7678796,7.77270924 C10.9767339,7.79492778 11.158926,7.75937811 11.3322307,7.68383505 L11.3322307,10.8877495 C11.3322307,11.1321535 11.1322638,11.3321204 10.8878598,11.3321204 C10.6434557,11.3321204 10.4434888,11.1321535 10.4434888,10.8877495 L10.4434888,8.88808028 C10.4434888,8.39927225 10.043555,7.99933841 9.55474695,7.99933841 L9.11037601,7.99933841 L9.11037601,4.88874187 C9.11037601,4.39993384 8.71044217,4 8.22163415,4 L5.55540854,4 C5.06660051,4 4.66666667,4.39993384 4.66666667,4.88874187 L4.66666667,11.5543059 C4.66666667,11.7987099 4.86663359,11.9986768 5.1110376,11.9986768 L8.66600508,11.9986768 C8.91040909,11.9986768 9.11037601,11.7987099 9.11037601,11.5543059 L9.11037601,8.66589482 L9.77693242,8.66589482 L9.77693242,10.8255376 C9.77693242,11.4076635 10.1946411,11.9364649 10.7723233,11.9942331 C11.4388797,12.0608888 11.9987871,11.5409748 11.9987871,10.8877495 L11.9987871,6.66622561 C11.9987871,6.35960966 11.8743632,6.07965598 11.6743963,5.87968905 Z M10.8878598,7.11059654 C10.6434557,7.11059654 10.4434888,6.91062962 10.4434888,6.66622561 C10.4434888,6.42182159 10.6434557,6.22185467 10.8878598,6.22185467 C11.1322638,6.22185467 11.3322307,6.42182159 11.3322307,6.66622561 C11.3322307,6.91062962 11.1322638,7.11059654 10.8878598,7.11059654 Z M6.44415041,9.83014666 L6.44415041,8.66589482 L5.92423641,8.66589482 C5.75537546,8.66589482 5.64872643,8.48814644 5.7287132,8.33706032 L6.9151836,6.11520565 C7.02183262,5.91523873 7.33289228,5.99078179 7.33289228,6.22185467 L7.33289228,7.55496748 L7.83947514,7.55496748 C8.0083361,7.55496748 8.11498512,7.73715956 8.03055464,7.88824568 L6.85741538,9.9412394 C6.74632264,10.1367626 6.44415041,10.0567758 6.44415041,9.83014666 L6.44415041,9.83014666 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="charging-station-m.svg"
+   id="svg2544"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs2548" />
+  <title
+     id="title2536">charging-station-m</title>
+  <g
+     transform="scale(1.5)"
+     opacity="0.6"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-2:-Night">
+    <g
+       fill-rule="nonzero"
+       id="charging-station-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#717065"
+         id="circle2539" />
+      <path
+         fill="#ffffff"
+         id="Shape"
+         d="m 11.674396,5.879689 0.0044,-0.00444 -1.417543,-1.4175432 c -0.128868,-0.1288676 -0.3421659,-0.1288676 -0.4710334,0 -0.1288676,0.1288675 -0.1288676,0.3421656 0,0.4710331 L 10.49237,5.6308413 c -0.46659,0.1777484 -0.7820932,0.6532253 -0.7021064,1.2042453 0.071099,0.488808 0.4888084,0.8842981 0.9776164,0.9376226 0.208854,0.022219 0.391046,-0.013331 0.564351,-0.088874 V 10.88775 c 0,0.244403 -0.199967,0.44437 -0.444371,0.44437 -0.244404,0 -0.444371,-0.199967 -0.444371,-0.44437 V 8.8880803 c 0,-0.4888081 -0.399934,-0.8887419 -0.888742,-0.8887419 H 9.110376 V 4.8887419 C 9.110376,4.3999338 8.7104422,4 8.2216342,4 H 5.5554085 C 5.0666005,4 4.6666667,4.3999338 4.6666667,4.8887419 v 6.6655641 c 0,0.244404 0.1999669,0.444371 0.4443709,0.444371 h 3.5549675 c 0.244404,0 0.4443709,-0.199967 0.4443709,-0.444371 V 8.6658948 h 0.6665564 v 2.1596432 c 0,0.582126 0.4177086,1.110927 0.9953906,1.168695 0.666557,0.06666 1.226464,-0.453258 1.226464,-1.106483 V 6.6662256 c 0,-0.3066159 -0.124424,-0.5865696 -0.324391,-0.7865366 z M 10.88786,7.1105965 c -0.244404,0 -0.444371,-0.1999669 -0.444371,-0.4443709 0,-0.244404 0.199967,-0.4443709 0.444371,-0.4443709 0.244404,0 0.444371,0.1999669 0.444371,0.4443709 0,0.244404 -0.199967,0.4443709 -0.444371,0.4443709 z M 6.4441504,9.8301467 V 8.6658948 h -0.519914 c -0.1688609,0 -0.27551,-0.1777484 -0.1955232,-0.3288345 L 6.9151836,6.1152056 C 7.0218326,5.9152387 7.3328923,5.9907818 7.3328923,6.2218547 v 1.3331128 h 0.5065828 c 0.168861,0 0.27551,0.1821921 0.1910795,0.3332782 L 6.8574154,9.9412394 C 6.7463226,10.136763 6.4441504,10.056776 6.4441504,9.8301467 Z" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/clear/style-night/symbols/museum-m.svg
index 891925c8a6..5b95640cda 100644
--- a/data/styles/clear/style-night/symbols/museum-m.svg
+++ b/data/styles/clear/style-night/symbols/museum-m.svg
@@ -1,11 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>museum-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="museum-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="8"></circle>
-            <circle id="Oval" fill="#7F5933" cx="8" cy="8" r="7.33333333"></circle>
-            <path d="M12.4333333,7.43066667 C12.564,7.43066667 12.6666667,7.328 12.6666667,7.19733333 L12.6666667,6.61866667 C12.6666667,6.544 12.6293333,6.46933333 12.5686667,6.42733333 L8.266,3.41733333 C8.10733333,3.30533333 7.89266667,3.30533333 7.72933333,3.41733333 L3.43133333,6.42733333 C3.37066667,6.46933333 3.33333333,6.544 3.33333333,6.61866667 L3.33333333,7.19733333 C3.33333333,7.328 3.436,7.43066667 3.56666667,7.43066667 L4.26666667,7.43066667 L4.26666667,11.6306667 L3.8,11.6306667 C3.54333333,11.6306667 3.33333333,11.8406667 3.33333333,12.0973333 C3.33333333,12.354 3.54333333,12.564 3.8,12.564 L12.2,12.564 C12.4566667,12.564 12.6666667,12.354 12.6666667,12.0973333 C12.6666667,11.8406667 12.4566667,11.6306667 12.2,11.6306667 L11.7333333,11.6306667 L11.7333333,7.43066667 L12.4333333,7.43066667 Z M9.86666667,10.2306667 C9.86666667,10.4873333 9.65666667,10.6973333 9.4,10.6973333 C9.14333333,10.6973333 8.93333333,10.4873333 8.93333333,10.2306667 L8.93333333,8.83066667 L8.38733333,9.64733333 C8.20066667,9.92266667 7.79466667,9.92266667 7.61266667,9.64733333 L7.06666667,8.83066667 L7.06666667,10.2306667 C7.06666667,10.4873333 6.85666667,10.6973333 6.6,10.6973333 C6.34333333,10.6973333 6.13333333,10.4873333 6.13333333,10.2306667 L6.13333333,8.03733333 C6.13333333,7.70133333 6.404,7.43066667 6.74,7.43066667 L6.74,7.43066667 C6.94066667,7.43066667 7.132,7.53333333 7.244,7.70133333 L8,8.83066667 L8.75133333,7.70133333 C8.868,7.53333333 9.05466667,7.43066667 9.26,7.43066667 L9.26,7.43066667 C9.596,7.43066667 9.86666667,7.70133333 9.86666667,8.03733333 L9.86666667,10.2306667 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.1-dev (1:0.92.0+devel+202005110039+9ce7266)"
+   sodipodi:docname="museum-m.svg"
+   id="svg2848"
+   version="1.1"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24">
+  <defs
+     id="defs2852" />
+  <title
+     id="title2840">museum-m</title>
+  <g
+     transform="scale(1.5)"
+     opacity="0.6"
+     fill-rule="evenodd"
+     fill="none"
+     stroke-width="1"
+     stroke="none"
+     id="Page-2:-Night">
+    <g
+       fill-rule="nonzero"
+       id="museum-m">
+      <circle
+         r="8"
+         cy="8"
+         cx="8"
+         fill="#ffffff"
+         id="Oval" />
+      <circle
+         r="7.3333335"
+         cy="8"
+         cx="8"
+         fill="#7f5933"
+         id="circle2843" />
+      <path
+         fill="#ffffff"
+         id="Shape"
+         d="m 12.433333,7.4306667 c 0.130667,0 0.233334,-0.1026667 0.233334,-0.2333334 V 6.6186667 c 0,-0.074667 -0.03733,-0.1493334 -0.098,-0.1913334 l -4.302667,-3.01 c -0.1586667,-0.112 -0.3733333,-0.112 -0.5366667,0 l -4.298,3.01 c -0.060667,0.042 -0.098,0.1166667 -0.098,0.1913334 v 0.5786666 c 0,0.1306667 0.1026667,0.2333334 0.2333334,0.2333334 h 0.7 V 11.630667 H 3.8 c -0.2566667,0 -0.4666667,0.21 -0.4666667,0.466666 0,0.256667 0.21,0.466667 0.4666667,0.466667 h 8.4 c 0.256667,0 0.466667,-0.21 0.466667,-0.466667 0,-0.256666 -0.21,-0.466666 -0.466667,-0.466666 H 11.733333 V 7.4306667 Z M 9.8666667,10.230667 c 0,0.256666 -0.21,0.466666 -0.4666667,0.466666 -0.2566667,0 -0.4666667,-0.21 -0.4666667,-0.466666 V 8.8306667 l -0.546,0.8166666 c -0.1866666,0.2753334 -0.5926666,0.2753334 -0.7746666,0 l -0.546,-0.8166666 v 1.4000003 c 0,0.256666 -0.21,0.466666 -0.4666667,0.466666 -0.2566667,0 -0.4666667,-0.21 -0.4666667,-0.466666 V 8.0373333 c 0,-0.336 0.2706667,-0.6066666 0.6066667,-0.6066666 v 0 c 0.2006667,0 0.392,0.1026666 0.504,0.2706666 L 8,8.8306667 8.7513333,7.7013333 C 8.868,7.5333333 9.0546667,7.4306667 9.26,7.4306667 v 0 c 0.336,0 0.6066667,0.2706666 0.6066667,0.6066666 z" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>