diff --git a/amenity-points.mss b/amenity-points.mss
index 653cf814a1..51185d7369 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -2,6 +2,7 @@
 @wetland-text: darken(#017fff, 10%); /* Also for marsh */
 @mud-text: darken(#aea397, 20%);
 @shop-icon: #ac39ac;
+@money-icon: #555555;
 @transportation-icon: #0092da;
 @transportation-text: #0066ff;
 @airtransport: #8461C4;
@@ -29,13 +30,17 @@
   }
 
   [feature = 'amenity_atm'][zoom >= 17] {
-    point-file: url('symbols/atm2.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/atm.16.svg');
+    marker-fill: @money-icon;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_bank'][zoom >= 17] {
-    point-file: url('symbols/bank2.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/bank.16.svg');
+    marker-fill: @money-icon;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_bar'][zoom >= 17] {
diff --git a/symbols/atm.16.svg b/symbols/atm.16.svg
new file mode 100644
index 0000000000..36a74f801e
--- /dev/null
+++ b/symbols/atm.16.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="M 2,1 C 1.4576271,1 1,1.4576271 1,2 l 0,2 c 0,0.559322 0.4886174,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 15,2 C 15,1.4576271 14.508475,1 14,1 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 c -1,0 -2,1 -2,2 L 6,12 C 6,11 5,10 4,10 L 4,4 z M 8,5 C 6.4292037,5 5,5.9528024 5,7 5,8.0471976 6.4292037,9 8,9 9.5707963,9 11,8.0471976 11,7 11,5.9528024 9.5707963,5 8,5 z M 3,13.5 C 3,14.554668 3.4247267,15 4,15 l 8,0 c 0.527334,0 1,-0.445332 1,-1.5 -0.305085,0.271186 -0.496636,0.49272 -1,0.46875 l -8,0.0625 C 3.5206056,14.00728 3.3050847,13.805085 3,13.5 z" />
+</svg>
diff --git a/symbols/atm2.p.16.png b/symbols/atm2.p.16.png
deleted file mode 100644
index 62caf207eb..0000000000
Binary files a/symbols/atm2.p.16.png and /dev/null differ
diff --git a/symbols/bank.16.svg b/symbols/bank.16.svg
new file mode 100644
index 0000000000..ea8c60afd5
--- /dev/null
+++ b/symbols/bank.16.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="m 1,3 0,7 c 0,0.627119 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 15,3 1,3 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 c -1,0 -2,1 -2,2 L 4,10 C 4,9 3,8 2,8 L 2,6 C 3,6 4,5 4,4 z M 8,5 C 6.3431459,5 5,5.8954305 5,7 5,8.1045695 6.3431459,9 8,9 9.6568547,9 11,8.1045695 11,7 11,5.8954305 9.6568547,5 8,5 z M 1,11.5 C 1,12.626577 1.4486964,13 2,13 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 2,12 C 1.559322,12 1.2711864,11.754237 1,11.5 z" />
+</svg>
diff --git a/symbols/bank2.p.16.png b/symbols/bank2.p.16.png
deleted file mode 100644
index a7d30e86d5..0000000000
Binary files a/symbols/bank2.p.16.png and /dev/null differ