diff --git a/amenity-points.mss b/amenity-points.mss
index c7b0c7e119..81c52ce261 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -44,8 +44,10 @@
   }
 
   [feature = 'amenity_bar'][zoom >= 17] {
-    point-file: url('symbols/bar.p.20.png');
-    point-placement: interior;
+    marker-file: url('symbols/bar.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_bicycle_rental'][zoom >= 17] {
@@ -78,8 +80,10 @@
   }
 
   [feature = 'amenity_cafe'][zoom >= 17] {
-    point-file: url('symbols/cafe.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/cafe.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'tourism_camp_site'][zoom >= 16] {
@@ -258,13 +262,17 @@
   }
 
   [feature = 'amenity_pub'][zoom >= 17] {
-    point-file: url('symbols/pub.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/pub.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_biergarten'][zoom >= 17] {
-    point-file: url('symbols/biergarten.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/biergarten.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_recycling'][zoom >= 16] {
@@ -275,13 +283,17 @@
   }
 
   [feature = 'amenity_restaurant'][zoom >= 17] {
-    point-file: url('symbols/restaurant.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/restaurant.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_fast_food'][zoom >= 17] {
-    point-file: url('symbols/fast_food.png');
-    point-placement: interior;
+    marker-file: url('symbols/fast_food.16.svg');
+    marker-fill: #734a08;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_telephone'][zoom >= 17] {
diff --git a/symbols/bar.16.svg b/symbols/bar.16.svg
new file mode 100644
index 0000000000..0b361ab557
--- /dev/null
+++ b/symbols/bar.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,2 5.5,6 0,4 C 7.5,12 3,13 3,14 l 10,0 C 13,13 8.5,12 8.5,12 L 8.5,8 14,2 z" />
+</svg>
diff --git a/symbols/bar.p.20.png b/symbols/bar.p.20.png
deleted file mode 100644
index 9b0e48b967..0000000000
Binary files a/symbols/bar.p.20.png and /dev/null differ
diff --git a/symbols/biergarten.16.svg b/symbols/biergarten.16.svg
new file mode 100644
index 0000000000..0fd4973b83
--- /dev/null
+++ b/symbols/biergarten.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 4,1 C 3,1 2,2 2,3 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 15,6 C 15,5 14,4 13,4 L 11,4 11,3 C 11,1.7603028 10.263667,1 9,1 z M 5,2 8,2 C 9.3809813,2 10,2.3528175 10,3 7,3 4.85459,3.19773 5,6 5,8 3,8 3,6 L 3,4 C 3,2.4966359 3.4966359,2 5,2 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z" />
+</svg>
diff --git a/symbols/biergarten.p.16.png b/symbols/biergarten.p.16.png
deleted file mode 100644
index 241a4de1fa..0000000000
Binary files a/symbols/biergarten.p.16.png and /dev/null differ
diff --git a/symbols/cafe.16.svg b/symbols/cafe.16.svg
new file mode 100644
index 0000000000..d6060f46d1
--- /dev/null
+++ b/symbols/cafe.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,2 0,6 c 0,2 2,3 4.5,3 C 9,11 11,10 11,8 l 2,0 c 1,0 2,-1 2,-2 L 15,5 C 15,4 14,3 13,3 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 11,6.75 z M 1,12 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z" />
+</svg>
diff --git a/symbols/cafe.p.16.png b/symbols/cafe.p.16.png
deleted file mode 100644
index 836f8a5403..0000000000
Binary files a/symbols/cafe.p.16.png and /dev/null differ
diff --git a/symbols/fast_food.16.svg b/symbols/fast_food.16.svg
new file mode 100644
index 0000000000..f5377083ab
--- /dev/null
+++ b/symbols/fast_food.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 6,4 C 3,4 1.960032,6.000799 2,7 L 2,8 14,8 14,7 C 14,6 13,4 10,4 z M 2,9 c -1,0 -1,1 0,1 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 2,12.34045 2.81579,13 3.5,13 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z" />
+</svg>
diff --git a/symbols/fast_food.png b/symbols/fast_food.png
deleted file mode 100644
index 99875e99c1..0000000000
Binary files a/symbols/fast_food.png and /dev/null differ
diff --git a/symbols/pub.16.svg b/symbols/pub.16.svg
new file mode 100644
index 0000000000..6124d633e8
--- /dev/null
+++ b/symbols/pub.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 3,2 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.5,3 -6.5,0 z" />
+</svg>
diff --git a/symbols/pub.p.16.png b/symbols/pub.p.16.png
deleted file mode 100644
index b452a7eadc..0000000000
Binary files a/symbols/pub.p.16.png and /dev/null differ
diff --git a/symbols/restaurant.16.svg b/symbols/restaurant.16.svg
new file mode 100644
index 0000000000..816134d63d
--- /dev/null
+++ b/symbols/restaurant.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 5,1 C 4,1 2,3 2,6 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 5.75,10 8,9 8,6 8,3 6,1 5,1 z M 9,1.75 9,8 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 12.25,9 14,9 14,8 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 13,7 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 11,7 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z" />
+</svg>
diff --git a/symbols/restaurant.p.16.png b/symbols/restaurant.p.16.png
deleted file mode 100644
index 5c410087be..0000000000
Binary files a/symbols/restaurant.p.16.png and /dev/null differ