Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 13832)
+++ trunk/data/defaultpresets.xml	(revision 13833)
@@ -9832,5 +9832,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Upholsterer -->
-    <item name="Key cutter" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Key cutter" icon="presets/craft/key_cutter.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="https://wiki.openstreetmap.org/wiki/Tag:craft=key_cutter"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=key_cutter"
@@ -9843,5 +9843,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Key cutter -->
-    <item name="Locksmith" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Locksmith" icon="presets/craft/locksmith.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="https://wiki.openstreetmap.org/wiki/Tag:craft=locksmith"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=locksmith"
Index: trunk/images/presets/craft/key_cutter.svg
===================================================================
--- trunk/images/presets/craft/key_cutter.svg	(revision 13833)
+++ trunk/images/presets/craft/key_cutter.svg	(revision 13833)
@@ -0,0 +1,104 @@
+<?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"
+   id="svg3908"
+   sodipodi:docname="key27.svg"
+   viewBox="0 0 16 8"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   width="16"
+   height="8">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="987"
+     inkscape:window-maximized="1"
+     inkscape:zoom="33.997694"
+     inkscape:window-x="-8"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="-1.2186589"
+     inkscape:cy="3.264592"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid814" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-1044.36)">
+    <path
+       id="path604"
+       style="fill:#009700;stroke:#000000;stroke-width:0.07912423;fill-opacity:1"
+       d="m 11.864662,1044.3998 c -0.78695,0 -1.57011,0.2196 -2.2355096,0.6744 -0.39599,0.2707 -0.72489,0.608 -1.00846,0.992 -0.18968,0.2568 -0.35365,0.6215 -0.688027,0.7212 -0.289168,0.086 -0.508155,-0.2291 -0.797323,-0.1846 -0.210687,0.032 -0.162806,0.2926 -0.340289,0.3692 -0.100846,0.043 -0.708451,0.2473 -0.7849,0.2265 -0.151338,-0.041 -0.205398,-0.2318 -0.385002,-0.2191 -0.236831,0.017 -0.312463,0.3086 -0.524097,0.3594 -0.190623,0.046 -0.32771,-0.223 -0.464487,-0.3102 -0.313891,-0.2001 -0.614576,0.081 -0.755099,0.3446 -0.221886,-0.1147 -0.351439,-0.427 -0.611034,-0.448 -0.244961,-0.02 -0.401906,0.2552 -0.608545,0.2314 -0.331954,-0.038 -0.546273,-0.3472 -0.946343,-0.2264 -0.471058,0.1421 -0.89402296,0.7554 -1.27422596,1.0559 -0.14795,0.117 -0.375092,0.2552 -0.399906,0.4603 -0.02719,0.2249 0.273496,0.5436 0.419774,0.6942 0.269806,0.2776 0.94144596,0.1452 1.30156896,0.1452 1.195948,0 2.38602,0.093 3.579274,0.094 0.484591,10e-5 1.499915,-0.2333 1.507669,0.4209 l 0.849457,0.034 0.658225,0.2929 c 0.10381,0.5702 0.67196,1.0804 1.12518,1.4055 1.3621296,0.977 3.3750496,1.093 4.7615896,0.071 1.25929,-0.9278 1.88583,-2.4403 1.67663,-3.9777 -0.0585,-0.4296 -0.34797,-0.8181 -0.40487,-1.2332 -0.40466,-0.3845 -0.66614,-0.8642 -1.13261,-1.1987 -0.7294,-0.5231 -1.62676,-0.7978 -2.51866,-0.7951 z m 1.977487,1.9028 c 0.71647,0 1.171798,0.8571 1.171798,2.1061 0,1.2489 -0.455318,2.0021 -1.171798,2.0021 -0.71647,0 -1.1406,-0.8051 -1.1406,-2.0541 0,-1.249 0.42412,-2.0541 1.1406,-2.0541 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccscccccccccccsssss" />
+    <path
+       id="path3892"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#000000;stroke-width:0.07912423"
+       d="m 1.3224884,1048.5355 c 8.505994,0.073 8.519864,-0.6897 -0.114796,-0.682"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-08-11T11:31:06</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/79417/simple-gold-key-by-milovanderlinden</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>milovanderlinden</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>gold</rdf:li>
+            <rdf:li>key</rdf:li>
+            <rdf:li>line art</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </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>
+</svg>
Index: trunk/images/presets/craft/locksmith.svg
===================================================================
--- trunk/images/presets/craft/locksmith.svg	(revision 13833)
+++ trunk/images/presets/craft/locksmith.svg	(revision 13833)
@@ -0,0 +1,104 @@
+<?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"
+   id="svg3908"
+   sodipodi:docname="key24.svg"
+   viewBox="0 0 16 8"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   width="16"
+   height="8">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="987"
+     inkscape:window-maximized="1"
+     inkscape:zoom="33.997694"
+     inkscape:window-x="-8"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="3.7963871"
+     inkscape:cy="3.264592"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid814" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-1044.36)">
+    <path
+       id="path604"
+       style="fill:#ff0000;stroke:#000000;stroke-width:0.07912423"
+       d="m 11.864662,1044.3998 c -0.78695,0 -1.57011,0.2196 -2.2355096,0.6744 -0.39599,0.2707 -0.72489,0.608 -1.00846,0.992 -0.18968,0.2568 -0.35365,0.6215 -0.688027,0.7212 -0.289168,0.086 -0.508155,-0.2291 -0.797323,-0.1846 -0.210687,0.032 -0.162806,0.2926 -0.340289,0.3692 -0.100846,0.043 -0.708451,0.2473 -0.7849,0.2265 -0.151338,-0.041 -0.205398,-0.2318 -0.385002,-0.2191 -0.236831,0.017 -0.312463,0.3086 -0.524097,0.3594 -0.190623,0.046 -0.32771,-0.223 -0.464487,-0.3102 -0.313891,-0.2001 -0.614576,0.081 -0.755099,0.3446 -0.221886,-0.1147 -0.351439,-0.427 -0.611034,-0.448 -0.244961,-0.02 -0.401906,0.2552 -0.608545,0.2314 -0.331954,-0.038 -0.546273,-0.3472 -0.946343,-0.2264 -0.471058,0.1421 -0.89402296,0.7554 -1.27422596,1.0559 -0.14795,0.117 -0.375092,0.2552 -0.399906,0.4603 -0.02719,0.2249 0.273496,0.5436 0.419774,0.6942 0.269806,0.2776 0.94144596,0.1452 1.30156896,0.1452 1.195948,0 2.38602,0.093 3.579274,0.094 0.484591,10e-5 1.499915,-0.2333 1.507669,0.4209 l 0.849457,0.034 0.658225,0.2929 c 0.10381,0.5702 0.67196,1.0804 1.12518,1.4055 1.3621296,0.977 3.3750496,1.093 4.7615896,0.071 1.25929,-0.9278 1.88583,-2.4403 1.67663,-3.9777 -0.0585,-0.4296 -0.34797,-0.8181 -0.40487,-1.2332 -0.40466,-0.3845 -0.66614,-0.8642 -1.13261,-1.1987 -0.7294,-0.5231 -1.62676,-0.7978 -2.51866,-0.7951 z m 1.977487,1.9028 c 0.71647,0 1.171798,0.8571 1.171798,2.1061 0,1.2489 -0.455318,2.0021 -1.171798,2.0021 -0.71647,0 -1.1406,-0.8051 -1.1406,-2.0541 0,-1.249 0.42412,-2.0541 1.1406,-2.0541 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccscccccccccccsssss" />
+    <path
+       id="path3892"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#000000;stroke-width:0.07912423"
+       d="m 1.3224884,1048.5355 c 8.505994,0.073 8.519864,-0.6897 -0.114796,-0.682"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-08-11T11:31:06</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/79417/simple-gold-key-by-milovanderlinden</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>milovanderlinden</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>gold</rdf:li>
+            <rdf:li>key</rdf:li>
+            <rdf:li>line art</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </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>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 13832)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 13833)
@@ -3013,6 +3013,6 @@
     set icon_z17;
 }
-node[craft=key_cutter][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=key_cutter] {
+    icon-image: "presets/misc/key_cutter.svg";
     set icon_z17;
 }
@@ -3033,6 +3033,6 @@
     set icon_z17;
 }
-node[craft=locksmith][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=locksmith] {
+    icon-image: "presets/misc/locksmith.svg";
     set icon_z17;
 }