Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15932)
+++ trunk/data/defaultpresets.xml	(revision 15933)
@@ -943,9 +943,9 @@
             <space />
             <combo key="tracktype" text="Tracktype" values_searchable="true" values_sort="false">
-                <list_entry value="grade1" short_description="Solid: paved or heavily compacted hardcore surface" />
-                <list_entry value="grade2" short_description="Mostly Solid: gravel/rock with some soft material mixed in" />
-                <list_entry value="grade3" short_description="Even mixture of hard and soft materials" />
-                <list_entry value="grade4" short_description="Mostly Soft: soil/sand/grass with some hard material mixed in" />
-                <list_entry value="grade5" short_description="Soft: soil/sand/grass" />
+                <list_entry value="grade1" icon="presets/transport/way/tracktype_grade1.svg" short_description="Solid: paved or heavily compacted hardcore surface" />
+                <list_entry value="grade2" icon="presets/transport/way/tracktype_grade2.svg" short_description="Mostly Solid: gravel/rock with some soft material mixed in" />
+                <list_entry value="grade3" icon="presets/transport/way/tracktype_grade3.svg" short_description="Even mixture of hard and soft materials" />
+                <list_entry value="grade4" icon="presets/transport/way/tracktype_grade4.svg" short_description="Mostly Soft: soil/sand/grass with some hard material mixed in" />
+                <list_entry value="grade5" icon="presets/transport/way/tracktype_grade5.svg" short_description="Soft: soil/sand/grass" />
             </combo>
             <key key="highway" value="track" />
Index: trunk/images/presets/transport/way/tracktype_grade1.svg
===================================================================
--- trunk/images/presets/transport/way/tracktype_grade1.svg	(revision 15933)
+++ trunk/images/presets/transport/way/tracktype_grade1.svg	(revision 15933)
@@ -0,0 +1,94 @@
+<?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="16"
+   height="2"
+   viewBox="0 0 16 2"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="tracktype_grade1.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.405387"
+     inkscape:cx="8.297901"
+     inkscape:cy="1.0545581"
+     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 />
+        <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,-1051.3622)">
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06904256;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818"
+       width="1.9999911"
+       height="8"
+       x="-1053.3622"
+       y="-7.9985981"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06904256;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-5"
+       width="1.9999911"
+       height="8"
+       x="-1053.3622"
+       y="-16.998598"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+  </g>
+</svg>
Index: trunk/images/presets/transport/way/tracktype_grade2.svg
===================================================================
--- trunk/images/presets/transport/way/tracktype_grade2.svg	(revision 15933)
+++ trunk/images/presets/transport/way/tracktype_grade2.svg	(revision 15933)
@@ -0,0 +1,94 @@
+<?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="16"
+   height="2"
+   viewBox="0 0 16 2"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="tracktype_grade2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.499855"
+     inkscape:cx="5.0900636"
+     inkscape:cy="1.7753517"
+     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 />
+        <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,-1051.3622)">
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.92581803;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9"
+       width="1.9999911"
+       height="6"
+       x="-1053.3622"
+       y="-5.9985933"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.92581803;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-3"
+       width="1.9999911"
+       height="6"
+       x="-1053.3622"
+       y="-13.998593"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+  </g>
+</svg>
Index: trunk/images/presets/transport/way/tracktype_grade3.svg
===================================================================
--- trunk/images/presets/transport/way/tracktype_grade3.svg	(revision 15933)
+++ trunk/images/presets/transport/way/tracktype_grade3.svg	(revision 15933)
@@ -0,0 +1,94 @@
+<?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="16"
+   height="2"
+   viewBox="0 0 16 2"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="tracktype_grade3.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.499855"
+     inkscape:cx="3.1476816"
+     inkscape:cy="5.6662282"
+     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 />
+        <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,-1051.3622)">
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4"
+       width="1.9999911"
+       height="4"
+       x="-1053.3622"
+       y="-3.9985936"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4-8"
+       width="1.9999911"
+       height="4"
+       x="-1053.3622"
+       y="-10.998594"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+  </g>
+</svg>
Index: trunk/images/presets/transport/way/tracktype_grade4.svg
===================================================================
--- trunk/images/presets/transport/way/tracktype_grade4.svg	(revision 15933)
+++ trunk/images/presets/transport/way/tracktype_grade4.svg	(revision 15933)
@@ -0,0 +1,94 @@
+<?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="16"
+   height="2"
+   viewBox="0 0 16 2"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="tracktype_grade4.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.499855"
+     inkscape:cx="5.636589"
+     inkscape:cy="0.83205695"
+     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 />
+        <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,-1051.3622)">
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4-1"
+       width="1.9999911"
+       height="4"
+       x="-1053.3622"
+       y="-3.9985962"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4-9"
+       width="1.9999911"
+       height="4"
+       x="-1053.3622"
+       y="-12.998596"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+  </g>
+</svg>
Index: trunk/images/presets/transport/way/tracktype_grade5.svg
===================================================================
--- trunk/images/presets/transport/way/tracktype_grade5.svg	(revision 15933)
+++ trunk/images/presets/transport/way/tracktype_grade5.svg	(revision 15933)
@@ -0,0 +1,94 @@
+<?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="16"
+   height="2"
+   viewBox="0 0 16 2"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="tracktype_grade5.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.202694"
+     inkscape:cx="0.72416271"
+     inkscape:cy="11.004183"
+     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 />
+        <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,-1051.3622)">
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4-1-9"
+       width="1.9999911"
+       height="4"
+       x="-1053.3623"
+       y="-3.9985933"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+    <rect
+       style="opacity:1;fill:#6e541c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.75592726;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.44520551;paint-order:normal"
+       id="rect818-9-4-9-2"
+       width="1.9999911"
+       height="4"
+       x="-1053.3623"
+       y="-14.998593"
+       transform="matrix(-1.3351828e-6,-1,-1,5.3406838e-6,0,0)" />
+  </g>
+</svg>