Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7915)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7927)
@@ -1429,4 +1429,5 @@
 area[leisure=track][!area?!]:closed,
 area[leisure=pitch],
+area[leisure=horse_riding],
 area[leisure=water_park] {
     fill-color: leisure#c7f1a3;
@@ -1458,4 +1459,10 @@
 node[leisure=pitch] {
     icon-image: "sport/pitch.png";
+    set icon_z17;
+    text: auto;
+}
+node[leisure=horse_riding] {
+    icon-image: "presets/equestrian.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -1549,5 +1556,6 @@
 }
 node[leisure=dog_park] {
-    icon-image: "leisure/dog.png";
+    icon-image: "presets/dogpark.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -2083,10 +2091,10 @@
 }
 node[amenity=nightclub] {
+    icon-image: "leisure/discoball.svg";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=stripclub] {
     icon-image: "leisure/nightclub.png";
-    set icon_z17;
-    text: auto;
-}
-node[amenity=stripclub] {
-    icon-image: "leisure/stripclub.png";
     set icon_z17;
     text: auto;
@@ -2223,7 +2231,4 @@
     text: auto;
 }
-area[amenity=telephone] {
-    fill-color: amenity_light#f7efb7;
-}
 node[amenity=telephone] {
     icon-image: "service/telephone.png";
@@ -2236,7 +2241,5 @@
     text: auto;
 }
-area[emergency=phone],
 area[emergency=aed],
-area[emergency=defibrillator],
 area[amenity=toilets],
 area[amenity=shower],
@@ -2290,7 +2293,11 @@
     fill-color: amenity_light#f7efb7;
 }
-node[amenity=public_building],
+node[amenity=public_building] {
+    icon-image: "service.png";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=townhall] {
-    icon-image: "service.png";
+    icon-image: "presets/townhall.png";
     set icon_z17;
     text: auto;
@@ -2306,5 +2313,4 @@
     text: auto;
 }
-area[amenity=drinking_water],
 area[amenity=water_point],
 area[amenity=fountain] {
@@ -2330,5 +2336,4 @@
 area[amenity=crematorium],
 area[amenity=post_office],
-area[amenity=post_box],
 area[amenity=studio],
 area[amenity=school],
@@ -2462,4 +2467,6 @@
 area[amenity=hospital],
 area[amenity=clinic],
+area[amenity=nursing_home],
+area[amenity=social_facility],
 area[amenity=nursery],
 area[amenity=baby_hatch],
@@ -2480,4 +2487,6 @@
     text: auto;
 }
+node[amenity=nursing_home],
+node[amenity=social_facility],
 node[amenity=nursery] {
     icon-image: "misc/no_icon.png";
@@ -2548,5 +2557,6 @@
 }
 node[amenity=theatre] {
-    icon-image: "leisure/theater.png";
+    icon-image: "presets/theater.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -2607,5 +2617,4 @@
 }
 area[amenity=shelter],
-area[amenity=hunting_stand],
 area[amenity=marketplace],
 area[amenity=wlan],
@@ -2630,4 +2639,9 @@
 node[amenity=shelter][shelter_type=basic_hut] {
     icon-image: "accommodation/basic_hut_blue.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=shelter][shelter_type=lean_to] {
+    icon-image: "accommodation/shelter_lean_to.svg";
     set icon_z17;
     text: auto;