Index: trunk/nodist/images/Mf_closedway.svg
===================================================================
--- trunk/nodist/images/Mf_closedway.svg	(revision 16976)
+++ trunk/nodist/images/Mf_closedway.svg	(revision 16976)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px">
+  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
+  <path d="m14,3 -11,7 14,7" fill="#cec"/>
+  <circle cx="16" cy="16" r="2"/>
+  <circle cx="14" cy="4" r="2"/>
+  <circle cx="4" cy="10" r="2"/>
+</svg>
Index: trunk/nodist/images/Mf_multipolygon.svg
===================================================================
--- trunk/nodist/images/Mf_multipolygon.svg	(revision 16976)
+++ trunk/nodist/images/Mf_multipolygon.svg	(revision 16976)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
+  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
+  <path d="m4,4h12v12h-12zm6,3l-3,3l6,2z" fill="#ece"/>
+  <path d="m4,2a2,2 0 1 1 -.001,0z
+    m12,0a2,2 0 1 1 -.001,0z
+    m0,12a2,2 0 1 1 -.001,0z
+    m-12,0a2,2 0 1 1 -.001,0z
+    m6,-8a1,1 0 1 1 -.001,0z
+    m-3,3a1,1 0 1 1 -.001,0z
+    m6,2a1,1 0 1 1 -.001,0z" fill="#000000"/>
+</svg>
Index: trunk/nodist/images/Mf_node.svg
===================================================================
--- trunk/nodist/images/Mf_node.svg	(revision 16976)
+++ trunk/nodist/images/Mf_node.svg	(revision 16976)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
+  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
+  <circle cx="10" cy="10" r="2" fill="#f88" stroke="#000"/>
+</svg>
Index: trunk/nodist/images/Mf_relation.svg
===================================================================
--- trunk/nodist/images/Mf_relation.svg	(revision 16976)
+++ trunk/nodist/images/Mf_relation.svg	(revision 16976)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
+  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
+  <path d="m4,10 12,6" stroke="#ece" stroke-width="2"/>
+  <circle cx="16" cy="16" r="2"/>
+  <circle cx="14" cy="4" r="2"/>
+  <circle cx="4" cy="10" r="2"/>
+</svg>
Index: trunk/nodist/images/Mf_way.svg
===================================================================
--- trunk/nodist/images/Mf_way.svg	(revision 16976)
+++ trunk/nodist/images/Mf_way.svg	(revision 16976)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px">
+  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
+  <path d="m14,4 -10,6 12,6" fill="none" stroke="#ade" stroke-width="2"/>
+  <circle cx="16" cy="16" r="2"/>
+  <circle cx="14" cy="4" r="2"/>
+  <circle cx="4" cy="10" r="2"/>
+</svg>
Index: trunk/nodist/images/Osm_element_area.svg
===================================================================
--- trunk/nodist/images/Osm_element_area.svg	(revision 16976)
+++ trunk/nodist/images/Osm_element_area.svg	(revision 16976)
@@ -0,0 +1,123 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Osm_element_area.svg"
+   id="svg22"
+   width="24"
+   height="24"
+   version="1.0">
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg22"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="12.355869"
+     inkscape:cx="11.490087"
+     inkscape:zoom="25.044602"
+     showgrid="false"
+     id="namedview24"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">OpenStreetMap area element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap area element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.09448819,0,0,0.09448819,-0.09448819,-0.09448819)"
+     id="g20">
+    <rect
+       id="rect6"
+       y="7"
+       x="7"
+       ry="32"
+       fill="#ffffff"
+       stroke="none"
+       height="242"
+       width="242" />
+    <path
+       id="path8"
+       d="M 169,58 57,145 195,199 Z"
+       fill="#bee6be" />
+    <g
+       id="g16">
+      <circle
+         id="circle10"
+         fill="#000000"
+         r="24"
+         cy="58"
+         cx="169" />
+      <circle
+         id="circle12"
+         fill="#000000"
+         r="24"
+         cy="145"
+         cx="57" />
+      <circle
+         id="circle14"
+         fill="#000000"
+         r="24"
+         cy="199"
+         cx="195" />
+    </g>
+    <rect
+       id="rect18"
+       y="7"
+       x="7"
+       ry="32"
+       stroke-width="12"
+       fill="none"
+       stroke="#000000"
+       height="242"
+       width="242" />
+  </g>
+</svg>
Index: trunk/resources/images/Mf_closedway.svg
===================================================================
--- trunk/resources/images/Mf_closedway.svg	(revision 16975)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px">
-  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
-  <path d="m14,3 -11,7 14,7" fill="#cec"/>
-  <circle cx="16" cy="16" r="2"/>
-  <circle cx="14" cy="4" r="2"/>
-  <circle cx="4" cy="10" r="2"/>
-</svg>
Index: trunk/resources/images/Mf_multipolygon.svg
===================================================================
--- trunk/resources/images/Mf_multipolygon.svg	(revision 16975)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
-  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
-  <path d="m4,4h12v12h-12zm6,3l-3,3l6,2z" fill="#ece"/>
-  <path d="m4,2a2,2 0 1 1 -.001,0z
-    m12,0a2,2 0 1 1 -.001,0z
-    m0,12a2,2 0 1 1 -.001,0z
-    m-12,0a2,2 0 1 1 -.001,0z
-    m6,-8a1,1 0 1 1 -.001,0z
-    m-3,3a1,1 0 1 1 -.001,0z
-    m6,2a1,1 0 1 1 -.001,0z" fill="#000000"/>
-</svg>
Index: trunk/resources/images/Mf_node.svg
===================================================================
--- trunk/resources/images/Mf_node.svg	(revision 16975)
+++ 	(revision )
@@ -1,5 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
-  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
-  <circle cx="10" cy="10" r="2" fill="#f88" stroke="#000"/>
-</svg>
Index: trunk/resources/images/Mf_relation.svg
===================================================================
--- trunk/resources/images/Mf_relation.svg	(revision 16975)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="20px" height="20px">
-  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
-  <path d="m4,10 12,6" stroke="#ece" stroke-width="2"/>
-  <circle cx="16" cy="16" r="2"/>
-  <circle cx="14" cy="4" r="2"/>
-  <circle cx="4" cy="10" r="2"/>
-</svg>
Index: trunk/resources/images/Mf_way.svg
===================================================================
--- trunk/resources/images/Mf_way.svg	(revision 16975)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="20px" height="20px">
-  <path d="m.5,1.5a1,1 0 0 1 1,-1h17a1,1 0 0 1 1,1v17a1,1 0 0 1 -1,1h-17a1,1 0 0 1 -1,-1z" fill="#fff" stroke="#6e6e6e"/>
-  <path d="m14,4 -10,6 12,6" fill="none" stroke="#ade" stroke-width="2"/>
-  <circle cx="16" cy="16" r="2"/>
-  <circle cx="14" cy="4" r="2"/>
-  <circle cx="4" cy="10" r="2"/>
-</svg>
Index: trunk/resources/images/Osm_element_closedway.svg
===================================================================
--- trunk/resources/images/Osm_element_closedway.svg	(revision 16976)
+++ trunk/resources/images/Osm_element_closedway.svg	(revision 16976)
@@ -0,0 +1,125 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Osm_element_closedway.svg"
+   id="svg22"
+   width="24"
+   height="24"
+   version="1.0">
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg22"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="11.179296"
+     inkscape:cx="10.562768"
+     inkscape:zoom="25.044602"
+     showgrid="false"
+     id="namedview24"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">OpenStreetMap closedway element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap closedway element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.09448819,0,0,0.09448819,-0.09448819,-0.09448819)"
+     id="g20">
+    <rect
+       id="rect6"
+       y="7"
+       x="7"
+       ry="32"
+       fill="#ffffff"
+       stroke="none"
+       height="242"
+       width="242" />
+    <path
+       id="path8"
+       d="M 169,58 57,145 195,199 Z"
+       stroke-width="16"
+       fill="none"
+       stroke="#a3d2dd" />
+    <g
+       id="g16">
+      <circle
+         id="circle10"
+         fill="#000000"
+         r="24"
+         cy="58"
+         cx="169" />
+      <circle
+         id="circle12"
+         fill="#000000"
+         r="24"
+         cy="145"
+         cx="57" />
+      <circle
+         id="circle14"
+         fill="#000000"
+         r="24"
+         cy="199"
+         cx="195" />
+    </g>
+    <rect
+       id="rect18"
+       y="7"
+       x="7"
+       ry="32"
+       stroke-width="12"
+       fill="none"
+       stroke="#000000"
+       height="242"
+       width="242" />
+  </g>
+</svg>
Index: trunk/resources/images/Osm_element_multipolygon.svg
===================================================================
--- trunk/resources/images/Osm_element_multipolygon.svg	(revision 16976)
+++ trunk/resources/images/Osm_element_multipolygon.svg	(revision 16976)
@@ -0,0 +1,112 @@
+<?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"
+   version="1.0"
+   height="24"
+   width="24"
+   id="svg22"
+   sodipodi:docname="Osm_element_multipolygon4.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     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="namedview24"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="8.6151667"
+     inkscape:cy="8.0395622"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg22">
+    <inkscape:grid
+       id="grid853"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <title
+     id="title2">OpenStreetMap area element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap area element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="stroke-width:0.0944882"
+     id="rect6"
+     y="0.56692916"
+     x="0.56692916"
+     ry="3.023622"
+     fill="#ffffff"
+     stroke="none"
+     height="22.866142"
+     width="22.866142" />
+  <rect
+     id="rect18"
+     y="0.56692916"
+     x="0.56692916"
+     ry="3.023622"
+     stroke-width="1.13386"
+     fill="none"
+     stroke="#000000"
+     height="22.866142"
+     width="22.866142" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     style="fill:#bee6be;fill-opacity:1;stroke-width:1.16667"
+     d="M 5,5 H 19 V 19 H 5 Z m 7,3 -3,4 7,2 z"
+     fill="#bee6be"
+     id="path4" />
+  <path
+     sodipodi:nodetypes="scssscssscssscssscssscssscss"
+     style="stroke-width:1.1376"
+     d="m 5.1673667,2.8892387 c 3.0328802,7.697e-4 3.0323028,4.5484087 -5.772e-4,4.547639 -3.0328799,0 -3.0334572,-4.547639 -5.774e-4,-4.547639 z m 13.6501123,0 c 3.032874,7.828e-4 3.032287,4.5484218 -5.88e-4,4.547639 -3.032872,0 -3.033459,-4.547639 -5.86e-4,-4.547639 z m 0,13.6523603 c 3.032874,7.83e-4 3.032287,4.548422 -5.88e-4,4.54764 -3.032872,0 -3.033459,-4.54764 -5.86e-4,-4.54764 z m -13.6501123,0 c 3.0328802,7.71e-4 3.0323028,4.548408 -5.772e-4,4.54764 -3.0328799,0 -3.0334572,-4.54764 -5.774e-4,-4.54764 z M 11.965617,6.8620355 c 1.516241,0 1.515653,2.2746035 -5.88e-4,2.2738208 -1.516241,0 -1.516829,-2.2738208 -5.88e-4,-2.2738208 z M 9.0164746,10.86319 c 1.5162484,0 1.5156704,2.274591 -5.772e-4,2.27382 -1.5162476,0 -1.5168249,-2.27382 -5.774e-4,-2.27382 z m 7.0087664,2.010877 c 1.516241,0 1.515654,2.274604 -5.87e-4,2.27382 -1.516241,0 -1.516829,-2.27382 -5.87e-4,-2.27382 z"
+     fill="#000000"
+     id="path6" />
+</svg>
Index: trunk/resources/images/Osm_element_node.svg
===================================================================
--- trunk/resources/images/Osm_element_node.svg	(revision 16976)
+++ trunk/resources/images/Osm_element_node.svg	(revision 16976)
@@ -0,0 +1,110 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Osm_element_node.svg"
+   id="svg14"
+   width="24"
+   height="24"
+   version="1.0">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg14"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="11.491843"
+     inkscape:cx="9.0983011"
+     inkscape:zoom="25.044602"
+     showgrid="false"
+     id="namedview16"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <inkscape:grid
+       id="grid843"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <title
+     id="title2">OpenStreetMap node element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap node element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.09448819,0,0,0.09448819,-0.09448819,-0.09448819)"
+     id="g12">
+    <rect
+       id="rect6"
+       y="7"
+       x="7"
+       ry="32"
+       fill="#ffffff"
+       stroke="none"
+       height="242"
+       width="242" />
+    <circle
+       id="circle8"
+       stroke-width="10"
+       stroke="#000000"
+       fill="#bee6be"
+       r="24"
+       cy="128"
+       cx="128" />
+    <rect
+       id="rect10"
+       y="7"
+       x="7"
+       ry="32"
+       stroke-width="12"
+       fill="none"
+       stroke="#000000"
+       height="242"
+       width="242" />
+  </g>
+</svg>
Index: trunk/resources/images/Osm_element_relation.svg
===================================================================
--- trunk/resources/images/Osm_element_relation.svg	(revision 16976)
+++ trunk/resources/images/Osm_element_relation.svg	(revision 16976)
@@ -0,0 +1,156 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Osm_element_relation.svg"
+   id="svg34"
+   width="24"
+   height="24"
+   version="1.0">
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg34"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="12.452738"
+     inkscape:cx="9.3271316"
+     inkscape:zoom="25.044602"
+     showgrid="false"
+     id="namedview36"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">OpenStreetMap relation element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap relation element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.09448819,0,0,0.09448819,-0.09448819,-0.09448819)"
+     id="g32">
+    <rect
+       id="rect6"
+       y="7"
+       x="7"
+       ry="32"
+       fill="#ffffff"
+       stroke="none"
+       height="242"
+       width="242" />
+    <g
+       id="g20">
+      <path
+         id="path8"
+         stroke="#cccccc"
+         stroke-width="16"
+         d="M 68,68 196,62" />
+      <path
+         id="path10"
+         stroke="#cccccc"
+         stroke-width="16"
+         d="m 68,68 128,74" />
+      <path
+         id="path12"
+         stroke="#cccccc"
+         stroke-width="16"
+         d="M 68,68 62,196" />
+      <circle
+         id="circle14"
+         fill="#000000"
+         r="24"
+         cy="62"
+         cx="196" />
+      <circle
+         id="circle16"
+         fill="#000000"
+         r="24"
+         cy="142"
+         cx="196" />
+      <circle
+         id="circle18"
+         fill="#000000"
+         r="24"
+         cy="196"
+         cx="62" />
+    </g>
+    <g
+       id="g28">
+      <path
+         id="path22"
+         stroke="#cccccc"
+         stroke-width="16"
+         d="m 68,68 74,128" />
+      <circle
+         id="circle24"
+         fill="#000000"
+         r="24"
+         cy="196"
+         cx="142" />
+      <circle
+         id="circle26"
+         stroke-width="8"
+         stroke="#000000"
+         fill="#bee6be"
+         r="32"
+         cy="72"
+         cx="72" />
+    </g>
+    <rect
+       id="rect30"
+       y="7"
+       x="7"
+       ry="32"
+       stroke-width="12"
+       fill="none"
+       stroke="#000000"
+       height="242"
+       width="242" />
+  </g>
+</svg>
Index: trunk/resources/images/Osm_element_way.svg
===================================================================
--- trunk/resources/images/Osm_element_way.svg	(revision 16976)
+++ trunk/resources/images/Osm_element_way.svg	(revision 16976)
@@ -0,0 +1,125 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Osm_element_way.svg"
+   id="svg22"
+   width="24"
+   height="24"
+   version="1.0">
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg22"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:cy="11.932612"
+     inkscape:cx="10.473586"
+     inkscape:zoom="25.291339"
+     showgrid="false"
+     id="namedview24"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">OpenStreetMap way element icon</title>
+  <metadata
+     id="metadata4">
+    <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>OpenStreetMap way element icon</dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:date>2014-03-10</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>https://wiki.openstreetmap.org/wiki/User:Moresby</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.09448819,0,0,0.09448819,-0.09448819,-0.09448819)"
+     id="g20">
+    <rect
+       id="rect6"
+       y="7"
+       x="7"
+       ry="32"
+       fill="#ffffff"
+       stroke="none"
+       height="242"
+       width="242" />
+    <path
+       id="path8"
+       d="M 169,58 57,145 195,199"
+       stroke-width="16"
+       fill="none"
+       stroke="#cccccc" />
+    <g
+       id="g16">
+      <circle
+         id="circle10"
+         fill="#000000"
+         r="24"
+         cy="58"
+         cx="169" />
+      <circle
+         id="circle12"
+         fill="#000000"
+         r="24"
+         cy="145"
+         cx="57" />
+      <circle
+         id="circle14"
+         fill="#000000"
+         r="24"
+         cy="199"
+         cx="195" />
+    </g>
+    <rect
+       id="rect18"
+       y="7"
+       x="7"
+       ry="32"
+       stroke-width="12"
+       fill="none"
+       stroke="#000000"
+       height="242"
+       width="242" />
+  </g>
+</svg>
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java	(revision 16975)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java	(revision 16976)
@@ -13,13 +13,13 @@
 public enum TaggingPresetType {
     /** Node */
-    NODE(/* ICON */ "Mf_node", "node"),
+    NODE(/* ICON */ "Osm_element_node", "node"),
     /** Way */
-    WAY(/* ICON */ "Mf_way", "way"),
+    WAY(/* ICON */ "Osm_element_way", "way"),
     /** Relation */
-    RELATION(/* ICON */ "Mf_relation", "relation"),
+    RELATION(/* ICON */ "Osm_element_relation", "relation"),
     /** Closed way */
-    CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway"),
+    CLOSEDWAY(/* ICON */ "Osm_element_closedway", "closedway"),
     /** Multipolygon */
-    MULTIPOLYGON(/* ICON */ "Mf_multipolygon", "multipolygon");
+    MULTIPOLYGON(/* ICON */ "Osm_element_multipolygon", "multipolygon");
     private final String iconName;
     private final String name;