Index: trunk/resources/styles/standard/potlatch2.mapcss
===================================================================
--- trunk/resources/styles/standard/potlatch2.mapcss	(revision 16993)
+++ trunk/resources/styles/standard/potlatch2.mapcss	(revision 17016)
@@ -216,4 +216,5 @@
 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
 node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
@@ -222,4 +223,5 @@
 node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; }
 node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
+node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; }
 node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
 node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
@@ -229,5 +231,5 @@
 node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
 node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
-node[amenity=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
+node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; }
 node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
 node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; }
@@ -235,5 +237,4 @@
 node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
 node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
-node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 /* Shops */