diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/clear/style-clear/symbols/dog_park-m.svg
index 788169d5ea..c6a0d1d64b 100644
--- a/data/styles/clear/style-clear/symbols/dog_park-m.svg
+++ b/data/styles/clear/style-clear/symbols/dog_park-m.svg
@@ -1,10 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>dog_park-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="dog_park-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.562 6.75h-1.75l-0.19578-0.39129c-0.1482-0.29643-0.45116-0.48369-0.78258-0.48371h-1.4662l-0.74594-0.74594c-0.2759-0.27562-0.74703-0.080391-0.74703 0.30926v4.0972l3.5 1.2499v-0.97289h0.875c0.9666 0 1.75-0.7834 1.75-1.75v-0.875c0-0.24172-0.19578-0.4375-0.4375-0.4375zm-3.0625 1.3125c-0.24172 0-0.4375-0.19578-0.4375-0.4375s0.19578-0.4375 0.4375-0.4375 0.4375 0.19578 0.4375 0.4375-0.19578 0.4375-0.4375 0.4375zm-7.875 2.1875c-0.48234 0-0.875-0.39266-0.875-0.875 0-0.48316-0.39184-0.875-0.875-0.875s-0.875 0.39184-0.875 0.875c0 1.1391 0.73363 2.1014 1.75 2.4637v5.8488c0 0.24172 0.19578 0.4375 0.4375 0.4375h1.75c0.24172 0 0.4375-0.19578 0.4375-0.4375v-3.0625h4.375v3.0625c0 0.24172 0.19578 0.4375 0.4375 0.4375h1.75c0.24172 0 0.4375-0.19578 0.4375-0.4375v-5.9732l-4.1002-1.4643h-4.6498z" fill="#fff"/>
+   <path id="Shape" d="m19.05 6.3925h-1.88l-0.2103-0.42036c-0.1592-0.31845-0.4847-0.51962-0.8407-0.51964h-1.5752l-0.8013-0.80135c-0.2964-0.29609-0.8025-0.08636-0.8025 0.33223v4.4015l3.76 1.3427v-1.0452h0.9399c1.0384 0 1.88-0.84159 1.88-1.88v-0.93999c0-0.25968-0.2103-0.47-0.47-0.47zm-3.29 1.41c-0.2597 0-0.47-0.21032-0.47-0.47 0-0.25967 0.2103-0.47 0.47-0.47s0.47 0.21033 0.47 0.47c0 0.25968-0.2103 0.47-0.47 0.47zm-8.46 2.35c-0.51817 0-0.94-0.42181-0.94-0.93998 0-0.51905-0.42094-0.93999-0.93999-0.93999s-0.94 0.42094-0.94 0.93999c0 1.2237 0.78813 2.2575 1.88 2.6467v6.2833c0 0.2596 0.21032 0.47 0.47 0.47h1.88c0.25967 0 0.47-0.2104 0.47-0.47v-3.29h4.7v3.29c0 0.2596 0.2103 0.47 0.47 0.47h1.88c0.2597 0 0.47-0.2104 0.47-0.47v-6.4169l-4.4048-1.5731z" fill="#717065"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg
index 3e15f15c9e..63947a0883 100644
--- a/data/styles/clear/style-clear/symbols/military-m.svg
+++ b/data/styles/clear/style-clear/symbols/military-m.svg
@@ -1,14 +1,15 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>military-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="military-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"/>
-   <g id="Group" transform="translate(5 7)" fill="#fff">
-    <path id="Path" d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z"/>
-    <path id="Shape" d="m11.901 6.3014h-9.8c-1.1599 0-2.1 0.9401-2.1 2.1s0.9401 2.1 2.1 2.1h9.8c1.1599 0 2.1-0.9401 2.1-2.1s-0.9394-2.1-2.1-2.1zm-8.4 2.975c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875z"/>
-    <path id="Path" d="m12.601 0.0014v0.7h-3.4461l-0.1036-0.2604c-0.1064-0.266-0.364-0.4396-0.6503-0.4396h-3.5c-0.2863 0-0.5432 0.1743-0.6503 0.4396l-0.9443 2.3604h6.6885l-0.28-0.7h2.8861v0.7h1.4v-2.8h-1.4z"/>
-   </g>
-  </g>
- </g>
-</svg>
+    <title>military-m</title>
+    <g fill="none" fill-rule="evenodd">
+        <g id="military-m" fill-rule="nonzero">
+            <g id="Group" transform="translate(5 7)" fill="#717065">
+                <path id="Path"
+                    d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
+                <path id="Shape"
+                    d="m11.901 6.3014h-9.8c-1.1599 0-2.1 0.9401-2.1 2.1s0.9401 2.1 2.1 2.1h9.8c1.1599 0 2.1-0.9401 2.1-2.1s-0.9394-2.1-2.1-2.1zm-8.4 2.975c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875z" />
+                <path id="Path"
+                    d="m12.601 0.0014v0.7h-3.4461l-0.1036-0.2604c-0.1064-0.266-0.364-0.4396-0.6503-0.4396h-3.5c-0.2863 0-0.5432 0.1743-0.6503 0.4396l-0.9443 2.3604h6.6885l-0.28-0.7h2.8861v0.7h1.4v-2.8h-1.4z" />
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/viewpoint-m.svg b/data/styles/clear/style-clear/symbols/viewpoint-m.svg
index 54f424e1ea..bb8f581597 100644
--- a/data/styles/clear/style-clear/symbols/viewpoint-m.svg
+++ b/data/styles/clear/style-clear/symbols/viewpoint-m.svg
@@ -1,10 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>viewpoint-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="viewpoint-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="#7F5933"/>
-   <path id="Shape" d="m9.7727 6c-0.78232 0-1.4179 0.55177-1.5511 1.2739-0.34702 0.078871-0.67301 0.29387-0.875 0.63695l-2.0881 4.2656h0.019886c-0.17301 0.37992-0.27841 0.79512-0.27841 1.2353 0 1.6983 1.4321 3.0882 3.1818 3.0882 1.3714 0 2.5384-0.85909 2.983-2.046 0.2532 0.12131 0.536 0.19301 0.83523 0.19301s0.58203-0.071704 0.83523-0.19301c0.44459 1.1869 1.6116 2.046 2.983 2.046 1.7497 0 3.1818-1.39 3.1818-3.0882 0-0.44017-0.1054-0.85538-0.27841-1.2353h0.019886l-2.0881-4.2656c-0.20199-0.34308-0.52798-0.55808-0.875-0.63695-0.1332-0.72213-0.76881-1.2739-1.5511-1.2739-0.76881 0-1.4028 0.53167-1.5511 1.2353h-1.3523c-0.14835-0.70363-0.78233-1.2353-1.5511-1.2353zm-1.5909 5.5588c1.0619 0 1.9091 0.82227 1.9091 1.8529s-0.84719 1.8529-1.9091 1.8529-1.9091-0.82227-1.9091-1.8529 0.84719-1.8529 1.9091-1.8529zm7.6364 0c1.0619 0 1.9091 0.82227 1.9091 1.8529s-0.84719 1.8529-1.9091 1.8529c-1.0619 0-1.9091-0.82227-1.9091-1.8529s0.84719-1.8529 1.9091-1.8529zm-3.8182 0.61765c0.35289 0 0.63636 0.27513 0.63636 0.61765 0 0.34251-0.28347 0.61765-0.63636 0.61765s-0.63636-0.27513-0.63636-0.61765c0-0.34251 0.28347-0.61765 0.63636-0.61765z" fill="#fff"/>
+  <title>viewpoint-m</title>
+  <g id="viewpoint-m" fill-rule="evenodd">
+    <path id="Shape"
+      d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
+      fill="#7f5933" />
   </g>
