diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg
index ccab145326..3cec10e2b5 100644
--- a/data/styles/clear/style-clear/symbols/cemetery-m.svg
+++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg
@@ -1,15 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>cemetery-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="cemetery-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#717065" cx="12" cy="12" r="11"></circle>
-            <g id="tomb" transform="translate(6.000000, 6.000000)" fill="#FFFFFF">
-                <path d="M6.22928906,0.0015 L5.7684375,0.0015 C3.70844531,0.0015 2.03847656,1.67146875 2.03847656,3.73146094 L2.03847656,7.85219531 L9.95925,7.85219531 L9.95925,3.73146094 C9.95925,1.67144531 8.28930469,0.0015 6.22928906,0.0015 Z M7.43974219,6.71917969 L4.55798438,6.71917969 C4.36382813,6.71917969 4.20642188,6.56177344 4.20642188,6.36761719 C4.20642188,6.17346094 4.36382813,6.01605469 4.55798438,6.01605469 L7.43974219,6.01605469 C7.63389844,6.01605469 7.79130469,6.17346094 7.79130469,6.36761719 C7.79130469,6.56177344 7.63392188,6.71917969 7.43974219,6.71917969 Z M7.43974219,5.31292969 L4.55798438,5.31292969 C4.36382813,5.31292969 4.20642188,5.15552344 4.20642188,4.96136719 C4.20642188,4.76721094 4.36382813,4.60980469 4.55798438,4.60980469 L7.43974219,4.60980469 C7.63389844,4.60980469 7.79130469,4.76721094 7.79130469,4.96136719 C7.79130469,5.15552344 7.63392188,5.31292969 7.43974219,5.31292969 Z M7.43974219,3.90667969 L4.55798438,3.90667969 C4.36382813,3.90667969 4.20642188,3.74927344 4.20642188,3.55511719 C4.20642188,3.36096094 4.36382813,3.20355469 4.55798438,3.20355469 L7.43974219,3.20355469 C7.63389844,3.20355469 7.79130469,3.36096094 7.79130469,3.55511719 C7.79130469,3.74927344 7.63392188,3.90667969 7.43974219,3.90667969 Z" id="Shape"></path>
-                <path d="M11.2543125,9.80988281 L11.2543125,8.90685937 C11.2543125,8.71270313 11.0969063,8.55529687 10.90275,8.55529687 L1.095,8.55529687 C0.90084375,8.55529687 0.7434375,8.71270313 0.7434375,8.90685937 L0.7434375,9.80988281 L11.2543125,9.80988281 Z" id="Path"></path>
-                <path d="M11.99775,11.99625 L0,11.99625 L0,10.8645703 C0,10.6704141 0.15740625,10.5130078 0.3515625,10.5130078 L11.6461875,10.5130078 C11.8403438,10.5130078 11.99775,10.6704141 11.99775,10.8645703 L11.99775,11.99625 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="tomb-m.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <title
+     id="title2">tomb-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="tomb-m"
+       fill-rule="nonzero">
+      <g
+         id="tomb"
+         transform="translate(6,6)"
+         fill="#ffffff">
+        <path
+           id="Shape"
+           d="m 5.6527754,-2.99707 c -3.0904881,0 -5.59368378,2.50612577 -5.59368378,5.596614 V 8.7792607 H 11.940908 V 2.599544 c 0,-3.09052333 -2.5060904,-5.596614 -5.5966138,-5.596614 z M 3.8390037,1.8054694 h 4.3219924 c 0.2912816,0 0.5274296,0.2361481 0.5274296,0.5274296 0,0.2912816 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.236148 -0.5274297,-0.5274296 0,-0.2912815 0.2361482,-0.5274296 0.5274297,-0.5274296 z m 0,2.1097184 h 4.3219924 c 0.2912816,0 0.5274296,0.2361481 0.5274296,0.5274296 0,0.2912816 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.236148 -0.5274297,-0.5274296 0,-0.2912815 0.2361482,-0.5274296 0.5274297,-0.5274296 z m 0,2.1097184 h 4.3219924 c 0.2912816,0 0.5274296,0.236148 0.5274296,0.5274296 0,0.2912815 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.2361481 -0.5274297,-0.5274296 0,-0.2912816 0.2361482,-0.5274296 0.5274297,-0.5274296 z m -5.1951815,3.8092137 c -0.2912814,0 -0.5274296,0.2361481 -0.5274296,0.5274291 v 1.356667 H 13.883607 v -1.356667 c 0,-0.291281 -0.236148,-0.5274291 -0.527429,-0.5274291 z M -2.4725704,12.773075 C -2.763852,12.773075 -3,13.009222 -3,13.300504 v 1.696566 h 18 v -1.696566 c 0,-0.291282 -0.236149,-0.527429 -0.52743,-0.527429 z"
+           style="fill:#717065;fill-opacity:1" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg
index adde1c173c..4f6cac9b0c 100644
--- a/data/styles/clear/style-clear/symbols/monument-m.svg
+++ b/data/styles/clear/style-clear/symbols/monument-m.svg
@@ -1,11 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>monument-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="monument-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <path d="M16.5833333,16.6666016 L7.41666667,16.6666016 C7.18645833,16.6666016 7,16.8530599 7,17.0832682 L7,17.9166016 C7,18.1468099 7.18645833,18.3332682 7.41666667,18.3332682 L16.5833333,18.3332682 C16.8135417,18.3332682 17,18.1468099 17,17.9166016 L17,17.0832682 C17,16.8530599 16.8135417,16.6666016 16.5833333,16.6666016 Z M14.5296875,7.6233724 C14.5106166,7.43198405 14.4258685,7.25310205 14.2898437,7.1171224 L12.2945312,5.12207031 C12.1317708,4.9593099 11.8679687,4.9593099 11.7052083,5.12207031 L9.71041667,7.1171224 C9.57439192,7.25310205 9.48964381,7.43198405 9.47057292,7.6233724 L8.66666667,15.8332682 L15.3333333,15.8332682 L14.5296875,7.6233724 Z M13.25,12.9999349 C13.25,13.1666016 13.0833333,13.3332682 12.9166667,13.3332682 L11.0833333,13.3332682 C10.9166667,13.3332682 10.75,13.1666016 10.75,12.9999349 L10.75,11.9999349 C10.75,11.8332682 10.9166667,11.6666016 11.0833333,11.6666016 L12.9166667,11.6666016 C13.0833333,11.6666016 13.25,11.8332682 13.25,11.9999349 L13.25,12.9999349 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="monument-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.291667"
+     inkscape:cx="5.2645161"
+     inkscape:cy="12.154839"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Page-1" />
+  <title
+     id="title2">monument-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#717065;fill-opacity:1">
+    <g
+       id="monument-m"
+       fill-rule="nonzero"
+       style="fill:#7f5933;fill-opacity:1">
+      <path
+         d="M 18.18753,18.74999 H 5.8124698 c -0.3107829,0 -0.5625028,0.251719 -0.5625028,0.562502 v 1.125006 C 5.249967,20.74828 5.5016869,21 5.8124698,21 H 18.18753 c 0.310784,0 0.562503,-0.25172 0.562503,-0.562502 v -1.125006 c 0,-0.310783 -0.251719,-0.562502 -0.562503,-0.562502 z M 15.415096,6.5415701 C 15.38935,6.2831945 15.274939,6.0417026 15.091305,5.8581292 L 12.397619,3.1647957 c -0.219727,-0.2197276 -0.575862,-0.2197276 -0.79559,0 L 8.909047,5.8581292 C 8.725413,6.0417026 8.611003,6.2831945 8.585257,6.5415701 L 7.4999781,17.624983 h 9.0000439 z m -1.727588,7.2583949 c 0,0.225002 -0.225001,0.450002 -0.450001,0.450002 h -2.475013 c -0.225001,0 -0.450002,-0.225 -0.450002,-0.450002 v -1.350007 c 0,-0.225001 0.225001,-0.450002 0.450002,-0.450002 h 2.475013 c 0.225,0 0.450001,0.225001 0.450001,0.450002 z"
+         id="Shape"
+         fill="#7f5933" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg
index 8b17bd8f6d..68fa756d63 100644
--- a/data/styles/clear/style-clear/symbols/monument-s.svg
+++ b/data/styles/clear/style-clear/symbols/monument-s.svg
@@ -1,11 +1,42 @@
-<?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>monument-s</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="monument-s" 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="M11.0555556,11.1110677 L4.94444444,11.1110677 C4.79097222,11.1110677 4.66666667,11.2353733 4.66666667,11.3888455 L4.66666667,11.944401 C4.66666667,12.0978733 4.79097222,12.2221788 4.94444444,12.2221788 L11.0555556,12.2221788 C11.2090278,12.2221788 11.3333333,12.0978733 11.3333333,11.944401 L11.3333333,11.3888455 C11.3333333,11.2353733 11.2090278,11.1110677 11.0555556,11.1110677 Z M9.68645833,5.08224826 C9.67374441,4.95465603 9.61724567,4.83540136 9.5265625,4.74474826 L8.19635417,3.41471354 C8.08784722,3.3062066 7.91197917,3.3062066 7.80347222,3.41471354 L6.47361111,4.74474826 C6.38292794,4.83540136 6.3264292,4.95465603 6.31371528,5.08224826 L5.77777778,10.5555122 L10.2222222,10.5555122 L9.68645833,5.08224826 Z M8.83333333,8.66662326 C8.83333333,8.77773437 8.72222222,8.88884549 8.61111111,8.88884549 L7.38888889,8.88884549 C7.27777778,8.88884549 7.16666667,8.77773437 7.16666667,8.66662326 L7.16666667,7.9999566 C7.16666667,7.88884549 7.27777778,7.77773437 7.38888889,7.77773437 L8.61111111,7.77773437 C8.72222222,7.77773437 8.83333333,7.88884549 8.83333333,7.9999566 L8.83333333,8.66662326 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="monument-s.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <title
+     id="title2">monument-s</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="monument-s"
+       fill-rule="nonzero">
+      <path
+         d="M 12.125021,12.499993 H 3.8749795 c -0.2071883,0 -0.3750017,0.167814 -0.3750017,0.375002 v 0.750004 C 3.4999779,13.832187 3.6677912,14 3.8749795,14 h 8.2500415 c 0.207188,0 0.375001,-0.167813 0.375001,-0.375001 v -0.750004 c 0,-0.207188 -0.167813,-0.375002 -0.375001,-0.375002 z M 10.27673,4.3610468 C 10.259566,4.1887964 10.183292,4.0278018 10.060869,3.9054195 L 8.2650795,2.1098638 c -0.1464852,-0.146485 -0.3839082,-0.146485 -0.5303934,0 L 5.9393649,3.9054195 C 5.8169421,4.0278017 5.7406682,4.1887964 5.7235044,4.3610468 L 4.9999852,11.74999 H 11.000014 Z M 9.1250052,9.1999769 c 0,0.1500008 -0.15,0.3000016 -0.3000011,0.3000016 H 7.1749959 c -0.1500007,0 -0.3000014,-0.1500008 -0.3000014,-0.3000016 V 8.2999726 c 0,-0.1500008 0.1500007,-0.3000016 0.3000014,-0.3000016 h 1.6500082 c 0.1500011,0 0.3000011,0.1500008 0.3000011,0.3000016 z"
+         id="Shape"
+         fill="#7f5933" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/plaque.svg b/data/styles/clear/style-clear/symbols/plaque.svg
index ac73ada13c..d1a76bfb55 100644
--- a/data/styles/clear/style-clear/symbols/plaque.svg
+++ b/data/styles/clear/style-clear/symbols/plaque.svg
@@ -48,4 +48,4 @@
        inkscape:label="plaque"><path
          d="m 7.5000003,7.0000004 a 1.5,1.5 0 0 0 -1.5000001,1.5 V 15.5 A 1.5,1.5 0 0 0 7.5000003,17 H 16.5 A 1.5,1.5 0 0 0 18,15.5 V 8.5000004 a 1.5,1.5 0 0 0 -1.5,-1.5 z m 0,1 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z M 16.5,15 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,-6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m -6.5,1 h 1 V 10 h -1 z m 2,0 h 2 V 10 H 12 Z M 8.0000003,11 H 16 v 1 H 8.0000003 Z M 10,13 h 4 v 1 h -4 z"
          id="path37004"
