Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9891)
+++ /trunk/data/defaultpresets.xml	(revision 9892)
@@ -8326,5 +8326,5 @@
     </item>
   </group> <!-- Offices -->
-  <group name="Craft" icon="styles/standard/craft/stonemason.png">
+  <group name="Craft" icon="styles/standard/craft/painter.png">
     <item name="Carpenter" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=carpenter" />
@@ -8411,5 +8411,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Painter -->
-    <item name="Stonemason" icon="styles/standard/craft/stonemason.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Stonemason" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=stonemason" />
         <space />
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 9891)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 9892)
@@ -189,7 +189,7 @@
     set icon_z17;
 }
-node[traffic_sign][access=permissive],
-node[traffic_sign][access=private],
-node[traffic_sign][access=destination] {
+node[traffic_sign][access=permissive][!is_prop_set(icon-image)],
+node[traffic_sign][access=private][!is_prop_set(icon-image)],
+node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -239,6 +239,6 @@
     set icon_z17;
 }
-node[traffic_sign][motorboat?!],
-node[traffic_sign][boat?!] {
+node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
+node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -268,6 +268,6 @@
     set icon_z17;
 }
-node[traffic_sign][maxstay],
-node[traffic_sign][toll] {
+node[traffic_sign][maxstay][!is_prop_set(icon-image)],
+node[traffic_sign][toll][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -480,12 +480,12 @@
     text: auto;
 }
-node[barrier=fence],
-node[barrier=kissing_gate],
-node[barrier=bump_gate],
-node[barrier=portcullis],
-node[barrier=bus_trap],
-node[barrier=drawbridge],
-node[barrier=jersey_barrier],
-node[barrier=hampshire_gate] {
+node[barrier=fence][!is_prop_set(icon-image)],
+node[barrier=kissing_gate][!is_prop_set(icon-image)],
+node[barrier=bump_gate][!is_prop_set(icon-image)],
+node[barrier=portcullis][!is_prop_set(icon-image)],
+node[barrier=bus_trap][!is_prop_set(icon-image)],
+node[barrier=drawbridge][!is_prop_set(icon-image)],
+node[barrier=jersey_barrier][!is_prop_set(icon-image)],
+node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -1546,5 +1546,5 @@
     text: auto;
 }
-node[man_made=petroleum_well] {
+node[man_made=petroleum_well][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -2914,5 +2914,5 @@
     text: auto;
 }
-node[amenity=place_of_worship][religion=spiritualist] {
+node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -2924,10 +2924,10 @@
     text: auto;
 }
-node[amenity=place_of_worship][religion=unitarian] {
+node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[amenity=place_of_worship][religion=zoroastrian] {
+node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -2939,5 +2939,5 @@
     text: auto;
 }
-node[amenity=crematorium] {
+node[amenity=crematorium][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3252,29 +3252,29 @@
     fill-color: craft#999900;
 }
-node[craft=carpenter] {
+node[craft=carpenter][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=shoemaker] {
+node[craft=shoemaker][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=photographer] {
+node[craft=photographer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=metal_construction] {
+node[craft=metal_construction][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
-}node[craft=electrician] {
+}node[craft=electrician][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=brewery] {
+node[craft=brewery][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3286,20 +3286,20 @@
     text: auto;
 }
-node[craft=sawmill] {
+node[craft=sawmill][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=gardener] {
+node[craft=gardener][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=winery] {
+node[craft=winery][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=hvac] {
+node[craft=hvac][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3311,10 +3311,10 @@
     text: auto;
 }
-node[craft=stonemason] {
-    icon-image: "craft/stonemason.png";
-    set icon_z17;
-    text: auto;
-}
-node[craft=handicraft] {
+node[craft=stonemason][!is_prop_set(icon-image)] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=handicraft][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3326,30 +3326,30 @@
     text: auto;
 }
-node[craft=key_cutter] {
+node[craft=key_cutter][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=caterer] {
+node[craft=caterer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=roofer] {
+node[craft=roofer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=beekeeper] {
+node[craft=beekeeper][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=blacksmith] {
+node[craft=blacksmith][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
 }
-node[craft=locksmith] {
+node[craft=locksmith][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3361,5 +3361,5 @@
     text: auto;
 }
-node[craft=upholsterer] {
+node[craft=upholsterer][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3706,5 +3706,5 @@
     text: auto;
 }
-node[military=barracks] {
+node[military=barracks][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -4370,5 +4370,5 @@
     text: auto;
 }
-node[sport=paintball] {
+node[sport=paintball][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -4388,5 +4388,5 @@
     fill-color: sport#bde3cb;
 }
-node[sport=squash] {
+node[sport=squash][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -4429,5 +4429,5 @@
     text: auto;
 }
-node[sport=sailing] {
+node[sport=sailing][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -4439,5 +4439,5 @@
     text: auto;
 }
-node[sport=badminton] {
+node[sport=badminton][!is_prop_set(icon-image)] {
     icon-image: "misc/no_icon.png";
     set icon_z17;