diff --git a/data/styles/clear/style-clear/symbols/helipad-m.svg b/data/styles/clear/style-clear/symbols/helipad-m.svg
index fc5f3a1f1f..2229076af9 100644
--- a/data/styles/clear/style-clear/symbols/helipad-m.svg
+++ b/data/styles/clear/style-clear/symbols/helipad-m.svg
@@ -1,10 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>helipad-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="helipad-m" fill-rule="nonzero">
-   <rect id="Rectangle" width="24" height="24" rx="12" fill="#FECB4B"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="11" fill="#2F6499"/>
-   <polygon id="Path" points="10 11 14 11 14 7 16 7 16 17 14 17 14 13 10 13 10 17 8 17 8 7 10 7" fill="#fff"/>
-  </g>
- </g>
+ <rect width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
+ <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+ <polygon points="14 11 14 7 16 7 16 17 14 17 14 13 10 13 10 17 8 17 8 7 10 7 10 11" fill="#fff"/>
+ <circle cx="12" cy="12" r="8.7" fill="none" stroke="#fff" stroke-width="2"/>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg
deleted file mode 100644
index 010265e5ab..0000000000
--- a/data/styles/clear/style-clear/symbols/heliport-m.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>heliport-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="heliport-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 6)" fill="#fff">
-    <rect id="Rectangle" x="1.9085" width="7.6364" height="1.2727"/>
-    <path id="Shape" d="m12.727 1.9091v1.2727h-6.3636v-1.2727h-1.2727v1.2727h-1.5909c-1.5788 0-2.8636 1.2848-2.8636 2.8636 0 1.2428 0.80055 2.2928 1.9091 2.688v1.4484h-0.63636c-0.35064 0-0.63636-0.28573-0.63636-0.63636v-0.63636h-1.2727v0.63636c0 1.0525 0.85655 1.9091 1.9091 1.9091h7.6364v-1.2727h-1.9091v-1.7576c0.53582-0.35955 0.93164-0.89982 1.1289-1.5279l4.7524-1.1875c0.28318-0.071273 0.48173-0.32582 0.48173-0.61791v-3.1818h-1.2721zm-6.3636 8.2727h-2.5455v-1.2727c2.6721 0 2.1032 0.017818 2.5455-0.031818v1.3045zm-0.31818-2.5455h-2.5455c-0.87691 0-1.5909-0.714-1.5909-1.5909 0-0.87691 0.71336-1.5909 1.5909-1.5909h2.5455c0.87691 0 1.5909 0.714 1.5909 1.5909 0 0.87691-0.714 1.5909-1.5909 1.5909zm6.6818-3.0425-3.8672 0.96664c-0.069364-0.40282-0.21636-0.77891-0.43591-1.106h4.3031v0.13936z"/>
-    <circle id="Oval" cx="3.4994" cy="6.0455" r="1"/>
-   </g>
-  </g>
- </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg
index 4af8f68821..45836a0c9f 100644
--- a/data/styles/clear/style-night/symbols/helipad-m.svg
+++ b/data/styles/clear/style-night/symbols/helipad-m.svg
@@ -1,10 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>helipad-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="helipad-m" fill-rule="nonzero">
-   <rect id="Rectangle" width="24" height="24" rx="12" fill="#FECB4B"/>
-   <rect id="Rectangle" x="1" y="1" width="22" height="22" rx="11" fill="#2F6499"/>
-   <polygon id="Path" points="10 11 14 11 14 7 16 7 16 17 14 17 14 13 10 13 10 17 8 17 8 7 10 7" fill="#000"/>
-  </g>
- </g>
+ <rect width="24" height="24" rx="2.5" fill="#000" opacity=".6"/>
+ <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
+ <polygon points="14 11 14 7 16 7 16 17 14 17 14 13 10 13 10 17 8 17 8 7 10 7 10 11" fill="#000"/>
+ <circle cx="12" cy="12" r="8.7" fill="none" stroke="#000" stroke-width="2"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg
deleted file mode 100644
index 900586624a..0000000000
--- a/data/styles/clear/style-night/symbols/heliport-m.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>heliport-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="heliport-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"/>
-   <g id="Group" transform="translate(5 6)" fill="#000">
-    <rect id="Rectangle" x="1.9085" width="7.6364" height="1.2727"/>
-    <path id="Shape" d="m12.727 1.9091v1.2727h-6.3636v-1.2727h-1.2727v1.2727h-1.5909c-1.5788 0-2.8636 1.2848-2.8636 2.8636 0 1.2428 0.80055 2.2928 1.9091 2.688v1.4484h-0.63636c-0.35064 0-0.63636-0.28573-0.63636-0.63636v-0.63636h-1.2727v0.63636c0 1.0525 0.85655 1.9091 1.9091 1.9091h7.6364v-1.2727h-1.9091v-1.7576c0.53582-0.35955 0.93164-0.89982 1.1289-1.5279l4.7524-1.1875c0.28318-0.071273 0.48173-0.32582 0.48173-0.61791v-3.1818h-1.2721zm-6.3636 8.2727h-2.5455v-1.2727c2.6721 0 2.1032 0.017818 2.5455-0.031818v1.3045zm-0.31818-2.5455h-2.5455c-0.87691 0-1.5909-0.714-1.5909-1.5909 0-0.87691 0.71336-1.5909 1.5909-1.5909h2.5455c0.87691 0 1.5909 0.714 1.5909 1.5909 0 0.87691-0.714 1.5909-1.5909 1.5909zm6.6818-3.0425-3.8672 0.96664c-0.069364-0.40282-0.21636-0.77891-0.43591-1.106h4.3031v0.13936z"/>
-    <circle id="Oval" cx="3.4994" cy="6.0455" r="1"/>
-   </g>
-  </g>
- </g>
-</svg>