Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 17018)
+++ /trunk/resources/data/defaultpresets.xml	(revision 17019)
@@ -7493,5 +7493,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Beekeeper -->
-    <item name="Brewery" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Brewery" icon="presets/craft/brewery.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=brewery" />
         <space />
@@ -7500,5 +7500,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Brewery -->
-    <item name="Winery" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Winery" icon="presets/craft/winery.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=winery" />
         <space />
@@ -7600,5 +7600,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Photographer -->
-    <item name="Handicraft" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Handicraft" icon="presets/craft/handicraft.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=handicraft" />
         <space />
Index: /trunk/resources/images/presets/craft/brewery.svg
===================================================================
--- /trunk/resources/images/presets/craft/brewery.svg	(revision 17019)
+++ /trunk/resources/images/presets/craft/brewery.svg	(revision 17019)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="brewery4.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.660069"
+     inkscape:cx="8.8944671"
+     inkscape:cy="9.603864"
+     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:document-rotation="0">
+    <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,-1029.3622)">
+    <path
+       style="fill:#ab4c20;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 16,1045.3622 H 0 v -4 c 0,-3 7,-3.3723 7,-5.3723 v -5.6277 c 0.4320597,-0.6993 1.5512361,-0.6868 2,0 v 5.6277 c 0,2 7,2.3723 7,5.3723 z"
+       id="path831"
+       sodipodi:nodetypes="ccccccccc" />
+    <ellipse
+       style="fill:#ab4c20;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-linecap:square;stroke-linejoin:round"
+       id="path833"
+       cx="8"
+       cy="1033.8622"
+       rx="2.25"
+       ry="1" />
+    <path
+       style="fill:#d5845f;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 4,1041.3622 h 8 l -2,-2 H 6 Z"
+       id="path835"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/craft/handicraft.svg
===================================================================
--- /trunk/resources/images/presets/craft/handicraft.svg	(revision 17019)
+++ /trunk/resources/images/presets/craft/handicraft.svg	(revision 17019)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="Vaso-gen2.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   height="16"
+   width="11">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4148"
+       inkscape:collect="always">
+      <stop
+         id="stop4150"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4152"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3020"
+       inkscape:collect="always">
+      <stop
+         id="stop3022"
+         offset="0"
+         style="stop-color:#0c0a09;stop-opacity:1" />
+      <stop
+         id="stop3024"
+         offset="1"
+         style="stop-color:#ff9955;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3002">
+      <stop
+         id="stop3004"
+         offset="0"
+         style="stop-color:#2b1100;stop-opacity:1" />
+      <stop
+         style="stop-color:#552200;stop-opacity:1"
+         offset="0.22647026"
+         id="stop3016" />
+      <stop
+         style="stop-color:#aa4400;stop-opacity:1"
+         offset="0.43320349"
+         id="stop3014" />
+      <stop
+         style="stop-color:#d45500;stop-opacity:1"
+         offset="0.63955581"
+         id="stop3012" />
+      <stop
+         style="stop-color:#ff7f2a;stop-opacity:1"
+         offset="0.82512945"
+         id="stop3010" />
+      <stop
+         id="stop3006"
+         offset="1"
+         style="stop-color:#ff9955;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="523.04224"
+       x2="636.39612"
+       y1="519.00165"
+       x1="123.23861"
+       id="linearGradient3008"
+       xlink:href="#linearGradient3002"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5853452,-0.05837025,0.01233656,0.4883433,-212.19091,101.44674)"
+       r="164.13457"
+       fy="253.28195"
+       fx="357.27026"
+       cy="253.28195"
+       cx="357.27026"
+       id="radialGradient3796"
+       xlink:href="#linearGradient3020"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="572.76416"
+       x2="863.72003"
+       y1="599.30231"
+       x1="193.87831"
+       id="linearGradient4154"
+       xlink:href="#linearGradient4148"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     units="px"
+     inkscape:document-rotation="0"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="11.001429"
+     inkscape:cx="6.4908205"
+     inkscape:zoom="31.215134"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       id="grid850"
+       type="xygrid" />
+  </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:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-118.18603,-139.70459)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Camada 1">
+    <g
+       transform="matrix(0.01948035,0,0,0.01911645,115.88354,137.03421)"
+       id="g4156">
+      <path
+         style="fill:url(#linearGradient3008);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 595.04177,168.91751 c -47.90783,20.23011 -136.57236,19.70214 -194.51047,22.92619 -63.14946,2.05735 -180.95693,-3.92308 -198.92304,-25.1481 32.99448,18.17822 46.3775,64.88217 61.01679,95.74185 3.41113,54.8983 5.91028,109.34061 -4.0313,157.56255 -112.20134,41.40137 -133.67824,100.96021 -139.40625,163.65625 5.38748,167.20627 158.26273,363.51016 220.21875,392 l 59.78125,-0.0625 h 2.6875 l 59.78125,0.0625 c 61.95602,-28.48984 214.83127,-224.79373 220.21875,-392 C 676.14699,520.96021 654.67009,461.40137 542.46875,420 c -14.30595,-49.93048 -5.28884,-104.52557 -4.0625,-157.5625 19.95985,-42.82078 30.94353,-79.10788 56.63552,-93.51999 z"
+         id="path2985"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         style="fill:url(#linearGradient4154);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 238.875,209.90625 c 9.61094,18.02889 16.70738,37.68538 23.75,52.53125 l 1.65505,17.25 c 95.20763,20.97427 182.30755,17.01975 272.14104,0.375 l 1.98516,-17.625 c 7.04347,-14.84766 14.12925,-34.5016 23.75,-52.53125 -102.66091,22.94777 -209.85163,25.5114 -323.28125,0 z M 127.6875,537.1875 c -4.62803,15.13607 -7.05902,30.69646 -8.5,46.46875 0.53158,16.49818 2.51314,33.28065 5.6875,50.15625 183.8125,29.09303 367.625,34.69533 551.4375,-0.75 3.09256,-16.62437 5.03875,-33.15097 5.5625,-49.40625 -1.44098,-15.77229 -3.87197,-31.33268 -8.5,-46.46875 -184.70747,30.92803 -366.36533,28.31031 -545.6875,0 z m 88.59375,307.09375 c 44.60909,67.29729 93.94452,117.95665 123.125,131.375 l 59.78125,-0.0625 h 2.6875 l 59.78125,0.0625 c 29.18048,-13.41835 78.51591,-64.07771 123.125,-131.375 -106.23212,26.08762 -224.66445,33.00348 -368.5,0 z"
+         id="path2991"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccccc" />
+      <ellipse
+         ry="25.253813"
+         rx="162.63457"
+         cy="174.53963"
+         cx="356.58386"
+         style="fill:url(#radialGradient3796);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3018"
+         transform="matrix(1.207256,0,0,1,-32.115934,-8.0812204)" />
+    </g>
+  </g>
+</svg>
Index: /trunk/resources/images/presets/craft/winery.svg
===================================================================
--- /trunk/resources/images/presets/craft/winery.svg	(revision 17019)
+++ /trunk/resources/images/presets/craft/winery.svg	(revision 17019)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   sodipodi:docname="winery1.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 16 10"
+   height="10"
+   width="16">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     viewbox-height="16"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="6.5836088"
+     inkscape:cx="5.4550743"
+     inkscape:zoom="22.627417"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       spacingy="1"
+       spacingx="1"
+       originy="0"
+       originx="0"
+       id="grid4136"
+       type="xygrid" />
+  </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
+     transform="translate(0,-1029.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       r="2.25"
+       cy="1036.8622"
+       cx="2.5"
+       id="path831"
+       style="fill:#a05a2c;stroke:#784421;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <circle
+       r="2.25"
+       style="fill:#a05a2c;stroke:#784421;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path831-6"
+       cx="8"
+       cy="1036.8622" />
+    <circle
+       r="2.25"
+       style="fill:#a05a2c;stroke:#784421;stroke-width:0.500001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path831-3"
+       cx="13.5"
+       cy="1036.8622" />
+    <circle
+       style="fill:#a05a2c;stroke:#784421;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path831-1"
+       cx="5.25"
+       cy="1031.8622"
+       r="2.25" />
+    <circle
+       cy="1031.8622"
+       cx="10.75"
+       id="path831-6-9"
+       style="fill:#a05a2c;stroke:#784421;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       r="2.25" />
+  </g>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17018)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17019)
@@ -3367,6 +3367,6 @@
     set icon_z17;
 }
-node[craft=brewery][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=brewery] {
+    icon-image: "presets/craft/brewery.svg";
     set icon_z17;
 }
@@ -3383,6 +3383,6 @@
     set icon_z17;
 }
-node[craft=winery][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=winery] {
+    icon-image: "presets/craft/winery.svg";
     set icon_z17;
 }
@@ -3399,6 +3399,6 @@
     set icon_z17;
 }
-node[craft=handicraft][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=handicraft] {
+    icon-image: "presets/craft/handicraft.svg";
     set icon_z17;
 }