-         style="fill:#717065;fill-opacity:1" /></g></g></svg>
+         style="fill:#7f5933" /></g></g></svg>
diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg
index 9aa7e41bf3..9c0184100f 100644
--- a/data/styles/clear/style-clear/symbols/remains-m.svg
+++ b/data/styles/clear/style-clear/symbols/remains-m.svg
@@ -1,11 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>remains-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="remains-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#717065" cx="12" cy="12" r="11"></circle>
-            <path d="M15.2307692,9.69230769 L8.76923077,9.69230769 C8.25941538,9.69230769 7.84615385,9.27904615 7.84615385,8.76923077 L7.84615385,6.46153846 C7.84615385,6.20667692 8.05283077,6 8.30769231,6 C8.56255385,6 8.76923077,6.20667692 8.76923077,6.46153846 L8.76923077,7.84615385 L9.69230769,7.84615385 L9.69230769,6.92307692 C9.69230769,6.41326154 10.1055692,6 10.6153846,6 C11.1252,6 11.5384615,6.41326154 11.5384615,6.92307692 L11.5384615,7.84615385 L12.4615385,7.84615385 L12.4615385,6.92307692 C12.4615385,6.41326154 12.8748,6 13.3846154,6 C13.8944308,6 14.3076923,6.41326154 14.3076923,6.92307692 L14.3076923,7.84615385 L15.2307692,7.84615385 L15.2307692,6.46153846 C15.2307692,6.20667692 15.4374462,6 15.6923077,6 C15.9471692,6 16.1538462,6.20667692 16.1538462,6.46153846 L16.1538462,8.76923077 C16.1538462,9.27904615 15.7405846,9.69230769 15.2307692,9.69230769 L15.2307692,9.69230769 Z M17.5384615,18 L6.46153846,18 C6.20667692,18 6,17.7933231 6,17.5384615 C6,17.2836 6.20667692,17.0769231 6.46153846,17.0769231 L6.92307692,17.0769231 C7.43289231,17.0769231 7.84615385,16.6636615 7.84615385,16.1538462 C7.84615385,16.1538462 8.76923077,12.4615385 8.76923077,11.5384615 C8.76923077,11.0286462 9.18249231,10.6153846 9.69230769,10.6153846 L14.3076923,10.6153846 C14.8175077,10.6153846 15.2307692,11.0286462 15.2307692,11.5384615 C15.2307692,12.4615385 16.1538462,16.1538462 16.1538462,16.1538462 C16.1538462,16.6636615 16.5671077,17.0769231 17.0769231,17.0769231 L17.5384615,17.0769231 C17.7898154,17.0768308 17.9950154,17.2779692 18,17.5292308 C18,17.7933231 17.7933231,18 17.5384615,18 Z M13.3846154,14.7692308 C13.3846154,14.0045538 12.7646769,13.3846154 12,13.3846154 C11.2353231,13.3846154 10.6153846,14.0045538 10.6153846,14.7692308 L10.6153846,17.0769231 L13.3846154,17.0769231 L13.3846154,13.8461538 L13.3846154,14.7692308 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="remains-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.291667"
+     inkscape:cx="11.705806"
+     inkscape:cy="12.092903"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">remains-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="remains-m"
+       fill-rule="nonzero">
+      <path
+         d="M 16.846153,8.538462 H 7.1538462 c -0.7647231,0 -1.3846154,-0.619893 -1.3846154,-1.384616 V 3.6923077 C 5.7692308,3.3100154 6.0792462,3 6.4615385,3 6.8438308,3 7.1538462,3.3100154 7.1538462,3.6923077 V 5.7692309 H 8.5384615 V 4.3846154 C 8.5384615,3.6198922 9.1583538,3 9.9230769,3 10.6878,3 11.307692,3.6198922 11.307692,4.3846154 v 1.3846155 h 1.384616 V 4.3846154 C 12.692308,3.6198922 13.3122,3 14.076923,3 c 0.764724,0 1.384615,0.6198922 1.384615,1.3846154 v 1.3846155 h 1.384615 V 3.6923077 C 16.846153,3.3100154 17.156169,3 17.538462,3 c 0.382291,0 0.692307,0.3100154 0.692307,0.6923077 V 7.153846 c 0,0.764723 -0.619892,1.384616 -1.384616,1.384616 z M 20.307693,21 H 3.6923078 C 3.3100154,21 3,20.689985 3,20.307692 3,19.9254 3.3100154,19.615384 3.6923078,19.615384 h 0.6923075 c 0.7647231,0 1.3846155,-0.619893 1.3846155,-1.384615 0,0 1.3846154,-5.53846 1.3846154,-6.923076 0,-0.764724 0.6198922,-1.384615 1.3846153,-1.384615 h 6.9230765 c 0.764724,0 1.384615,0.619891 1.384615,1.384615 0,1.384616 1.384616,6.923076 1.384616,6.923076 0,0.764722 0.619893,1.384615 1.384615,1.384615 h 0.692309 C 20.684722,19.615246 20.992522,19.916953 21,20.293846 21,20.689985 20.689984,21 20.307693,21 Z m -6.23077,-4.846154 c 0,-1.147015 -0.929908,-2.076923 -2.076923,-2.076923 -1.147015,0 -2.0769231,0.929908 -2.0769231,2.076923 v 3.461538 h 4.1538461 v -4.846153 z"
+         id="Shape"
+         fill="#7f5933" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg
index 07693ce9d0..a87d577076 100644
--- a/data/styles/clear/style-clear/symbols/remains-s.svg
+++ b/data/styles/clear/style-clear/symbols/remains-s.svg
@@ -1,11 +1,52 @@
-<?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>remains-s</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="remains-s" 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"></circle>
-            <path d="M10.7725998,3.3745165 L10.7725998,4.76663379 C10.7824897,5.12491587 10.5178481,5.4239389 10.1815051,5.43447384 L10.1809753,5.43447384 L5.84533878,5.43447384 C5.50890752,5.43974131 5.23216852,5.15341665 5.22722359,4.79494645 C5.22715737,4.78864429 5.22715737,4.78234214 5.22722359,4.77603999 L5.22722359,3.3745165 C5.22722359,3.19532843 5.36365045,3.05000267 5.53186608,3.05000267 C5.70008171,3.05000267 5.83650856,3.19532843 5.83650856,3.3745165 L5.83650856,4.02354415 L6.64888852,4.02354415 L6.64888852,3.55323426 L6.64888852,3.55323426 C6.64888852,3.29352913 6.84659708,3.08292436 7.09039937,3.08292436 C7.33420166,3.08292436 7.53191022,3.29352913 7.53191022,3.55323426 L7.53191022,3.55323426 L7.53191022,4.02354415 L8.41493192,4.02354415 L8.41493192,3.55323426 L8.41493192,3.55323426 C8.41493192,3.29352913 8.61264047,3.08292436 8.85644276,3.08292436 C9.10024505,3.08292436 9.29795361,3.29352913 9.29795361,3.55323426 L9.29795361,3.55323426 L9.29795361,4.02354415 L10.1809753,4.02354415 L10.1809753,3.3745165 C10.1526303,3.20050183 10.262125,3.03495275 10.425484,3.00475886 C10.588843,2.97456496 10.7442548,3.09120181 10.7725998,3.26521648 C10.7785161,3.30143034 10.7785161,3.3383967 10.7725998,3.3745165 L10.7725998,3.3745165 Z M12,11.6707831 C12,11.8526049 11.8616305,12 11.6909424,12 L11.6909424,12 L4.30888103,12 C4.13819294,11.9999059 3.99991174,11.8524168 4,11.6705949 C4.00017665,11.4888672 4.13836954,11.3416602 4.30888103,11.3415661 L4.61793862,11.3415661 C4.94942497,11.3521011 5.22616397,11.0744301 5.23605381,10.7213215 C5.23640702,10.7086231 5.23640702,10.6958307 5.23605381,10.6831323 C5.23605381,10.6831323 5.854169,7.67314895 5.854169,7.02412129 C5.84922408,6.67091856 6.11404228,6.38036111 6.44570523,6.37509364 C6.45162148,6.37499957 6.45753772,6.37499957 6.46345397,6.37509364 L9.53636947,6.37509364 C9.86785581,6.36455869 10.1445948,6.64222966 10.1544847,6.99533833 C10.1548379,7.0080367 10.1548379,7.02082912 10.1544847,7.03352749 C10.1544847,7.69196135 10.7725998,10.6925385 10.7725998,10.6925385 C10.76271,11.0456472 11.023378,11.3404374 11.3548643,11.3509723 C11.3667851,11.3513486 11.3787942,11.3513486 11.390715,11.3509723 L11.6909424,11.3509723 C11.8616305,11.3509723 12,11.4983675 12,11.6801893 L12,11.6801893 L12,11.6707831 L12,11.6707831 Z M8.85644276,9.66726291 C8.85644276,9.1477586 8.46111395,8.72664312 7.97342107,8.72664312 C7.48572819,8.72664312 7.09039937,9.1477586 7.09039937,9.66726291 L7.09039937,11.5485025 L8.85644276,11.5485025 L8.85644276,9.66726291 L8.85644276,9.66726291 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="remains-s.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="48.4375"
+     inkscape:cx="2.6012903"
+     inkscape:cy="8.1032258"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">remains-s</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="remains-s"
+       fill-rule="nonzero">
+      <path
+         d="m 12.1589,2.4993406 v 1.8561589 c 0.01486,0.4777087 -0.382131,0.8764092 -0.886641,0.8904492 H 11.271436 4.7679801 C 4.2633614,5.2529641 3.8482498,4.8712002 3.840825,4.3932395 c -9.87e-5,-0.0084 -9.87e-5,-0.0168 0,-0.0252 V 2.4993406 c 0,-0.2389204 0.2046465,-0.4326845 0.4569612,-0.4326845 0.2523286,0 0.4569617,0.1937641 0.4569617,0.4326845 v 0.8653692 h 1.2185639 v -0.6270849 0 c 0,-0.3462724 0.2965681,-0.6270849 0.6622697,-0.6270849 0.365701,0 0.6622686,0.2808125 0.6622686,0.6270849 v 0 0.6270849 h 1.3245391 v -0.6270849 0 c 0,-0.3462724 0.2965691,-0.6270849 0.66227,-0.6270849 0.3657017,0 0.6622688,0.2808125 0.6622688,0.6270849 v 0 0.6270849 H 11.27146 V 2.4993406 c -0.04252,-0.2320203 0.12177,-0.4527487 0.366767,-0.4930088 0.245038,-0.0402 0.478156,0.1152002 0.520669,0.3472806 0.0088,0.04824 0.0088,0.09756 10e-7,0.1457282 z M 14,13.561045 C 14,13.803474 13.792445,14 13.536412,14 v 0 H 2.4633214 C 2.2072886,13.999876 1.9998677,13.803223 2.0000001,13.560794 2.0002647,13.318489 2.207549,13.122218 2.46332,13.122085 h 0.4635899 c 0.4972322,0.01404 0.9123436,-0.356184 0.92718,-0.826992 5.292e-4,-0.01692 5.292e-4,-0.03396 0,-0.05088 0,0 0.9271666,-4.0133174 0.9271666,-4.8786888 -0.00741,-0.4709411 0.3898123,-0.8583496 0.8873009,-0.8653695 0.00888,-1.251e-4 0.017685,-1.251e-4 0.026595,0 h 4.6093726 c 0.497232,-0.014039 0.912345,0.3561844 0.927167,0.8269931 5.32e-4,0.01692 5.32e-4,0.03396 0,0.05088 0,0.8779093 0.927181,4.8786892 0.927181,4.8786892 -0.01486,0.470809 0.376164,0.863869 0.873396,0.877908 0.01782,5.05e-4 0.03592,5.05e-4 0.05374,0 h 0.450346 c 0.25604,0 0.463591,0.196526 0.463591,0.438962 v 0 -0.01248 z M 9.2846626,10.88968 c 0,-0.692677 -0.5929863,-1.2541613 -1.3245252,-1.2541613 -0.7315377,0 -1.3245386,0.5614933 -1.3245386,1.2541613 v 2.508323 h 2.6490638 z"
+         id="Shape"
+         fill="#7f5933" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/tomb-m.svg b/data/styles/clear/style-clear/symbols/tomb-m.svg
index cc25ea3cf2..c6d9cfbaa6 100644
--- a/data/styles/clear/style-clear/symbols/tomb-m.svg
+++ b/data/styles/clear/style-clear/symbols/tomb-m.svg
@@ -1,15 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>tomb-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="tomb-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <g id="tomb" transform="translate(6.000000, 6.000000)" fill="#FFFFFF">
-                <path d="M6.22928906,0.0015 L5.7684375,0.0015 C3.70844531,0.0015 2.03847656,1.67146875 2.03847656,3.73146094 L2.03847656,7.85219531 L9.95925,7.85219531 L9.95925,3.73146094 C9.95925,1.67144531 8.28930469,0.0015 6.22928906,0.0015 Z M7.43974219,6.71917969 L4.55798438,6.71917969 C4.36382813,6.71917969 4.20642188,6.56177344 4.20642188,6.36761719 C4.20642188,6.17346094 4.36382813,6.01605469 4.55798438,6.01605469 L7.43974219,6.01605469 C7.63389844,6.01605469 7.79130469,6.17346094 7.79130469,6.36761719 C7.79130469,6.56177344 7.63392188,6.71917969 7.43974219,6.71917969 Z M7.43974219,5.31292969 L4.55798438,5.31292969 C4.36382813,5.31292969 4.20642188,5.15552344 4.20642188,4.96136719 C4.20642188,4.76721094 4.36382813,4.60980469 4.55798438,4.60980469 L7.43974219,4.60980469 C7.63389844,4.60980469 7.79130469,4.76721094 7.79130469,4.96136719 C7.79130469,5.15552344 7.63392188,5.31292969 7.43974219,5.31292969 Z M7.43974219,3.90667969 L4.55798438,3.90667969 C4.36382813,3.90667969 4.20642188,3.74927344 4.20642188,3.55511719 C4.20642188,3.36096094 4.36382813,3.20355469 4.55798438,3.20355469 L7.43974219,3.20355469 C7.63389844,3.20355469 7.79130469,3.36096094 7.79130469,3.55511719 C7.79130469,3.74927344 7.63392188,3.90667969 7.43974219,3.90667969 Z" id="Shape"></path>
-                <path d="M11.2543125,9.80988281 L11.2543125,8.90685937 C11.2543125,8.71270313 11.0969063,8.55529687 10.90275,8.55529687 L1.095,8.55529687 C0.90084375,8.55529687 0.7434375,8.71270313 0.7434375,8.90685937 L0.7434375,9.80988281 L11.2543125,9.80988281 Z" id="Path"></path>
-                <path d="M11.99775,11.99625 L0,11.99625 L0,10.8645703 C0,10.6704141 0.15740625,10.5130078 0.3515625,10.5130078 L11.6461875,10.5130078 C11.8403438,10.5130078 11.99775,10.6704141 11.99775,10.8645703 L11.99775,11.99625 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="tomb-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="42.791667"
+     inkscape:cx="12.070107"
+     inkscape:cy="12.035053"
+     inkscape:window-width="1920"
+     inkscape:window-height="2072"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg14" />
+  <title
+     id="title2">tomb-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     transform="matrix(0.9375,0,0,0.9375,1.25,1.25)">
+    <g
+       id="tomb-m"
+       fill-rule="nonzero">
+      <g
+         id="tomb"
+         transform="translate(6,6)"
+         fill="#ffffff">
+        <path
+           id="Shape"
+           d="M 5.691356,-2 C 2.9442553,-2 0.71919254,0.22766735 0.71919254,2.974768 V 8.4678495 H 11.280808 V 2.974768 C 11.280808,0.22763615 9.0531716,-2 6.3060392,-2 Z M 4.0791144,2.268924 h 3.8417711 c 0.2589169,0 0.4688262,0.2099093 0.4688262,0.4688262 0,0.258917 -0.2098781,0.4688264 -0.4688262,0.4688264 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688264 0,-0.2589169 0.2099096,-0.4688262 0.4688264,-0.4688262 z m 0,1.8753052 h 3.8417711 c 0.2589169,0 0.4688262,0.2099093 0.4688262,0.4688262 0,0.258917 -0.2098781,0.4688264 -0.4688262,0.4688264 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688264 0,-0.2589169 0.2099096,-0.4688262 0.4688264,-0.4688262 z m 0,1.8753052 h 3.8417711 c 0.2589169,0 0.4688262,0.2099094 0.4688262,0.4688264 0,0.2589168 -0.2098781,0.4688262 -0.4688262,0.4688262 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688262 0,-0.258917 0.2099096,-0.4688264 0.4688264,-0.4688264 z m -4.61793912,3.3859677 c -0.2589168,0 -0.46882628,0.2099097 -0.46882628,0.4688264 V 11.080254 H 13.007651 V 9.8743285 c 0,-0.2589167 -0.20991,-0.4688264 -0.468827,-0.4688264 z M -1.5311736,12.017907 C -1.7900906,12.017907 -2,12.227816 -2,12.486732 v 1.50806 h 16 v -1.50806 c 0,-0.258916 -0.209911,-0.468825 -0.468826,-0.468825 z"
+           style="fill:#7f5933;stroke-width:0.888888" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
index bb4bc61e12..82e717b3f1 100644
--- a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
+++ b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
@@ -1,11 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>wayside_shrine-m</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="wayside_shrine-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" opacity="0.6" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <path d="M11.9995431,4 L6,10.1273333 L7.03434097,11.1829333 L12.0004569,6.1112 L16.965659,11.1829333 L18,10.1273333 L11.9995431,4 Z M16.0702048,12.1526667 L16.0702048,18 L14.2427473,18 L14.2427473,14.7333333 C14.2427473,13.4444 13.2202848,12.4 11.9584253,12.4 C10.6965659,12.4 9.6741034,13.4444 9.6741034,14.7333333 L9.6741034,18 L7.84664585,18 L7.84664585,12.2198667 L11.9922333,8.0796 L16.0702048,12.1526667 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="wayside_shrine-m.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <title
+     id="title2">wayside_shrine-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="wayside_shrine-m"
+       fill-rule="nonzero">
+      <path
+         d="m 11.999413,3 -7.7136985,7.878 1.329867,1.3572 6.3850065,-6.5208 6.383831,6.5208 1.329867,-1.3572 z M 17.23312,13.482 V 21 h -2.349588 v -4.2 c 0,-1.6572 -1.314593,-3 -2.936986,-3 -1.62239,0 -2.9369845,1.3428 -2.9369845,3 V 21 H 6.6599734 V 13.5684 L 11.990014,8.2452 Z"
+         id="Shape"
+         fill="#7f5933" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg
index e391f2545e..fc887bf27a 100644
--- a/data/styles/clear/style-night/symbols/cemetery-m.svg
+++ b/data/styles/clear/style-night/symbols/cemetery-m.svg
@@ -1,15 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>cemetery-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="cemetery-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#717065" cx="12" cy="12" r="11"></circle>
-            <g id="tomb" transform="translate(6.000000, 6.000000)" fill="#FFFFFF">
-                <path d="M6.22928906,0.0015 L5.7684375,0.0015 C3.70844531,0.0015 2.03847656,1.67146875 2.03847656,3.73146094 L2.03847656,7.85219531 L9.95925,7.85219531 L9.95925,3.73146094 C9.95925,1.67144531 8.28930469,0.0015 6.22928906,0.0015 Z M7.43974219,6.71917969 L4.55798438,6.71917969 C4.36382813,6.71917969 4.20642188,6.56177344 4.20642188,6.36761719 C4.20642188,6.17346094 4.36382813,6.01605469 4.55798438,6.01605469 L7.43974219,6.01605469 C7.63389844,6.01605469 7.79130469,6.17346094 7.79130469,6.36761719 C7.79130469,6.56177344 7.63392188,6.71917969 7.43974219,6.71917969 Z M7.43974219,5.31292969 L4.55798438,5.31292969 C4.36382813,5.31292969 4.20642188,5.15552344 4.20642188,4.96136719 C4.20642188,4.76721094 4.36382813,4.60980469 4.55798438,4.60980469 L7.43974219,4.60980469 C7.63389844,4.60980469 7.79130469,4.76721094 7.79130469,4.96136719 C7.79130469,5.15552344 7.63392188,5.31292969 7.43974219,5.31292969 Z M7.43974219,3.90667969 L4.55798438,3.90667969 C4.36382813,3.90667969 4.20642188,3.74927344 4.20642188,3.55511719 C4.20642188,3.36096094 4.36382813,3.20355469 4.55798438,3.20355469 L7.43974219,3.20355469 C7.63389844,3.20355469 7.79130469,3.36096094 7.79130469,3.55511719 C7.79130469,3.74927344 7.63392188,3.90667969 7.43974219,3.90667969 Z" id="Shape"></path>
-                <path d="M11.2543125,9.80988281 L11.2543125,8.90685937 C11.2543125,8.71270313 11.0969063,8.55529687 10.90275,8.55529687 L1.095,8.55529687 C0.90084375,8.55529687 0.7434375,8.71270313 0.7434375,8.90685937 L0.7434375,9.80988281 L11.2543125,9.80988281 Z" id="Path"></path>
-                <path d="M11.99775,11.99625 L0,11.99625 L0,10.8645703 C0,10.6704141 0.15740625,10.5130078 0.3515625,10.5130078 L11.6461875,10.5130078 C11.8403438,10.5130078 11.99775,10.6704141 11.99775,10.8645703 L11.99775,11.99625 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="tomb-m.svg"
+   inkscape:export-filename="cemetery-m.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" />
+  <title
+     id="title2">tomb-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="tomb-m"
+       fill-rule="nonzero">
+      <g
+         id="tomb"
+         transform="translate(6,6)"
+         fill="#ffffff">
+        <path
+           id="Shape"
+           d="m 5.6527754,-2.99707 c -3.0904881,0 -5.59368378,2.50612577 -5.59368378,5.596614 V 8.7792607 H 11.940908 V 2.599544 c 0,-3.09052333 -2.5060904,-5.596614 -5.5966138,-5.596614 z M 3.8390037,1.8054694 h 4.3219924 c 0.2912816,0 0.5274296,0.2361481 0.5274296,0.5274296 0,0.2912816 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.236148 -0.5274297,-0.5274296 0,-0.2912815 0.2361482,-0.5274296 0.5274297,-0.5274296 z m 0,2.1097184 h 4.3219924 c 0.2912816,0 0.5274296,0.2361481 0.5274296,0.5274296 0,0.2912816 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.236148 -0.5274297,-0.5274296 0,-0.2912815 0.2361482,-0.5274296 0.5274297,-0.5274296 z m 0,2.1097184 h 4.3219924 c 0.2912816,0 0.5274296,0.236148 0.5274296,0.5274296 0,0.2912815 -0.2361129,0.5274296 -0.5274296,0.5274296 H 3.8390037 c -0.2912815,0 -0.5274297,-0.2361481 -0.5274297,-0.5274296 0,-0.2912816 0.2361482,-0.5274296 0.5274297,-0.5274296 z m -5.1951815,3.8092137 c -0.2912814,0 -0.5274296,0.2361481 -0.5274296,0.5274291 v 1.356667 H 13.883607 v -1.356667 c 0,-0.291281 -0.236148,-0.5274291 -0.527429,-0.5274291 z M -2.4725704,12.773075 C -2.763852,12.773075 -3,13.009222 -3,13.300504 v 1.696566 h 18 v -1.696566 c 0,-0.291282 -0.236149,-0.527429 -0.52743,-0.527429 z"
+           style="opacity:0.6;fill:#ffffff;fill-opacity:1" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/monument-m.svg b/data/styles/clear/style-night/symbols/monument-m.svg
index 306ffb630c..5b5101d082 100644
--- a/data/styles/clear/style-night/symbols/monument-m.svg
+++ b/data/styles/clear/style-night/symbols/monument-m.svg
@@ -1,11 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>monument-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="monument-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <path d="M16.5833333,16.6666016 L7.41666667,16.6666016 C7.18645833,16.6666016 7,16.8530599 7,17.0832682 L7,17.9166016 C7,18.1468099 7.18645833,18.3332682 7.41666667,18.3332682 L16.5833333,18.3332682 C16.8135417,18.3332682 17,18.1468099 17,17.9166016 L17,17.0832682 C17,16.8530599 16.8135417,16.6666016 16.5833333,16.6666016 Z M14.5296875,7.6233724 C14.5106166,7.43198405 14.4258685,7.25310205 14.2898437,7.1171224 L12.2945312,5.12207031 C12.1317708,4.9593099 11.8679687,4.9593099 11.7052083,5.12207031 L9.71041667,7.1171224 C9.57439192,7.25310205 9.48964381,7.43198405 9.47057292,7.6233724 L8.66666667,15.8332682 L15.3333333,15.8332682 L14.5296875,7.6233724 Z M13.25,12.9999349 C13.25,13.1666016 13.0833333,13.3332682 12.9166667,13.3332682 L11.0833333,13.3332682 C10.9166667,13.3332682 10.75,13.1666016 10.75,12.9999349 L10.75,11.9999349 C10.75,11.8332682 10.9166667,11.6666016 11.0833333,11.6666016 L12.9166667,11.6666016 C13.0833333,11.6666016 13.25,11.8332682 13.25,11.9999349 L13.25,12.9999349 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="monument-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.291667"
+     inkscape:cx="5.3109677"
+     inkscape:cy="12.170322"
+     inkscape:window-width="3840"
+     inkscape:window-height="2072"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Page-1" />
+  <title
+     id="title2">monument-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#717065;fill-opacity:1">
+    <g
+       id="monument-m"
+       fill-rule="nonzero"
+       style="fill:#7f5933;fill-opacity:1">
+      <path
+         d="M 18.18753,18.74999 H 5.8124698 c -0.3107829,0 -0.5625028,0.251719 -0.5625028,0.562502 v 1.125006 C 5.249967,20.74828 5.5016869,21 5.8124698,21 H 18.18753 c 0.310784,0 0.562503,-0.25172 0.562503,-0.562502 v -1.125006 c 0,-0.310783 -0.251719,-0.562502 -0.562503,-0.562502 z M 15.415096,6.5415701 C 15.38935,6.2831945 15.274939,6.0417026 15.091305,5.8581292 L 12.397619,3.1647957 c -0.219727,-0.2197276 -0.575862,-0.2197276 -0.79559,0 L 8.909047,5.8581292 C 8.725413,6.0417026 8.611003,6.2831945 8.585257,6.5415701 L 7.4999781,17.624983 h 9.0000439 z m -1.727588,7.2583949 c 0,0.225002 -0.225001,0.450002 -0.450001,0.450002 h -2.475013 c -0.225001,0 -0.450002,-0.225 -0.450002,-0.450002 v -1.350007 c 0,-0.225001 0.225001,-0.450002 0.450002,-0.450002 h 2.475013 c 0.225,0 0.450001,0.225001 0.450001,0.450002 z"
+         id="Shape"
+         style="fill:#717065;fill-opacity:1;opacity:0.6" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/monument-s.svg b/data/styles/clear/style-night/symbols/monument-s.svg
index a7c7bb00ea..ce04761c17 100644
--- a/data/styles/clear/style-night/symbols/monument-s.svg
+++ b/data/styles/clear/style-night/symbols/monument-s.svg
@@ -1,11 +1,52 @@
-<?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>monument-s</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="monument-s" 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="M11.0555556,11.1110677 L4.94444444,11.1110677 C4.79097222,11.1110677 4.66666667,11.2353733 4.66666667,11.3888455 L4.66666667,11.944401 C4.66666667,12.0978733 4.79097222,12.2221788 4.94444444,12.2221788 L11.0555556,12.2221788 C11.2090278,12.2221788 11.3333333,12.0978733 11.3333333,11.944401 L11.3333333,11.3888455 C11.3333333,11.2353733 11.2090278,11.1110677 11.0555556,11.1110677 Z M9.68645833,5.08224826 C9.67374441,4.95465603 9.61724567,4.83540136 9.5265625,4.74474826 L8.19635417,3.41471354 C8.08784722,3.3062066 7.91197917,3.3062066 7.80347222,3.41471354 L6.47361111,4.74474826 C6.38292794,4.83540136 6.3264292,4.95465603 6.31371528,5.08224826 L5.77777778,10.5555122 L10.2222222,10.5555122 L9.68645833,5.08224826 Z M8.83333333,8.66662326 C8.83333333,8.77773437 8.72222222,8.88884549 8.61111111,8.88884549 L7.38888889,8.88884549 C7.27777778,8.88884549 7.16666667,8.77773437 7.16666667,8.66662326 L7.16666667,7.9999566 C7.16666667,7.88884549 7.27777778,7.77773437 7.38888889,7.77773437 L8.61111111,7.77773437 C8.72222222,7.77773437 8.83333333,7.88884549 8.83333333,7.9999566 L8.83333333,8.66662326 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="monument-s.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="64.1875"
+     inkscape:cx="8.0077897"
+     inkscape:cy="8.0077897"
+     inkscape:window-width="1920"
+     inkscape:window-height="2072"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">monument-s</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="monument-s"
+       fill-rule="nonzero">
+      <path
+         d="M 12.125021,12.499993 H 3.8749795 c -0.2071883,0 -0.3750017,0.167814 -0.3750017,0.375002 v 0.750004 C 3.4999779,13.832187 3.6677912,14 3.8749795,14 h 8.2500415 c 0.207188,0 0.375001,-0.167813 0.375001,-0.375001 v -0.750004 c 0,-0.207188 -0.167813,-0.375002 -0.375001,-0.375002 z M 10.27673,4.3610468 C 10.259566,4.1887964 10.183292,4.0278018 10.060869,3.9054195 L 8.2650795,2.1098638 c -0.1464852,-0.146485 -0.3839082,-0.146485 -0.5303934,0 L 5.9393649,3.9054195 C 5.8169421,4.0278017 5.7406682,4.1887964 5.7235044,4.3610468 L 4.9999852,11.74999 H 11.000014 Z M 9.1250052,9.1999769 c 0,0.1500008 -0.15,0.3000016 -0.3000011,0.3000016 H 7.1749959 c -0.1500007,0 -0.3000014,-0.1500008 -0.3000014,-0.3000016 V 8.2999726 c 0,-0.1500008 0.1500007,-0.3000016 0.3000014,-0.3000016 h 1.6500082 c 0.1500011,0 0.3000011,0.1500008 0.3000011,0.3000016 z"
+         id="Shape"
+         style="opacity:0.6;fill:#717065;fill-opacity:1" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/plaque.svg b/data/styles/clear/style-night/symbols/plaque.svg
index 41bd0c9bf0..f0b518242d 100644
--- a/data/styles/clear/style-night/symbols/plaque.svg
+++ b/data/styles/clear/style-night/symbols/plaque.svg
@@ -7,9 +7,10 @@
    id="svg34808"
    sodipodi:docname="plaque.svg"
    xml:space="preserve"
