Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9654)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9681)
@@ -1626,26 +1626,26 @@
 /***************/
 
-node[office=accountant],
-node[office=administrative],
-node[office=advertising_agency],
-node[office=architect],
-node[office=association],
-node[office=company],
-node[office=educational_institution],
-node[office=employment_agency],
-node[office=estate_agent],
-node[office=foundation],
-node[office=government],
-node[office=insurance],
-node[office=it],
-node[office=lawyer],
-node[office=newspaper],
-node[office=ngo],
-node[office=notary],
-node[office=political_party],
-node[office=religion],
-node[office=research],
-node[office=tax_advisor],
-node[office=telecommunication] {
+area[office=accountant],
+area[office=administrative],
+area[office=advertising_agency],
+area[office=architect],
+area[office=association],
+area[office=company],
+area[office=educational_institution],
+area[office=employment_agency],
+area[office=estate_agent],
+area[office=foundation],
+area[office=government],
+area[office=insurance],
+area[office=it],
+area[office=lawyer],
+area[office=newspaper],
+area[office=ngo],
+area[office=notary],
+area[office=political_party],
+area[office=religion],
+area[office=research],
+area[office=tax_advisor],
+area[office=telecommunication] {
     fill-color: office#de5696;
 }
@@ -3207,11 +3207,83 @@
 /**************/
 
+area[craft=carpenter],
+area[craft=shoemaker],
+area[craft=photographer],
+area[craft=metal_construction],
+area[craft=electrician],
+area[craft=brewery],
+area[craft=plumber],
+area[craft=sawmill],
+area[craft=gardener],
+area[craft=winery],
+area[craft=hvac],
 area[craft=painter],
-area[craft=plumber],
+area[craft=stonemason],
+area[craft=handicraft],
 area[craft=pottery],
-area[craft=stonemason],
-area[craft=tiler],
-area[craft=window_construction] {
+area[craft=key_cutter],
+area[craft=caterer],
+area[craft=roofer],
+area[craft=beekeeper],
+area[craft=blacksmith],
+area[craft=locksmith],
+area[craft=window_construction],
+area[craft=upholsterer],
+area[craft=tiler] {
     fill-color: craft#999900;
+}
+node[craft=carpenter] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=shoemaker] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=photographer] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=metal_construction] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}node[craft=electrician] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=brewery] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=plumber] {
+    icon-image: "craft/plumber.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=sawmill] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=gardener] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=winery] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=hvac] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
 }
 node[craft=painter] {
@@ -3220,6 +3292,11 @@
     text: auto;
 }
-node[craft=plumber] {
-    icon-image: "craft/plumber.png";
+node[craft=stonemason] {
+    icon-image: "craft/stonemason.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=handicraft] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
@@ -3230,6 +3307,41 @@
     text: auto;
 }
-node[craft=stonemason] {
-    icon-image: "craft/stonemason.png";
+node[craft=key_cutter] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=caterer] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=roofer] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=beekeeper] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=blacksmith] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=locksmith] {
+    icon-image: "misc/no_icon.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=window_construction] {
+    icon-image: "craft/window_construction.png";
+    set icon_z17;
+    text: auto;
+}
+node[craft=upholsterer] {
+    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
@@ -3237,9 +3349,4 @@
 node[craft=tiler] {
     icon-image: "craft/tiler.png";
-    set icon_z17;
-    text: auto;
-}
-node[craft=window_construction] {
-    icon-image: "craft/window_construction.png";
     set icon_z17;
     text: auto;