- </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/viewpoint-s.svg b/data/styles/clear/style-clear/symbols/viewpoint-s.svg
index 8d0252b4c4..1517b006b4 100644
--- a/data/styles/clear/style-clear/symbols/viewpoint-s.svg
+++ b/data/styles/clear/style-clear/symbols/viewpoint-s.svg
@@ -1,10 +1,8 @@
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>viewpoint-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="viewpoint-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" fill="#7F5933"/>
-   <path id="Shape" d="m6.7273 5c-0.44704 0-0.81025 0.3153-0.88636 0.72794-0.19829 0.045069-0.38458 0.16793-0.5 0.36397l-1.1932 2.4375h0.011364c-0.098861 0.21709-0.15909 0.45435-0.15909 0.70588 0 0.97044 0.81833 1.7647 1.8182 1.7647 0.78363 0 1.4505-0.49091 1.7045-1.1691 0.14468 0.06932 0.30629 0.11029 0.47727 0.11029s0.33259-0.040974 0.47727-0.11029c0.25405 0.67821 0.92092 1.1691 1.7045 1.1691 0.99985 0 1.8182-0.79427 1.8182-1.7647 0-0.25153-0.06023-0.48879-0.15909-0.70588h0.011364l-1.1932-2.4375c-0.11542-0.19604-0.30171-0.3189-0.5-0.36397-0.076112-0.41264-0.43932-0.72794-0.88636-0.72794-0.43932 0-0.80159 0.30381-0.88636 0.70588h-0.77273c-0.084769-0.40207-0.44705-0.70588-0.88636-0.70588zm-0.90909 3.1765c0.6068 0 1.0909 0.46987 1.0909 1.0588s-0.48411 1.0588-1.0909 1.0588-1.0909-0.46987-1.0909-1.0588 0.48411-1.0588 1.0909-1.0588zm4.3636 0c0.6068 0 1.0909 0.46987 1.0909 1.0588s-0.48411 1.0588-1.0909 1.0588c-0.6068 0-1.0909-0.46987-1.0909-1.0588s0.48411-1.0588 1.0909-1.0588zm-2.1818 0.35294c0.20165 0 0.36364 0.15722 0.36364 0.35294 0 0.19572-0.16198 0.35294-0.36364 0.35294s-0.36364-0.15722-0.36364-0.35294c0-0.19572 0.16198-0.35294 0.36364-0.35294z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+    <title>viewpoint-s</title>
+    <g id="viewpoint-m" fill-rule="evenodd" transform="scale(0.666666)">
+        <path id="Shape"
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
+            fill="#7f5933" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg
index 645a9c3762..d12a7e7924 100644
--- a/data/styles/clear/style-night/symbols/cave-m.svg
+++ b/data/styles/clear/style-night/symbols/cave-m.svg
@@ -1,8 +1,9 @@
 <svg version="1.1" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg">