-   inkscape:export-filename="plaque.svg"
+   inkscape:export-filename="../plaque.svg"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -23,19 +24,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     showgrid="false" /><title
+     showgrid="false"
+     inkscape:zoom="102.7"
+     inkscape:cx="5.7302824"
+     inkscape:cy="5.0243427"
+     inkscape:window-width="1920"
+     inkscape:window-height="2072"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg34808" /><title
      id="title34800">cinema-m</title><g
      id="Page-1"
      stroke="none"
      stroke-width="1"
      fill="none"
      fill-rule="evenodd"
-     inkscape:label="Page-2:-Night"
-     style="opacity:0.6"
+     inkscape:label="Page-1"
+     style="opacity:1"
      transform="translate(-6,-7.0000005)"><g
        id="cinema-m"
        fill-rule="nonzero"
        inkscape:label="plaque"><path
          d="m 7.5000003,7.0000004 a 1.5,1.5 0 0 0 -1.5000001,1.5 V 15.5 A 1.5,1.5 0 0 0 7.5000003,17 H 16.5 A 1.5,1.5 0 0 0 18,15.5 V 8.5000004 a 1.5,1.5 0 0 0 -1.5,-1.5 z m 0,1 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z M 16.5,15 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m 0,-6.9999996 a 0.5,0.5 0 0 1 0,1 0.5,0.5 0 0 1 0,-1 z m -6.5,1 h 1 V 10 h -1 z m 2,0 h 2 V 10 H 12 Z M 8.0000003,11 H 16 v 1 H 8.0000003 Z M 10,13 h 4 v 1 h -4 z"
          id="path37004"
