Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7949)
+++ /trunk/data/defaultpresets.xml	(revision 7950)
@@ -5896,5 +5896,5 @@
             <reference ref="link_contact" />
         </item> <!-- Bakery -->
-        <item name="Butcher" icon="presets/cow.png" type="node,closedway" preset_name_label="true">
+        <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -6019,5 +6019,5 @@
         </item> <!-- Fair Trade -->
         <separator/>
-        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
+        <item name="Alcohol" icon="styles/standard/shop/alcohol.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=alcohol"
@@ -6090,5 +6090,5 @@
             <reference ref="link_contact" />
         </item> <!-- Shoes -->
-        <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
+        <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -6101,5 +6101,5 @@
             <reference ref="link_contact" />
         </item> <!-- Outdoor -->
-        <item name="Sports" icon="presets/rowing.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=sports"
@@ -6403,5 +6403,5 @@
             <reference ref="name_operator_oh" />
         </item> <!-- Copy Shop -->
-        <item name="Book Store" icon="presets/book.png" type="node,closedway" preset_name_label="true">
+        <item name="Book Store" icon="styles/standard/shop/library.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -6697,5 +6697,5 @@
     </group> <!-- Other -->
         <separator/>
-    <item name="Vending Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
+    <item name="Vending Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7949)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7950)
@@ -1710,5 +1710,5 @@
 }
 node[shop=outdoor] {
-    icon-image: "shop/sports/outdoor.png";
+    icon-image: "shop/outdoor.png";
     set icon_z17;
     text: auto;
@@ -1719,5 +1719,4 @@
     text: auto;
 }
-node[shop=alcohol],
 node[shop=beverages] {
     icon-image: "shop/beverages.png";
@@ -1725,6 +1724,11 @@
     text: auto;
 }
+node[shop=alcohol] {
+    icon-image: "shop/alcohol.png";
+    set icon_z17;
+    text: auto;
+}
 node[shop=books] {
-    icon-image: "shop/rental/library.png";
+    icon-image: "shop/library.png";
     set icon_z17;
     text: auto;
@@ -1937,5 +1941,6 @@
 }
 node[shop=travel_agency] {
-    icon-image: "place/island.png";
+    icon-image: "presets/travel.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -2532,5 +2537,4 @@
 area[amenity=bank],
 area[amenity=bureau_de_change],
-area[amenity=atm],
 area[amenity=bbq] {
     fill-color: amenity_light#f7efb7;