Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7926)
+++ /trunk/data/defaultpresets.xml	(revision 7927)
@@ -2979,5 +2979,5 @@
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="presets/bed.png" type="node,closedway" preset_name_label="true">
+        <item name="Hotel" icon="styles/standard/accommodation.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
@@ -3044,5 +3044,5 @@
             <reference ref="contact" />
         </item> <!-- Chalet -->
-        <item name="Hostel" icon="presets/hostel.png" type="node,closedway" preset_name_label="true">
+        <item name="Hostel" icon="styles/standard/accommodation/hostel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
@@ -3078,5 +3078,5 @@
         </item> <!-- Alpine Hut -->
         <separator/>
-        <item name="Caravan Site/RV Park" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
@@ -3097,5 +3097,5 @@
             <reference ref="contact" />
         </item> <!-- Caravan Site/RV Park -->
-        <item name="Camping Site" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
+        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
@@ -3153,5 +3153,5 @@
             <reference ref="contact" />
         </item> <!-- Fast Food -->
-        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
+        <item name="Food Court" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
@@ -3218,5 +3218,5 @@
             <reference ref="contact" />
         </item> <!-- Beer Garden -->
-        <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
+        <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
@@ -3235,5 +3235,5 @@
             <reference ref="contact" />
         </item> <!-- Bar -->
-        <item name="Night Club" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
+        <item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
@@ -3254,5 +3254,5 @@
             <reference ref="contact" />
         </item> <!-- Night Club -->
-        <item name="Strip Club" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
+        <item name="Strip Club" icon="styles/standard/leisure/nightclub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
@@ -3278,5 +3278,5 @@
             <reference ref="name_oh" />
         </item> <!-- Attraction -->
-        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway" preset_name_label="true">
+        <item name="Viewpoint" icon="styles/standard/sightseeing/viewpoint.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
@@ -3369,5 +3369,5 @@
             </optional>
         </item> <!-- Guidepost -->
-        <item name="Information Terminal" icon="presets/information.png" type="node" preset_name_label="true">
+        <item name="Information Terminal" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3386,5 +3386,5 @@
             <reference ref="internet" />
         </item> <!-- Information Terminal -->
-        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
+        <item name="Audio Guide" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3405,5 +3405,5 @@
             <text key="phone" text="Phone number" />
         </item> <!-- Audio Guide -->
-        <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
+        <item name="Other Information Point" icon="styles/standard/misc/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
@@ -3476,5 +3476,5 @@
             <reference ref="contact" />
         </item> <!-- Amusement/Theme Park -->
-        <item name="Water Park" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Park" icon="styles/standard/leisure/water_park.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
@@ -3546,5 +3546,5 @@
             <text key="name" text="Name" />
         </item> <!-- Playground -->
-        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
+        <item name="Picnic Site" icon="styles/standard/leisure/picnic.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=picnic_site"
@@ -3558,5 +3558,5 @@
             <check key="fireplace" text="Fireplace" />
         </item> <!-- Picnic Site -->
-        <item name="Picnic Table" icon="presets/picnic.png" type="node" preset_name_label="true">
+        <item name="Picnic Table" icon="styles/standard/leisure/picnic.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table" />
             <space />
@@ -3564,5 +3564,5 @@
             <check key="covered" text="Covered" />
         </item> <!-- Picnic Table -->
-        <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
+        <item name="Public Grill" icon="presets/bbq.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
@@ -3585,5 +3585,5 @@
             <text key="name" text="Name" />
         </item> <!-- Firepit -->
-        <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
+        <item name="Fishing" icon="styles/standard/sport/fishing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
@@ -3594,5 +3594,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fishing -->
-        <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
+        <item name="Private Swimming Pool" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
                   ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
@@ -3608,5 +3608,5 @@
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
-        <item name="Museum" icon="presets/State_Public.png" type="node,closedway" preset_name_label="true">
+        <item name="Museum" icon="styles/standard/sightseeing/museum.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=museum"
@@ -3823,5 +3823,5 @@
             <reference ref="oh" />
         </item> <!-- Shinto Shrine -->
-        <item name="Other Place of Worship" type="node,closedway,relation" preset_name_label="true">
+        <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4240,5 +4240,5 @@
             <check key="payment:telephone_cards" text="Telephone cards" />
         </item> <!-- Telephone -->
-        <item name="Emergency Phone" icon="presets/telephone.png" type="node" preset_name_label="true">
+        <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
@@ -4337,5 +4337,5 @@
         </item> <!-- Waste Disposal/Dumpster -->
         <separator/>
-        <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
+        <item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
@@ -4357,5 +4357,5 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
-        <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
+        <item name="Shelter" icon="styles/standard/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7926)
+++ /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;