Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15340)
+++ trunk/data/defaultpresets.xml	(revision 15341)
@@ -6626,5 +6626,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Window construction -->
-    <item name="Carpenter" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Carpenter" icon="presets/craft/carpenter.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=carpenter" />
         <space />
@@ -6698,5 +6698,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Blacksmith -->
-    <item name="Metal construction" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Metal construction" icon="presets/craft/metal_construction.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=metal_construction" />
         <space />
Index: trunk/images/presets/craft/carpenter.svg
===================================================================
--- trunk/images/presets/craft/carpenter.svg	(revision 15341)
+++ trunk/images/presets/craft/carpenter.svg	(revision 15341)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="carpenter2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="0.65753195"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect818"
+       width="1"
+       height="9"
+       x="2"
+       y="1044.3622" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect820"
+       width="1"
+       height="9.0000172"
+       x="12"
+       y="1044.3622" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect822"
+       width="1"
+       height="9"
+       x="7"
+       y="1044.3622" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect824"
+       width="9"
+       height="1.0000174"
+       x="3"
+       y="1047.3622" />
+    <path
+       style="fill:#c87137;stroke:#c87137;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1053.3622 4,-5"
+       id="path826"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#c87137;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8,1048.3622 4,5"
+       id="path828"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#c87137;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0,1045.3622 7.5,-6 7.5,6"
+       id="path830"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect832"
+       width="11"
+       height="1"
+       x="2"
+       y="1043.3622" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect834"
+       width="9"
+       height="1"
+       x="3"
+       y="1052.3622" />
+  </g>
+</svg>
Index: trunk/images/presets/craft/metal_construction.svg
===================================================================
--- trunk/images/presets/craft/metal_construction.svg	(revision 15341)
+++ trunk/images/presets/craft/metal_construction.svg	(revision 15341)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="metal_construction9.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="5.9570229"
+     inkscape:cy="8.374846"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <rect
+       style="fill:#8abaff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86603296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect900"
+       width="12"
+       height="2.0000348"
+       x="0"
+       y="1051.3622"
+       ry="0.60000002" />
+    <rect
+       style="fill:#8abaff;fill-opacity:1;stroke:none;stroke-width:0.86603296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect902"
+       width="12"
+       height="2.0000348"
+       x="0"
+       y="1037.3622"
+       ry="0.60000002" />
+    <path
+       style="fill:#8abaff;fill-opacity:1;stroke:none;stroke-width:1.15470052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 3,1039.3622 c 0.554,0 1.0545156,0.2225 1.4160156,0.584 0.3615,0.3615 0.5839844,0.862 0.5839844,1.416 v 8 c 0,0.554 -0.2224844,1.0545 -0.5839844,1.416 -0.3615,0.3615 -0.8620156,0.584 -1.4160156,0.584 h 6 c -0.554,0 -1.0545156,-0.2225 -1.4160156,-0.584 C 7.2224844,1050.4167 7,1049.9162 7,1049.3622 v -8 c 0,-0.554 0.2224844,-1.0545 0.5839844,-1.416 0.3615,-0.3615 0.8620156,-0.584 1.4160156,-0.584 z"
+       id="rect904"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 15340)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 15341)
@@ -3119,6 +3119,6 @@
     fill-color: craft#999900;
 }
-node[craft=carpenter][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=carpenter] {
+    icon-image: "presets/craft/carpenter.svg";
     set icon_z17;
 }
@@ -3131,6 +3131,6 @@
     set icon_z17;
 }
-node[craft=metal_construction][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=metal_construction] {
+    icon-image: "presets/craft/metal_construction.svg";
     set icon_z17;
 }node[craft=electrician] {