- <title>cave-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="cave-m" fill="#262622" fill-rule="nonzero">
-   <path id="Path" d="m14.471 9.9386c-1.7572-3.1007-1.4623-6.5473-2.8609-6.5473-0.60476 0-1.4866 0.5707-1.9219 1.5175-0.49055-2.9284-1.423-4.9088-2.4939-4.9088-1.2807 0-2.3638 2.8285-2.7298 6.7287-0.25651-0.33269-0.87063-0.52336-1.1739-0.52336-1.0953 0-1.6149 2.0671-1.9828 5.398-0.36791 3.3295-2.0352 5.3967-0.9399 5.3967h5.4101c-0.0093616-0.19725-0.014979-0.39975-0.014979-0.60357 0-3.0915 1.1075-5.5978 2.4733-5.5978 1.3649 0 2.4733 2.5063 2.4733 5.5978 0 0.20382-0.005617 0.40633-0.015915 0.60357h5.7798c1.4014 0.0013146-0.2434-3.9607-2.0024-7.0614z"/>
-  </g>
- </g>
-</svg>
+    <title>cave-m</title>
+    <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+        <g id="cave-m" fill="#717065" fill-rule="nonzero">
+            <path id="Path"
+                d="m14.471 9.9386c-1.7572-3.1007-1.4623-6.5473-2.8609-6.5473-0.60476 0-1.4866 0.5707-1.9219 1.5175-0.49055-2.9284-1.423-4.9088-2.4939-4.9088-1.2807 0-2.3638 2.8285-2.7298 6.7287-0.25651-0.33269-0.87063-0.52336-1.1739-0.52336-1.0953 0-1.6149 2.0671-1.9828 5.398-0.36791 3.3295-2.0352 5.3967-0.9399 5.3967h5.4101c-0.0093616-0.19725-0.014979-0.39975-0.014979-0.60357 0-3.0915 1.1075-5.5978 2.4733-5.5978 1.3649 0 2.4733 2.5063 2.4733 5.5978 0 0.20382-0.005617 0.40633-0.015915 0.60357h5.7798c1.4014 0.0013146-0.2434-3.9607-2.0024-7.0614z" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg
index 1b19a26948..8f21d3cace 100644
--- a/data/styles/clear/style-night/symbols/cave-s.svg
+++ b/data/styles/clear/style-night/symbols/cave-s.svg
@@ -1,8 +1,9 @@
 <svg version="1.1" viewBox="0 0 13 13" xmlns="http://www.w3.org/2000/svg">