-         style="fill:#ffffff;fill-opacity:1" /></g></g></svg>
+         style="opacity:0.6;fill:#717065;fill-opacity:1" /></g></g></svg>
diff --git a/data/styles/clear/style-night/symbols/remains-m.svg b/data/styles/clear/style-night/symbols/remains-m.svg
index a325988b18..df6105c65d 100644
--- a/data/styles/clear/style-night/symbols/remains-m.svg
+++ b/data/styles/clear/style-night/symbols/remains-m.svg
@@ -1,11 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>remains-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="remains-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#717065" cx="12" cy="12" r="11"></circle>
-            <path d="M15.2307692,9.69230769 L8.76923077,9.69230769 C8.25941538,9.69230769 7.84615385,9.27904615 7.84615385,8.76923077 L7.84615385,6.46153846 C7.84615385,6.20667692 8.05283077,6 8.30769231,6 C8.56255385,6 8.76923077,6.20667692 8.76923077,6.46153846 L8.76923077,7.84615385 L9.69230769,7.84615385 L9.69230769,6.92307692 C9.69230769,6.41326154 10.1055692,6 10.6153846,6 C11.1252,6 11.5384615,6.41326154 11.5384615,6.92307692 L11.5384615,7.84615385 L12.4615385,7.84615385 L12.4615385,6.92307692 C12.4615385,6.41326154 12.8748,6 13.3846154,6 C13.8944308,6 14.3076923,6.41326154 14.3076923,6.92307692 L14.3076923,7.84615385 L15.2307692,7.84615385 L15.2307692,6.46153846 C15.2307692,6.20667692 15.4374462,6 15.6923077,6 C15.9471692,6 16.1538462,6.20667692 16.1538462,6.46153846 L16.1538462,8.76923077 C16.1538462,9.27904615 15.7405846,9.69230769 15.2307692,9.69230769 L15.2307692,9.69230769 Z M17.5384615,18 L6.46153846,18 C6.20667692,18 6,17.7933231 6,17.5384615 C6,17.2836 6.20667692,17.0769231 6.46153846,17.0769231 L6.92307692,17.0769231 C7.43289231,17.0769231 7.84615385,16.6636615 7.84615385,16.1538462 C7.84615385,16.1538462 8.76923077,12.4615385 8.76923077,11.5384615 C8.76923077,11.0286462 9.18249231,10.6153846 9.69230769,10.6153846 L14.3076923,10.6153846 C14.8175077,10.6153846 15.2307692,11.0286462 15.2307692,11.5384615 C15.2307692,12.4615385 16.1538462,16.1538462 16.1538462,16.1538462 C16.1538462,16.6636615 16.5671077,17.0769231 17.0769231,17.0769231 L17.5384615,17.0769231 C17.7898154,17.0768308 17.9950154,17.2779692 18,17.5292308 C18,17.7933231 17.7933231,18 17.5384615,18 Z M13.3846154,14.7692308 C13.3846154,14.0045538 12.7646769,13.3846154 12,13.3846154 C11.2353231,13.3846154 10.6153846,14.0045538 10.6153846,14.7692308 L10.6153846,17.0769231 L13.3846154,17.0769231 L13.3846154,13.8461538 L13.3846154,14.7692308 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="remains-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32.291667"
+     inkscape:cx="11.752258"
+     inkscape:cy="12.108387"
+     inkscape:window-width="3840"
+     inkscape:window-height="2072"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">remains-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="remains-m"
+       fill-rule="nonzero">
+      <path
+         d="M 16.846153,8.538462 H 7.1538462 c -0.7647231,0 -1.3846154,-0.619893 -1.3846154,-1.384616 V 3.6923077 C 5.7692308,3.3100154 6.0792462,3 6.4615385,3 6.8438308,3 7.1538462,3.3100154 7.1538462,3.6923077 V 5.7692309 H 8.5384615 V 4.3846154 C 8.5384615,3.6198922 9.1583538,3 9.9230769,3 10.6878,3 11.307692,3.6198922 11.307692,4.3846154 v 1.3846155 h 1.384616 V 4.3846154 C 12.692308,3.6198922 13.3122,3 14.076923,3 c 0.764724,0 1.384615,0.6198922 1.384615,1.3846154 v 1.3846155 h 1.384615 V 3.6923077 C 16.846153,3.3100154 17.156169,3 17.538462,3 c 0.382291,0 0.692307,0.3100154 0.692307,0.6923077 V 7.153846 c 0,0.764723 -0.619892,1.384616 -1.384616,1.384616 z M 20.307693,21 H 3.6923078 C 3.3100154,21 3,20.689985 3,20.307692 3,19.9254 3.3100154,19.615384 3.6923078,19.615384 h 0.6923075 c 0.7647231,0 1.3846155,-0.619893 1.3846155,-1.384615 0,0 1.3846154,-5.53846 1.3846154,-6.923076 0,-0.764724 0.6198922,-1.384615 1.3846153,-1.384615 h 6.9230765 c 0.764724,0 1.384615,0.619891 1.384615,1.384615 0,1.384616 1.384616,6.923076 1.384616,6.923076 0,0.764722 0.619893,1.384615 1.384615,1.384615 h 0.692309 C 20.684722,19.615246 20.992522,19.916953 21,20.293846 21,20.689985 20.689984,21 20.307693,21 Z m -6.23077,-4.846154 c 0,-1.147015 -0.929908,-2.076923 -2.076923,-2.076923 -1.147015,0 -2.0769231,0.929908 -2.0769231,2.076923 v 3.461538 h 4.1538461 v -4.846153 z"
+         id="Shape"
+         style="opacity:0.6;fill:#717065;fill-opacity:1" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/remains-s.svg b/data/styles/clear/style-night/symbols/remains-s.svg
index 3d84cfbb1e..0b768a0412 100644
--- a/data/styles/clear/style-night/symbols/remains-s.svg
+++ b/data/styles/clear/style-night/symbols/remains-s.svg
@@ -1,11 +1,52 @@
-<?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>remains-s</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="remains-s" 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"></circle>
-            <path d="M10.7725998,3.3745165 L10.7725998,4.76663379 C10.7824897,5.12491587 10.5178481,5.4239389 10.1815051,5.43447384 L10.1809753,5.43447384 L5.84533878,5.43447384 C5.50890752,5.43974131 5.23216852,5.15341665 5.22722359,4.79494645 C5.22715737,4.78864429 5.22715737,4.78234214 5.22722359,4.77603999 L5.22722359,3.3745165 C5.22722359,3.19532843 5.36365045,3.05000267 5.53186608,3.05000267 C5.70008171,3.05000267 5.83650856,3.19532843 5.83650856,3.3745165 L5.83650856,4.02354415 L6.64888852,4.02354415 L6.64888852,3.55323426 L6.64888852,3.55323426 C6.64888852,3.29352913 6.84659708,3.08292436 7.09039937,3.08292436 C7.33420166,3.08292436 7.53191022,3.29352913 7.53191022,3.55323426 L7.53191022,3.55323426 L7.53191022,4.02354415 L8.41493192,4.02354415 L8.41493192,3.55323426 L8.41493192,3.55323426 C8.41493192,3.29352913 8.61264047,3.08292436 8.85644276,3.08292436 C9.10024505,3.08292436 9.29795361,3.29352913 9.29795361,3.55323426 L9.29795361,3.55323426 L9.29795361,4.02354415 L10.1809753,4.02354415 L10.1809753,3.3745165 C10.1526303,3.20050183 10.262125,3.03495275 10.425484,3.00475886 C10.588843,2.97456496 10.7442548,3.09120181 10.7725998,3.26521648 C10.7785161,3.30143034 10.7785161,3.3383967 10.7725998,3.3745165 L10.7725998,3.3745165 Z M12,11.6707831 C12,11.8526049 11.8616305,12 11.6909424,12 L11.6909424,12 L4.30888103,12 C4.13819294,11.9999059 3.99991174,11.8524168 4,11.6705949 C4.00017665,11.4888672 4.13836954,11.3416602 4.30888103,11.3415661 L4.61793862,11.3415661 C4.94942497,11.3521011 5.22616397,11.0744301 5.23605381,10.7213215 C5.23640702,10.7086231 5.23640702,10.6958307 5.23605381,10.6831323 C5.23605381,10.6831323 5.854169,7.67314895 5.854169,7.02412129 C5.84922408,6.67091856 6.11404228,6.38036111 6.44570523,6.37509364 C6.45162148,6.37499957 6.45753772,6.37499957 6.46345397,6.37509364 L9.53636947,6.37509364 C9.86785581,6.36455869 10.1445948,6.64222966 10.1544847,6.99533833 C10.1548379,7.0080367 10.1548379,7.02082912 10.1544847,7.03352749 C10.1544847,7.69196135 10.7725998,10.6925385 10.7725998,10.6925385 C10.76271,11.0456472 11.023378,11.3404374 11.3548643,11.3509723 C11.3667851,11.3513486 11.3787942,11.3513486 11.390715,11.3509723 L11.6909424,11.3509723 C11.8616305,11.3509723 12,11.4983675 12,11.6801893 L12,11.6801893 L12,11.6707831 L12,11.6707831 Z M8.85644276,9.66726291 C8.85644276,9.1477586 8.46111395,8.72664312 7.97342107,8.72664312 C7.48572819,8.72664312 7.09039937,9.1477586 7.09039937,9.66726291 L7.09039937,11.5485025 L8.85644276,11.5485025 L8.85644276,9.66726291 L8.85644276,9.66726291 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="remains-s.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="48.4375"
+     inkscape:cx="2.6322581"
+     inkscape:cy="8.1135484"
+     inkscape:window-width="3840"
+     inkscape:window-height="2072"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">remains-s</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="remains-s"
+       fill-rule="nonzero">
+      <path
+         d="m 12.1589,2.4993406 v 1.8561589 c 0.01486,0.4777087 -0.382131,0.8764092 -0.886641,0.8904492 H 11.271436 4.7679801 C 4.2633614,5.2529641 3.8482498,4.8712002 3.840825,4.3932395 c -9.87e-5,-0.0084 -9.87e-5,-0.0168 0,-0.0252 V 2.4993406 c 0,-0.2389204 0.2046465,-0.4326845 0.4569612,-0.4326845 0.2523286,0 0.4569617,0.1937641 0.4569617,0.4326845 v 0.8653692 h 1.2185639 v -0.6270849 0 c 0,-0.3462724 0.2965681,-0.6270849 0.6622697,-0.6270849 0.365701,0 0.6622686,0.2808125 0.6622686,0.6270849 v 0 0.6270849 h 1.3245391 v -0.6270849 0 c 0,-0.3462724 0.2965691,-0.6270849 0.66227,-0.6270849 0.3657017,0 0.6622688,0.2808125 0.6622688,0.6270849 v 0 0.6270849 H 11.27146 V 2.4993406 c -0.04252,-0.2320203 0.12177,-0.4527487 0.366767,-0.4930088 0.245038,-0.0402 0.478156,0.1152002 0.520669,0.3472806 0.0088,0.04824 0.0088,0.09756 10e-7,0.1457282 z M 14,13.561045 C 14,13.803474 13.792445,14 13.536412,14 v 0 H 2.4633214 C 2.2072886,13.999876 1.9998677,13.803223 2.0000001,13.560794 2.0002647,13.318489 2.207549,13.122218 2.46332,13.122085 h 0.4635899 c 0.4972322,0.01404 0.9123436,-0.356184 0.92718,-0.826992 5.292e-4,-0.01692 5.292e-4,-0.03396 0,-0.05088 0,0 0.9271666,-4.0133174 0.9271666,-4.8786888 -0.00741,-0.4709411 0.3898123,-0.8583496 0.8873009,-0.8653695 0.00888,-1.251e-4 0.017685,-1.251e-4 0.026595,0 h 4.6093726 c 0.497232,-0.014039 0.912345,0.3561844 0.927167,0.8269931 5.32e-4,0.01692 5.32e-4,0.03396 0,0.05088 0,0.8779093 0.927181,4.8786892 0.927181,4.8786892 -0.01486,0.470809 0.376164,0.863869 0.873396,0.877908 0.01782,5.05e-4 0.03592,5.05e-4 0.05374,0 h 0.450346 c 0.25604,0 0.463591,0.196526 0.463591,0.438962 v 0 -0.01248 z M 9.2846626,10.88968 c 0,-0.692677 -0.5929863,-1.2541613 -1.3245252,-1.2541613 -0.7315377,0 -1.3245386,0.5614933 -1.3245386,1.2541613 v 2.508323 h 2.6490638 z"
+         id="Shape"
+         style="opacity:0.6;fill:#717065;fill-opacity:1" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg
index 1aa10d1a07..f04f559414 100644
--- a/data/styles/clear/style-night/symbols/tomb-m.svg
+++ b/data/styles/clear/style-night/symbols/tomb-m.svg
@@ -1,15 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>tomb-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="tomb-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <g id="tomb" transform="translate(6.000000, 6.000000)" fill="#FFFFFF">
-                <path d="M6.22928906,0.0015 L5.7684375,0.0015 C3.70844531,0.0015 2.03847656,1.67146875 2.03847656,3.73146094 L2.03847656,7.85219531 L9.95925,7.85219531 L9.95925,3.73146094 C9.95925,1.67144531 8.28930469,0.0015 6.22928906,0.0015 Z M7.43974219,6.71917969 L4.55798438,6.71917969 C4.36382813,6.71917969 4.20642188,6.56177344 4.20642188,6.36761719 C4.20642188,6.17346094 4.36382813,6.01605469 4.55798438,6.01605469 L7.43974219,6.01605469 C7.63389844,6.01605469 7.79130469,6.17346094 7.79130469,6.36761719 C7.79130469,6.56177344 7.63392188,6.71917969 7.43974219,6.71917969 Z M7.43974219,5.31292969 L4.55798438,5.31292969 C4.36382813,5.31292969 4.20642188,5.15552344 4.20642188,4.96136719 C4.20642188,4.76721094 4.36382813,4.60980469 4.55798438,4.60980469 L7.43974219,4.60980469 C7.63389844,4.60980469 7.79130469,4.76721094 7.79130469,4.96136719 C7.79130469,5.15552344 7.63392188,5.31292969 7.43974219,5.31292969 Z M7.43974219,3.90667969 L4.55798438,3.90667969 C4.36382813,3.90667969 4.20642188,3.74927344 4.20642188,3.55511719 C4.20642188,3.36096094 4.36382813,3.20355469 4.55798438,3.20355469 L7.43974219,3.20355469 C7.63389844,3.20355469 7.79130469,3.36096094 7.79130469,3.55511719 C7.79130469,3.74927344 7.63392188,3.90667969 7.43974219,3.90667969 Z" id="Shape"></path>
-                <path d="M11.2543125,9.80988281 L11.2543125,8.90685937 C11.2543125,8.71270313 11.0969063,8.55529687 10.90275,8.55529687 L1.095,8.55529687 C0.90084375,8.55529687 0.7434375,8.71270313 0.7434375,8.90685937 L0.7434375,9.80988281 L11.2543125,9.80988281 Z" id="Path"></path>
-                <path d="M11.99775,11.99625 L0,11.99625 L0,10.8645703 C0,10.6704141 0.15740625,10.5130078 0.3515625,10.5130078 L11.6461875,10.5130078 C11.8403438,10.5130078 11.99775,10.6704141 11.99775,10.8645703 L11.99775,11.99625 Z" id="Path"></path>
-            </g>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="tomb-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="42.791667"
+     inkscape:cx="12.070107"
+     inkscape:cy="12.035053"
+     inkscape:window-width="1920"
+     inkscape:window-height="2072"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg14" />
+  <title
+     id="title2">tomb-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     transform="matrix(0.9375,0,0,0.9375,1.25,1.25)">
+    <g
+       id="tomb-m"
+       fill-rule="nonzero">
+      <g
+         id="tomb"
+         transform="translate(6,6)"
+         fill="#ffffff">
+        <path
+           id="Shape"
+           d="M 5.691356,-2 C 2.9442553,-2 0.71919254,0.22766735 0.71919254,2.974768 V 8.4678495 H 11.280808 V 2.974768 C 11.280808,0.22763615 9.0531716,-2 6.3060392,-2 Z M 4.0791144,2.268924 h 3.8417711 c 0.2589169,0 0.4688262,0.2099093 0.4688262,0.4688262 0,0.258917 -0.2098781,0.4688264 -0.4688262,0.4688264 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688264 0,-0.2589169 0.2099096,-0.4688262 0.4688264,-0.4688262 z m 0,1.8753052 h 3.8417711 c 0.2589169,0 0.4688262,0.2099093 0.4688262,0.4688262 0,0.258917 -0.2098781,0.4688264 -0.4688262,0.4688264 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688264 0,-0.2589169 0.2099096,-0.4688262 0.4688264,-0.4688262 z m 0,1.8753052 h 3.8417711 c 0.2589169,0 0.4688262,0.2099094 0.4688262,0.4688264 0,0.2589168 -0.2098781,0.4688262 -0.4688262,0.4688262 H 4.0791144 c -0.2589168,0 -0.4688264,-0.2099094 -0.4688264,-0.4688262 0,-0.258917 0.2099096,-0.4688264 0.4688264,-0.4688264 z m -4.61793912,3.3859677 c -0.2589168,0 -0.46882628,0.2099097 -0.46882628,0.4688264 V 11.080254 H 13.007651 V 9.8743285 c 0,-0.2589167 -0.20991,-0.4688264 -0.468827,-0.4688264 z M -1.5311736,12.017907 C -1.7900906,12.017907 -2,12.227816 -2,12.486732 v 1.50806 h 16 v -1.50806 c 0,-0.258916 -0.209911,-0.468825 -0.468826,-0.468825 z"
+           style="opacity:0.6;fill:#717065;fill-opacity:1;stroke-width:0.888888" />
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
index 760ac93185..316b1b7fc3 100644
--- a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
+++ b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg
@@ -1,11 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>wayside_shrine-m</title>
-    <g id="Page-2:-Night" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="wayside_shrine-m" fill-rule="nonzero">
-            <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
-            <circle id="Oval" fill="#7F5933" cx="12" cy="12" r="11"></circle>
-            <path d="M11.9995431,4 L6,10.1273333 L7.03434097,11.1829333 L12.0004569,6.1112 L16.965659,11.1829333 L18,10.1273333 L11.9995431,4 Z M16.0702048,12.1526667 L16.0702048,18 L14.2427473,18 L14.2427473,14.7333333 C14.2427473,13.4444 13.2202848,12.4 11.9584253,12.4 C10.6965659,12.4 9.6741034,13.4444 9.6741034,14.7333333 L9.6741034,18 L7.84664585,18 L7.84664585,12.2198667 L11.9922333,8.0796 L16.0702048,12.1526667 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="wayside_shrine-m.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="42.791667"
+     inkscape:cx="11.742941"
+     inkscape:cy="12.011685"
+     inkscape:window-width="1920"
+     inkscape:window-height="2072"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <title
+     id="title2">wayside_shrine-m</title>
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <g
+       id="wayside_shrine-m"
+       fill-rule="nonzero">
+      <path
+         d="m 11.999413,3 -7.7136985,7.878 1.329867,1.3572 6.3850065,-6.5208 6.383831,6.5208 1.329867,-1.3572 z M 17.23312,13.482 V 21 h -2.349588 v -4.2 c 0,-1.6572 -1.314593,-3 -2.936986,-3 -1.62239,0 -2.9369845,1.3428 -2.9369845,3 V 21 H 6.6599734 V 13.5684 L 11.990014,8.2452 Z"
+         id="Shape"
+         style="opacity:0.6;fill:#717065;fill-opacity:1" />
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>