Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 14997)
+++ /trunk/data/defaultpresets.xml	(revision 14998)
@@ -1193,5 +1193,5 @@
         </item> <!-- Turning Loop -->
         <item name="City Limit Sign" icon="presets/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
-            <link wiki="Key:traffic_sign" />
+            <link wiki="Tag:traffic_sign=city_limit" />
             <space />
             <key key="traffic_sign" value="city_limit" />
@@ -6443,5 +6443,5 @@
     </item> <!-- Shoemaker -->
     <separator/> <!-- other "soft"/art craft group -->
-    <item name="Sawmill" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Sawmill" icon="presets/craft/sawmill.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=sawmill" />
         <space />
@@ -7439,5 +7439,5 @@
         </group> <!-- Routes -->
         <item name="Route Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
-            <link wiki="Relations/Proposed/Network" />
+            <link wiki="Relation:network" />
             <space />
             <key key="type" value="network" />
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 14997)
+++ /trunk/data/validator/combinations.mapcss	(revision 14998)
@@ -267,7 +267,7 @@
 }
 
-/* {0.key} together with {1.key} (info level) */
+/* {0.key} together with {1.key}, #17604 */
 *[addr:street][addr:place] {
-  throwOther: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
   group: tr("suspicious tag combination");
 }
Index: /trunk/data/validator/territories.mapcss
===================================================================
--- /trunk/data/validator/territories.mapcss	(revision 14997)
+++ /trunk/data/validator/territories.mapcss	(revision 14998)
@@ -23,2 +23,9 @@
   assertNoMatch: "way name=Hauptstrasse";
 }
