diff --git a/amenity-points.mss b/amenity-points.mss
index a7b94ea0de..97042478f3 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -5,6 +5,7 @@
 @transportation-icon: #0092da;
 @transportation-text: #0066ff;
 @airtransport: #8461C4;
+@health-color: #da0092;
 
 @landcover-font-size: 10;
 @landcover-font-size-big: 12;
@@ -122,8 +123,10 @@
   }
 
   [feature = 'amenity_hospital'][zoom >= 15] {
-    point-file: url('symbols/hospital.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/health/hospital-16.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @health-color;
   }
 
   [feature = 'tourism_hostel'][zoom >= 17] {
@@ -192,8 +195,10 @@
   }
 
   [feature = 'amenity_pharmacy'][zoom >= 17] {
-    point-file: url('symbols/pharmacy.p.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/health/pharmacy-16.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @health-color;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
@@ -1530,7 +1535,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;
@@ -1543,7 +1548,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/health/hospital-16.svg b/symbols/health/hospital-16.svg
new file mode 100644
index 0000000000..c0a53f93a8
--- /dev/null
+++ b/symbols/health/hospital-16.svg
@@ -0,0 +1,58 @@
+<?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">
+  <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title></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></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 8,0.96875 C 4.1945765,0.96875 1.03125,4.0714285 1.03125,8 c 0,3.928572 3.1633265,7.03125 6.96875,7.03125 3.805424,0 6.96875,-3.102679 6.96875,-7.03125 C 14.96875,4.0714285 11.805424,0.96875 8,0.96875 z m 0,1.0625 c 3.374278,0 6.03125,2.7176196 6.03125,5.96875 0,3.251131 -2.656972,5.96875 -6.03125,5.96875 C 4.6257218,13.96875 1.96875,11.251131 1.96875,8 1.96875,4.7488696 4.6257218,2.03125 8,2.03125 z M 6,3 6,6 3,6 l 0,4 3,0 0,3 4,0 0,-3 3,0 0,-4 -3,0 0,-3 -4,0 z"
+     id="path2989"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/health/pharmacy-16.svg b/symbols/health/pharmacy-16.svg
new file mode 100644
index 0000000000..bea52858ce
--- /dev/null
+++ b/symbols/health/pharmacy-16.svg
@@ -0,0 +1,183 @@
+<?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"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2">
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path5987"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path5848"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Mend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         id="path5854"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         id="path5860"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow2Send"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         id="path5878"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.2,0.2)"
+         id="path5993"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <inkscape:path-effect
+       effect="ruler"
+       id="path-effect8652" />
+    <inkscape:path-effect
+       effect="ruler"
+       id="path-effect8654" />
+    <inkscape:path-effect
+       effect="ruler"
+       id="path-effect8656" />
+    <inkscape:path-effect
+       effect="bend_path"
+       id="path-effect8658" />
+  </defs>
+  <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <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 />
+          </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="matrix(0.57632428,0,0,0.57632428,-10.358019,-459.72189)"
+     id="text4892"
+     style="font-size:58.81888199px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" />
+  <g
+     transform="matrix(1.2125471,0,0,1.1028537,-121.40471,139.02544)"
+     id="text7907"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" />
+  <g
+     transform="matrix(1.0184062,0,0,1,-86.916359,-892.07406)"
+     id="text16643"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" />
+  <g
+     transform="matrix(0.16,0,0,0.16,-8.688733,-96.73364)"
+     id="g5757" />
+  <g
+     transform="matrix(0.16,0,0,0.16,-8.688733,-96.73364)"
+     id="g5761" />
+  <g
+     transform="matrix(0.16,0,0,0.16,-8.688733,-96.73364)"
+     id="g5765" />
+  <g
+     transform="matrix(0.16,0,0,0.16,-8.688733,-96.73364)"
+     id="g5769" />
+  <text
+     x="-2.3050849"
+     y="-107.21186"
+     id="text7239"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan
+       x="-2.3050849"
+       y="-107.21186"
+       id="tspan7241" /></text>
+  <g
+     transform="matrix(0.16,0,0,0.16,19.694915,83.76814)"
+     id="Captions" />
+  <g
+     transform="translate(19.694915,65.28814)"
+     id="g7138" />
+  <path
+     d="m 5,5 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 5,1 5,4 11,4 11,1 z"
+     id="path4199"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+</svg>