diff --git a/amenity-points.mss b/amenity-points.mss
index c9f832b741..6bc019a79a 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -4,6 +4,7 @@
 @shop-icon: #ac39ac;
 @transportation-icon: #0092da;
 @transportation-text: #0066ff;
+@health-color: #da0092;
 
 @landcover-font-size: 10;
 @landcover-font-size-big: 12;
@@ -121,8 +122,9 @@
   }
 
   [feature = 'amenity_hospital'][zoom >= 15] {
-    point-file: url('symbols/hospital.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/hospital.svg');
+    marker-placement: interior;
+    marker-fill: @health-color;
   }
 
   [feature = 'tourism_hostel'][zoom >= 17] {
@@ -191,8 +193,9 @@
   }
 
   [feature = 'amenity_pharmacy'][zoom >= 17] {
-    point-file: url('symbols/pharmacy.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/pharmacy.svg');
+    marker-placement: interior;
+    marker-fill: @health-color;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
@@ -1499,7 +1502,7 @@
 
   [feature = 'amenity_hospital'][zoom >= 16] {
     text-name: "[name]";
-    text-fill: #da0092;
+    text-fill: @health-color;
     text-size: 8;
     text-dy: 10;
     text-face-name: @book-fonts;
@@ -1512,7 +1515,7 @@
     text-name: "[name]";
     text-size: 8;
     text-dy: 10;
-    text-fill: #da0092;
+    text-fill: @health-color;
     text-face-name: @book-fonts;
     text-halo-radius: 1;
     text-wrap-width: @standard-wrap-width;
diff --git a/symbols/hospital.p.16.png b/symbols/hospital.p.16.png
deleted file mode 100644
index dd4febf2bd..0000000000
Binary files a/symbols/hospital.p.16.png and /dev/null differ
diff --git a/symbols/hospital.svg b/symbols/hospital.svg
new file mode 100644
index 0000000000..1252dd61c2
--- /dev/null
+++ b/symbols/hospital.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2">
+  <title
+     id="title3759">Hospital</title>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Hospital</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>nebulon42</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>twain47</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 6,3 4,0 0,3 3,0 0,4 -3,0 0,3 -4,0 0,-3 -3,0 0,-4 3,0 z"
+     id="path2989"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     d="m 8.0099615,-0.01621034 c -4.2302771,0 -8.02031246,3.79003494 -8.02031246,8.02031254 0,4.2302778 3.79003536,7.9857418 8.02031246,7.9857418 4.2302765,0 7.9857425,-3.755464 7.9857425,-7.9857418 0,-4.2302776 -3.755466,-8.02031254 -7.9857425,-8.02031254 z m 0,1.00253906 c 3.6237045,0 6.9832035,3.39406888 6.9832035,7.01777348 0,3.6237048 -3.359499,6.9832028 -6.9832035,6.9832028 -3.6237047,0 -7.0177734,-3.359498 -7.0177734,-6.9832028 0,-3.6237046 3.3940687,-7.01777348 7.0177734,-7.01777348 z"
+     id="path2985"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90395486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/symbols/pharmacy.p.16.png b/symbols/pharmacy.p.16.png
deleted file mode 100644
index fb1c56c865..0000000000
Binary files a/symbols/pharmacy.p.16.png and /dev/null differ
diff --git a/symbols/pharmacy.svg b/symbols/pharmacy.svg
new file mode 100644
index 0000000000..32ac509681
--- /dev/null
+++ b/symbols/pharmacy.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2">
+  <title
+     id="title3759">Pharmacy</title>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Pharmacy</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>nebulon42</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>twain47</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-1036.3622)"
+     id="layer1">
+    <path
+       d="m 5.9999995,1039.3622 4.0000005,0 0.01015,3.0417 2.98985,-0.042 0,4 -2.98985,0.042 -0.01015,2.9583 -4,0 0.010149,-2.9583 L 3,1046.3622 l 0,-4 3.0101495,0.042 z"
+       id="path3757"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+  <path
+     d="m 1,1 c 0,4.6666667 0,9.333333 0,14 4.9458844,0 9.69608,0 14,0 C 15,10.054116 15,5.3039204 15,1 10.148864,1 5.1620256,1 1,1 z m 1,1 12,0 0,12 -12,0 z"
+     id="rect2985"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>