- <title>cave-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="cave-s" fill="#262622" fill-rule="nonzero">
-   <path id="Path" d="m11.066 7.6001c-1.3437-2.3711-1.1182-5.0067-2.1877-5.0067-0.46246 0-1.1368 0.43642-1.4697 1.1604-0.37512-2.2394-1.0881-3.7538-1.9071-3.7538-0.97933 0-1.8076 2.163-2.0875 5.1455-0.19615-0.25441-0.66577-0.40022-0.89772-0.40022-0.83759 0-1.2349 1.5808-1.5162 4.1279-0.28134 2.5461-1.5563 4.1269-0.71875 4.1269h4.1371c-0.0071588-0.15084-0.011454-0.30569-0.011454-0.46156 0-2.3641 0.84689-4.2807 1.8914-4.2807 1.0438 0 1.8914 1.9166 1.8914 4.2807 0 0.15586-0.0042953 0.31072-0.01217 0.46156h4.4199c1.0717 0.0010053-0.18613-3.0288-1.5313-5.3999z"/>
-  </g>
- </g>
-</svg>
+    <title>cave-s</title>
+    <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+        <g id="cave-s" fill="#717065" fill-rule="nonzero">
+            <path id="Path"
+                d="m11.066 7.6001c-1.3437-2.3711-1.1182-5.0067-2.1877-5.0067-0.46246 0-1.1368 0.43642-1.4697 1.1604-0.37512-2.2394-1.0881-3.7538-1.9071-3.7538-0.97933 0-1.8076 2.163-2.0875 5.1455-0.19615-0.25441-0.66577-0.40022-0.89772-0.40022-0.83759 0-1.2349 1.5808-1.5162 4.1279-0.28134 2.5461-1.5563 4.1269-0.71875 4.1269h4.1371c-0.0071588-0.15084-0.011454-0.30569-0.011454-0.46156 0-2.3641 0.84689-4.2807 1.8914-4.2807 1.0438 0 1.8914 1.9166 1.8914 4.2807 0 0.15586-0.0042953 0.31072-0.01217 0.46156h4.4199c1.0717 0.0010053-0.18613-3.0288-1.5313-5.3999z" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/clear/style-night/symbols/dog_park-m.svg
index edd0c353b3..878e1cb408 100644
--- a/data/styles/clear/style-night/symbols/dog_park-m.svg
+++ b/data/styles/clear/style-night/symbols/dog_park-m.svg
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>dog_park-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="dog_park-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m18.562 6.75h-1.75l-0.19578-0.39129c-0.1482-0.29643-0.45116-0.48369-0.78258-0.48371h-1.4662l-0.74594-0.74594c-0.2759-0.27562-0.74703-0.080391-0.74703 0.30926v4.0972l3.5 1.2499v-0.97289h0.875c0.9666 0 1.75-0.7834 1.75-1.75v-0.875c0-0.24172-0.19578-0.4375-0.4375-0.4375zm-3.0625 1.3125c-0.24172 0-0.4375-0.19578-0.4375-0.4375s0.19578-0.4375 0.4375-0.4375 0.4375 0.19578 0.4375 0.4375-0.19578 0.4375-0.4375 0.4375zm-7.875 2.1875c-0.48234 0-0.875-0.39266-0.875-0.875 0-0.48316-0.39184-0.875-0.875-0.875s-0.875 0.39184-0.875 0.875c0 1.1391 0.73363 2.1014 1.75 2.4637v5.8488c0 0.24172 0.19578 0.4375 0.4375 0.4375h1.75c0.24172 0 0.4375-0.19578 0.4375-0.4375v-3.0625h4.375v3.0625c0 0.24172 0.19578 0.4375 0.4375 0.4375h1.75c0.24172 0 0.4375-0.19578 0.4375-0.4375v-5.9732l-4.1002-1.4643h-4.6498z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+    <title>dog_park-m</title>
+    <g fill="none" fill-rule="evenodd" opacity="0.6">
+        <g id="dog_park-m" fill-rule="nonzero">
+            <path id="Shape"
+                d="m19.05 6.3925h-1.88l-0.2103-0.42036c-0.1592-0.31845-0.4847-0.51962-0.8407-0.51964h-1.5752l-0.8013-0.80135c-0.2964-0.29609-0.8025-0.08636-0.8025 0.33223v4.4015l3.76 1.3427v-1.0452h0.9399c1.0384 0 1.88-0.84159 1.88-1.88v-0.93999c0-0.25968-0.2103-0.47-0.47-0.47zm-3.29 1.41c-0.2597 0-0.47-0.21032-0.47-0.47 0-0.25967 0.2103-0.47 0.47-0.47s0.47 0.21033 0.47 0.47c0 0.25968-0.2103 0.47-0.47 0.47zm-8.46 2.35c-0.51817 0-0.94-0.42181-0.94-0.93998 0-0.51905-0.42094-0.93999-0.93999-0.93999s-0.94 0.42094-0.94 0.93999c0 1.2237 0.78813 2.2575 1.88 2.6467v6.2833c0 0.2596 0.21032 0.47 0.47 0.47h1.88c0.25967 0 0.47-0.2104 0.47-0.47v-3.29h4.7v3.29c0 0.2596 0.2103 0.47 0.47 0.47h1.88c0.2597 0 0.47-0.2104 0.47-0.47v-6.4169l-4.4048-1.5731z"
+                fill="#fff" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg
index ce335e6c81..b640eabf65 100644
--- a/data/styles/clear/style-night/symbols/military-m.svg
+++ b/data/styles/clear/style-night/symbols/military-m.svg
@@ -1,14 +1,15 @@
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>military-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="military-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <g id="Group" transform="translate(5 7)" fill="#fff">
-    <path id="Path" d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z"/>
-    <path id="Shape" d="m11.901 6.3014h-9.8c-1.1599 0-2.1 0.9401-2.1 2.1s0.9401 2.1 2.1 2.1h9.8c1.1599 0 2.1-0.9401 2.1-2.1s-0.9394-2.1-2.1-2.1zm-8.4 2.975c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875z"/>
-    <path id="Path" d="m12.601 0.0014v0.7h-3.4461l-0.1036-0.2604c-0.1064-0.266-0.364-0.4396-0.6503-0.4396h-3.5c-0.2863 0-0.5432 0.1743-0.6503 0.4396l-0.9443 2.3604h6.6885l-0.28-0.7h2.8861v0.7h1.4v-2.8h-1.4z"/>
-   </g>
-  </g>
- </g>
-</svg>
+    <title>military-m</title>
+    <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+        <g id="military-m" fill-rule="nonzero">
+            <g id="Group" transform="translate(5 7)" fill="#fff">
+                <path id="Path"
+                    d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
+                <path id="Shape"
+                    d="m11.901 6.3014h-9.8c-1.1599 0-2.1 0.9401-2.1 2.1s0.9401 2.1 2.1 2.1h9.8c1.1599 0 2.1-0.9401 2.1-2.1s-0.9394-2.1-2.1-2.1zm-8.4 2.975c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875zm3.5 0c-0.4837 0-0.875-0.392-0.875-0.875 0-0.4823 0.3913-0.875 0.875-0.875s0.875 0.3927 0.875 0.875c0 0.483-0.3913 0.875-0.875 0.875z" />
+                <path id="Path"
+                    d="m12.601 0.0014v0.7h-3.4461l-0.1036-0.2604c-0.1064-0.266-0.364-0.4396-0.6503-0.4396h-3.5c-0.2863 0-0.5432 0.1743-0.6503 0.4396l-0.9443 2.3604h6.6885l-0.28-0.7h2.8861v0.7h1.4v-2.8h-1.4z" />
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/clear/style-night/symbols/viewpoint-m.svg
index 0ec816a351..b69cf46e35 100644
--- a/data/styles/clear/style-night/symbols/viewpoint-m.svg
+++ b/data/styles/clear/style-night/symbols/viewpoint-m.svg
@@ -1,10 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>viewpoint-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="viewpoint-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
-   <path id="Shape" d="m9.7727 6c-0.78232 0-1.4179 0.55177-1.5511 1.2739-0.34702 0.078871-0.67301 0.29387-0.875 0.63695l-2.0881 4.2656h0.019886c-0.17301 0.37992-0.27841 0.79512-0.27841 1.2353 0 1.6983 1.4321 3.0882 3.1818 3.0882 1.3714 0 2.5384-0.85909 2.983-2.046 0.2532 0.12131 0.536 0.19301 0.83523 0.19301s0.58203-0.071704 0.83523-0.19301c0.44459 1.1869 1.6116 2.046 2.983 2.046 1.7497 0 3.1818-1.39 3.1818-3.0882 0-0.44017-0.1054-0.85538-0.27841-1.2353h0.019886l-2.0881-4.2656c-0.20199-0.34308-0.52798-0.55808-0.875-0.63695-0.1332-0.72213-0.76881-1.2739-1.5511-1.2739-0.76881 0-1.4028 0.53167-1.5511 1.2353h-1.3523c-0.14835-0.70363-0.78233-1.2353-1.5511-1.2353zm-1.5909 5.5588c1.0619 0 1.9091 0.82227 1.9091 1.8529s-0.84719 1.8529-1.9091 1.8529-1.9091-0.82227-1.9091-1.8529 0.84719-1.8529 1.9091-1.8529zm7.6364 0c1.0619 0 1.9091 0.82227 1.9091 1.8529s-0.84719 1.8529-1.9091 1.8529c-1.0619 0-1.9091-0.82227-1.9091-1.8529s0.84719-1.8529 1.9091-1.8529zm-3.8182 0.61765c0.35289 0 0.63636 0.27513 0.63636 0.61765 0 0.34251-0.28347 0.61765-0.63636 0.61765s-0.63636-0.27513-0.63636-0.61765c0-0.34251 0.28347-0.61765 0.63636-0.61765z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+    <title>viewpoint-m</title>
+    <g id="viewpoint-m" fill-rule="nonzero" opacity=".6">
+        <path id="Shape"
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
+            fill="#fff" />
+    </g>
+
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/clear/style-night/symbols/viewpoint-s.svg
index 0ceb3d399a..c7d41c98e4 100644
--- a/data/styles/clear/style-night/symbols/viewpoint-s.svg
+++ b/data/styles/clear/style-night/symbols/viewpoint-s.svg
@@ -1,10 +1,10 @@
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>viewpoint-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="viewpoint-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
-   <path id="Shape" d="m6.7273 5c-0.44704 0-0.81025 0.3153-0.88636 0.72794-0.19829 0.045069-0.38458 0.16793-0.5 0.36397l-1.1932 2.4375h0.011364c-0.098861 0.21709-0.15909 0.45435-0.15909 0.70588 0 0.97044 0.81833 1.7647 1.8182 1.7647 0.78363 0 1.4505-0.49091 1.7045-1.1691 0.14468 0.06932 0.30629 0.11029 0.47727 0.11029s0.33259-0.040974 0.47727-0.11029c0.25405 0.67821 0.92092 1.1691 1.7045 1.1691 0.99985 0 1.8182-0.79427 1.8182-1.7647 0-0.25153-0.06023-0.48879-0.15909-0.70588h0.011364l-1.1932-2.4375c-0.11542-0.19604-0.30171-0.3189-0.5-0.36397-0.076112-0.41264-0.43932-0.72794-0.88636-0.72794-0.43932 0-0.80159 0.30381-0.88636 0.70588h-0.77273c-0.084769-0.40207-0.44705-0.70588-0.88636-0.70588zm-0.90909 3.1765c0.6068 0 1.0909 0.46987 1.0909 1.0588s-0.48411 1.0588-1.0909 1.0588-1.0909-0.46987-1.0909-1.0588 0.48411-1.0588 1.0909-1.0588zm4.3636 0c0.6068 0 1.0909 0.46987 1.0909 1.0588s-0.48411 1.0588-1.0909 1.0588c-0.6068 0-1.0909-0.46987-1.0909-1.0588s0.48411-1.0588 1.0909-1.0588zm-2.1818 0.35294c0.20165 0 0.36364 0.15722 0.36364 0.35294 0 0.19572-0.16198 0.35294-0.36364 0.35294s-0.36364-0.15722-0.36364-0.35294c0-0.19572 0.16198-0.35294 0.36364-0.35294z" fill="#fff"/>
-  </g>
- </g>
-</svg>
+    <title>viewpoint-s</title>
+
+    <g id="viewpoint-m" fill-rule="nonzero" transform="scale(0.666666)" opacity="0.6">
+        <path id="Shape"
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
+            fill="#fff" />
+    </g>
+
+</svg>
\ No newline at end of file