diff --git a/amenity-symbols.mss b/amenity-symbols.mss
index 8239f58aab..7581950eba 100644
--- a/amenity-symbols.mss
+++ b/amenity-symbols.mss
@@ -1,9 +1,13 @@
+@airtransport: #8461C4;
+
 .symbols {
   [aeroway = 'helipad'][zoom >= 16]::aeroway {
-    point-file: url('symbols/helipad.p.16.png');
+    marker-file: url('symbols/helipad.svg');
+    marker-clip: false;
+    marker-fill: @airtransport;
     text-name: "[name]";
     text-size: 8;
-    text-fill: #6692da;
+    text-fill: @airtransport;
     text-dy: -10;
     text-face-name: @bold-fonts;
     text-halo-radius: 1;
@@ -13,12 +17,14 @@
 
   [aeroway = 'aerodrome'][zoom >= 10][zoom < 13]::aeroway {
     [zoom < 11] {
-      point-file: url('symbols/aerodrome.p.16.png');
-      text-dy: -12;
+      marker-file: url('symbols/aerodrome.svg');
+      marker-clip: false;
+      marker-fill: @airtransport;
+      text-dy: -10;
     }
     text-name: "[name]";
     text-size: 8;
-    text-fill: #6692da;
+    text-fill: darken(@airtransport, 15%);
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
     text-placement: interior;
diff --git a/symbols/aerodrome.p.16.png b/symbols/aerodrome.p.16.png
deleted file mode 100644
index 8f13cd76fe..0000000000
Binary files a/symbols/aerodrome.p.16.png and /dev/null differ
diff --git a/symbols/aerodrome.svg b/symbols/aerodrome.svg
new file mode 100644
index 0000000000..aacb1747b5
--- /dev/null
+++ b/symbols/aerodrome.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 12 12">
+	<path fill-rule="evenodd" d="M 6 0 C 5.254644 0 5 2 5 2 L 5 3.96875 L 0 7.5 L 0 8.5 L 5 7.25 L 5 9.65625 L 3 11 L 3 12 L 6 11.25 L 9 12 L 9 11 L 7 9.65625 L 7 7.25 L 12 8.5 L 12 7.5 L 7 3.96875 L 7 2 C 7 2 6.745356 0 6 0 z"/>
+</svg>
diff --git a/symbols/helipad.p.16.png b/symbols/helipad.p.16.png
deleted file mode 100644
index 619513ca00..0000000000
Binary files a/symbols/helipad.p.16.png and /dev/null differ
diff --git a/symbols/helipad.svg b/symbols/helipad.svg
new file mode 100644
index 0000000000..eceb8e9972
--- /dev/null
+++ b/symbols/helipad.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16 16">
+	<path fill-rule="evenodd" d="M 8 0.5 C 3.8578644 0.5 0.5 3.8579 0.5 8 C 0.5 12.1421 3.8578644 15.5 8 15.5 C 12.142136 15.5 15.5 12.1421 15.5 8 C 15.5 3.8579 12.142136 0.5 8 0.5 z M 8 1.5 C 11.589851 1.5 14.5 4.4101491 14.5 8 C 14.5 11.589851 11.589851 14.5 8 14.5 C 4.4101491 14.5 1.5 11.589851 1.5 8 C 1.5 4.4101491 4.4101491 1.5 8 1.5 z M 5 3 L 4.25 3.75 L 4.25 12.25 C 4.25 12.2501 4.9999904 13 5 13 L 6 13 L 6 9 L 10 9 L 10 13 L 11 13 L 11.75 12.25 L 11.75 3.75 L 11 3 L 10 3 L 10 7 L 6 7 L 6 3 L 5 3 z"/>
+</svg>