Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9285)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9286)
@@ -856,5 +856,5 @@
 }
 node[highway=emergency_access_point] {
-    icon-image: "service/emergency_access_point.png";
+    icon-image: "service/emergency_access_point.svg";
     set icon_z17;
     text: auto;
@@ -2748,15 +2748,23 @@
 }
 node[amenity=pharmacy] {
-    icon-image: "health/pharmacy.png";
-    set icon_z17;
-    text: auto;
-}
-node[amenity=hospital],
+    icon-image: "health/pharmacy.svg";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=hospital] {
+    icon-image: "health/hospital.svg";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=clinic] {
-    icon-image: "health/hospital.png";
-    set icon_z17;
-    text: auto;
-}
-node[amenity=nursing_home],
+    icon-image: "health/clinic.svg";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=nursing_home] {
+    icon-image: "social_facility/nursing_home.svg";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=social_facility][social_facility=group_home] {
     icon-image: "social_facility/group_home.svg";
@@ -2785,20 +2793,20 @@
 }
 node[amenity=baby_hatch] {
-    icon-image: "health/baby_hatch.png";
+    icon-image: "health/baby_hatch.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=doctors] {
-    icon-image: "health/doctor.png";
+    icon-image: "health/doctors.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=dentist] {
-    icon-image: "health/dentist.png";
+    icon-image: "health/dentist.svg";
     set icon_z17;
     text: auto;
 }
 node[amenity=veterinary] {
-    icon-image: "health/veterinary.png";
+    icon-image: "health/veterinary.svg";
     set icon_z17;
     text: auto;