+
+/* #17484 */
+relation[type=associatedStreet][inside("DE")] {
+  throwWarning: tr("{0} is deprecated in {1}", "{0.tag}", "Deutschland");
+  suggestAlternative: "addr:street";
+  group: tr("deprecated tagging");
+}
Index: /trunk/images/presets/craft/sawmill.svg
===================================================================
--- /trunk/images/presets/craft/sawmill.svg	(revision 14998)
+++ /trunk/images/presets/craft/sawmill.svg	(revision 14998)
@@ -0,0 +1,415 @@
+<?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: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"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="160"
+   height="160"
+   sodipodi:docname="Saw2.svg">
+  <metadata
+     id="metadata2991">
+    <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>
+  <defs
+     id="defs2989">
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3785"
+       is_visible="true"
+       pattern="M 0,0 H 1"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3783"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3779"
+       is_visible="true"
+       pattern="M 0,0 H 1"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3777"
+       is_visible="true" />
+    <radialGradient
+       r="9.5"
+       gradientTransform="matrix(1,0,0,1.0033,0,-0.114)"
+       cx="15.312"
+       cy="34.655998"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3198"
+       id="radialGradient3204" />
+    <linearGradient
+       x1="14.496"
+       y1="29.879999"
+       gradientTransform="translate(-3,1)"
+       x2="26.737"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2895"
+       y2="42.563999"
+       id="linearGradient3191" />
+    <radialGradient
+       r="8.6875"
+       gradientTransform="matrix(1,0,0,0.9964,-26,1.1241)"
+       cx="42.5"
+       cy="34.5"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3187">
+      <stop
+         offset="0"
+         id="stop3027" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         id="stop3029" />
+    </radialGradient>
+    <linearGradient
+       x1="16.794001"
+       y1="30.676001"
+       gradientTransform="translate(-3,1)"
+       x2="22.052999"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2903"
+       y2="37.127998"
+       id="linearGradient3184" />
+    <linearGradient
+       x1="17.66"
+       y1="36.68"
+       x2="23.032"
+       gradientUnits="userSpaceOnUse"
+       y2="31.111"
+       id="linearGradient3179">
+      <stop
+         offset="0"
+         stop-color="#eeeeec"
+         id="stop3067" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         stop-color="#eeeeec"
+         id="stop3069" />
+    </linearGradient>
+    <linearGradient
+       x1="20.806999"
+       y1="36.825001"
+       x2="17.448999"
+       gradientUnits="userSpaceOnUse"
+       y2="30.900999"
+       id="linearGradient3177">
+      <stop
+         offset="0"
+         stop-color="#eeeeec"
+         id="stop3073" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         stop-color="#eeeeec"
+         id="stop3075" />
+    </linearGradient>
+    <linearGradient
+       x1="14.375"
+       y1="31.062"
+       x2="30.438"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2892"
+       y2="44.062"
+       id="linearGradient3171" />
+    <linearGradient
+       x1="28.357"
+       y1="22.795"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,-4.1168,6.7296)"
+       x2="17.732"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2892"
+       y2="5.1875"
+       id="linearGradient3122" />
+    <linearGradient
+       x1="16.488001"
+       y1="13.971"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,-4.1168,6.7297)"
+       x2="32.567001"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2892"
+       y2="30.757999"
+       id="linearGradient3120" />
+    <linearGradient
+       x1="21.788"
+       y1="21.877001"
+       gradientTransform="matrix(0.90911,-0.24359,0.24359,0.90911,8.6768,1.4171)"
+       x2="10.211"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2895"
+       y2="3.4233"
+       id="linearGradient3118" />
+    <radialGradient
+       r="11.125"
+       gradientTransform="matrix(0.97747,-0.26191,0.26191,0.97747,-2.4444,8.3897)"
+       cx="31"
+       cy="12"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3198"
+       id="radialGradient3116" />
+    <linearGradient
+       x1="17.413"
+       y1="7.8708"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,7.2816,0.75564)"
+       x2="17.028"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2892"
+       y2="52.505001"
+       id="linearGradient3114" />
+    <linearGradient
+       x1="22.965"
+       y1="35.311001"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,7.2816,0.75564)"
+       x2="12.641"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2903"
+       y2="11.424"
+       id="linearGradient3112" />
+    <linearGradient
+       id="linearGradient2895">
+      <stop
+         offset="0"
+         stop-color="#d3d7cf"
+         id="stop2897" />
+      <stop
+         offset="1"
+         stop-color="#888a85"
+         id="stop2899" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2903">
+      <stop
+         offset="0"
+         stop-color="#888a85"
+         id="stop2905" />
+      <stop
+         offset="1"
+         stop-color="#d3d7cf"
+         id="stop2907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2892">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop2894" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff"
+         id="stop2896" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3198">
+      <stop
+         offset="0"
+         id="stop3200" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         id="stop3202" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3198"
+       id="radialGradient4105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0033,0,-0.114)"
+       cx="15.312"
+       cy="34.655998"
+       r="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2903"
+       id="linearGradient4107"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,7.2816,0.75564)"
+       x1="22.965"
+       y1="35.311001"
+       x2="12.641"
+       y2="11.424" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,7.2816,0.75564)"
+       x1="17.413"
+       y1="7.8708"
+       x2="17.028"
+       y2="52.505001" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3198"
+       id="radialGradient4111"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97747,-0.26191,0.26191,0.97747,-2.4444,8.3897)"
+       cx="31"
+       cy="12"
+       r="11.125" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2895"
+       id="linearGradient4113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90911,-0.24359,0.24359,0.90911,8.6768,1.4171)"
+       x1="21.788"
+       y1="21.877001"
+       x2="10.211"
+       y2="3.4233" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,-4.1168,6.7297)"
+       x1="16.488001"
+       y1="13.971"
+       x2="32.567001"
+       y2="30.757999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96593,-0.25882,0.25882,0.96593,-4.1168,6.7296)"
+       x1="28.357"
+       y1="22.795"
+       x2="17.732"
+       y2="5.1875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2903"
+       id="linearGradient4127"
+       x1="69.190392"
+       y1="99.568954"
+       x2="333.44928"
+       y2="457.06537"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4137"
+       x1="720.95746"
+       y1="363.78055"
+       x2="800.31116"
+       y2="447.99667"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4147"
+       x1="-45.709007"
+       y1="267.43243"
+       x2="-145.90927"
+       y2="146.808"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2903"
+       id="linearGradient4153"
+       gradientUnits="userSpaceOnUse"
+       x1="69.190392"
+       y1="99.568954"
+       x2="333.44928"
+       y2="457.06537" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2892"
+       id="linearGradient4155"
+       gradientUnits="userSpaceOnUse"
+       x1="-45.709007"
+       y1="267.43243"
+       x2="-145.90927"
+       y2="146.808" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview2987"
+     showgrid="true"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="247.11357"
+     inkscape:cy="139.09446"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4565" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Drawing"
+     style="display:inline"
+     transform="translate(487.28467,-218.17057)">
+    <g
+       id="g4149"
+       transform="matrix(0.34579636,0,0,0.34724585,-493.27311,210.51518)">
+      <path
+         sodipodi:nodetypes="cccccscccccccccccsccccccccccsccccscccccscccccscccccscccccscccccscccccscccccsssss"
+         inkscape:connector-curvature="0"
+         id="path3771"
+         d="m 247.56629,24.345646 -50.9375,21.71875 -22.46875,41.59375 c 0,0 -0.30193,0.41959 -0.78125,1.03125 -4.72196,2.26844 -9.33001,4.74888 -13.8125,7.40625 -0.43624,0.0297 -0.88763,0.0625 -1.34375,0.0625 -11.39238,0 -18.15625,-10.75 -18.15625,-10.75 l 0.75,-14.625 -6.5625,-14.96875 -32.375,42.6875 v 52.031254 c 0,0 -4.414469,12.13879 -14.156254,13.875 -9.97653,1.79472 -16.96875,-3.4375 -16.96875,-3.4375 l -2.90625,-8.21875 -17.09375,-14.40625 -6.46875,55.34375 22.21875,41.96875 c 0,0 5.53609,11.30702 1.46875,17.46875 -6.194896,9.38483 -17.75,8.34375 -17.75,8.34375 l -28.71875,-9.78125 18.53125,49.65625 41.4375,25.03125 c 0,0 11.478902,6.95717 10.3125,17.0625 -0.7017,12.94051 -11.09375,15.5 -11.09375,15.5 l -11.65625,-0.125 -17.875,6.625 43.96875,34.53125 49.687504,1.09375 c 0,0 13.95797,1.49711 13.71875,16 -0.0978,5.92798 -5.28125,12.84375 -5.28125,12.84375 l -17.875,19.1875 53.625,7.4375 40.03125,-22.625 c -0.10575,-0.15863 13.52448,-5.71117 20.71875,1.09375 5.11529,4.83846 7.96875,15.5625 7.96875,15.5625 l -5.9375,9.65625 -2.78125,18.6875 49.90625,-19.59375 22.78125,-39.84375 c 0,0 6.5001,-11.13239 19.59375,-10.5625 7.65057,0.33298 15.34375,9.875 15.34375,9.875 l -1.03125,13.5 7.40625,16.15625 32.84375,-41.84375 -0.25,-48.03125 c 0,0 1.22616,-17.41269 13.46875,-20.96875 7.03747,-2.04415 15.625,5.71875 15.625,5.71875 l 7.4375,11.65625 12.96875,10.3125 7.40625,-56.125 -22.53125,-36.9375 c 0,0 -7.72513,-18.73165 1.1875,-25.8125 7.26897,-5.77501 14.71875,-4.53125 14.71875,-4.53125 l 9.03125,5.84375 20.90625,4.75 -22.5,-53.21875 -36.5625,-19 c 0,0 -12.64392,-11.96202 -12.375,-23.78125 0.15921,-6.99756 10.59375,-12.09375 10.59375,-12.09375 l 13.6875,0.75 16.09375,-7.65625 -41.6875,-32.59375 h -46.78125 c 0,0 -16.61523,-5.369173 -19.9375,-12.468754 -4.34895,-9.293572 4.46875,-19 4.46875,-19 l 9.1875,-3.9375 12.34375,-15.34375 -55.8125,-7.125 -39.4375,24.75 c -5.23291,-0.45746 -10.52336,-0.71875 -15.875,-0.71875 -1.88912,0 -3.78115,0.036 -5.65625,0.0937 -8.05223,-6.43364 -7,-17.5625 -7,-17.5625 l 6.9375,-11.25 2.0625,-17.96875 z m 3.65625,176.687504 c 27.61424,0 50,22.38576 50,50 0,27.61424 -22.38576,50 -50,50 -27.61424,0 -50,-22.38576 -50,-50 0,-27.61424 22.38576,-50 50,-50 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4153);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         transform="matrix(0.96403942,0,0,0.96403942,339.32975,49.12176)"
+         id="path4139"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient4155);stroke-width:5.18651009;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-91.199287"
+         cy="210.57761"
+         r="57.051609" />
+    </g>
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 14997)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 14998)
@@ -3017,6 +3017,6 @@
     set icon_z17;
 }
-node[craft=sawmill][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=sawmill] {
+    icon-image: "presets/craft/sawmill.svg";
     set icon_z17;
 }