diff --git a/data/styles/clear/style-clear/symbols/theme_park-m.svg b/data/styles/clear/style-clear/symbols/theme_park-m.svg
index 167cb03103..33eb520d58 100644
--- a/data/styles/clear/style-clear/symbols/theme_park-m.svg
+++ b/data/styles/clear/style-clear/symbols/theme_park-m.svg
@@ -1,10 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>theme_park-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="theme_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="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#fff"/>
-  </g>
- </g>
+ <circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <path d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#fff"/>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/theme_park-s.svg b/data/styles/clear/style-clear/symbols/theme_park-s.svg
index 9fc6333b36..9ca8b33c95 100644
--- a/data/styles/clear/style-clear/symbols/theme_park-s.svg
+++ b/data/styles/clear/style-clear/symbols/theme_park-s.svg
@@ -1,10 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>theme_park-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="theme_park-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="#717065"/>
-   <path id="Shape" d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#fff"/>
-  </g>
- </g>
+ <circle cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
+ <circle cx="8" cy="8" r="7" fill="#7f5933"/>
+ <path d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#fff"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/theme_park-m.svg b/data/styles/clear/style-night/symbols/theme_park-m.svg
index cf13cc4834..f7a163b532 100644
--- a/data/styles/clear/style-night/symbols/theme_park-m.svg
+++ b/data/styles/clear/style-night/symbols/theme_park-m.svg
@@ -1,10 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>theme_park-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="theme_park-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
-   <path id="Shape" d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#000"/>
-  </g>
- </g>
+ <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
+ <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <path d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#000"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/theme_park-s.svg b/data/styles/clear/style-night/symbols/theme_park-s.svg
index ca3be81166..178f8962bf 100644
--- a/data/styles/clear/style-night/symbols/theme_park-s.svg
+++ b/data/styles/clear/style-night/symbols/theme_park-s.svg
@@ -1,10 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <title>theme_park-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="theme_park-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#717065"/>
-   <path id="Shape" d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#000"/>
-  </g>
- </g>
+ <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
+ <circle cx="8" cy="8" r="7" fill="#7f5933"/>
+ <path d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#000"/>
 </svg>