Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18997)
+++ trunk/resources/data/defaultpresets.xml	(revision 19015)
@@ -651,18 +651,18 @@
     <chunk id="crossing_markings">
         <multiselect key="crossing:markings" text="Markings" values_sort="false" values_context="crossing:markings">
-            <list_entry value="no" />
-            <list_entry value="yes" />
-            <list_entry value="surface" />
-            <list_entry value="lines" />
-            <list_entry value="lines:paired" />
-            <list_entry value="dashes" />
-            <list_entry value="dots" />
-            <list_entry value="zebra" />
-            <list_entry value="zebra:double" />
-            <list_entry value="zebra:paired" />
-            <list_entry value="zebra:bicolour" />
-            <list_entry value="ladder" />
-            <list_entry value="ladder:skewed" />
-            <list_entry value="ladder:paired" />
+            <list_entry value="no" icon="presets/vehicle/crossing_unmarked.svg" />
+            <list_entry value="yes" icon="presets/vehicle/crossing.svg" />
+            <list_entry value="surface" icon="presets/vehicle/crossing_markings_surface.svg" />
+            <list_entry value="lines" icon="presets/vehicle/crossing_markings_lines.svg" />
+            <list_entry value="lines:paired" icon="presets/vehicle/crossing_markings_lines_paired.svg" />
+            <list_entry value="dashes" icon="presets/vehicle/crossing_markings_dashes.svg" />
+            <list_entry value="dots" icon="presets/vehicle/crossing_markings_dots.svg" />
+            <list_entry value="zebra" icon="presets/vehicle/crossing_ref_zebra.svg" />
+            <list_entry value="zebra:double" icon="presets/vehicle/crossing_markings_zebra_double.svg" />
+            <list_entry value="zebra:paired" icon="presets/vehicle/crossing_markings_zebra_paired.svg" />
+            <list_entry value="zebra:bicolour" icon="presets/vehicle/crossing_markings_zebra_bicolour.svg" />
+            <list_entry value="ladder" icon="presets/vehicle/crossing_markings_ladder.svg" />
+            <list_entry value="ladder:skewed" icon="presets/vehicle/crossing_markings_ladder_skewed.svg" />
+            <list_entry value="ladder:paired" icon="presets/vehicle/crossing_markings_ladder_paired.svg" />
             <list_entry value="pictograms" />
         </multiselect>
Index: trunk/resources/images/presets/vehicle/crossing_markings_dashes.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_dashes.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_dashes.svg	(revision 19015)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect4"
+       width="1"
+       height="2"
+       x="5"
+       y="0.25" />
+    <rect
+       style="fill:#ffffff"
+       id="rect5"
+       width="1"
+       height="2"
+       x="10"
+       y="4.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect1"
+       width="1"
+       height="2"
+       x="10"
+       y="0.25" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2"
+       width="1"
+       height="2"
+       x="5"
+       y="4.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3"
+       width="1"
+       height="1.5"
+       x="10"
+       y="2.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect6"
+       width="1"
+       height="1.5"
+       x="5"
+       y="2.75" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_dots.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_dots.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_dots.svg	(revision 19015)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect4"
+       width="1"
+       height="1"
+       x="5"
+       y="1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect5"
+       width="1"
+       height="1"
+       x="10"
+       y="5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect1"
+       width="1"
+       height="1"
+       x="10"
+       y="1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2"
+       width="1"
+       height="1"
+       x="5"
+       y="5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3"
+       width="1"
+       height="1"
+       x="10"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect6"
+       width="1"
+       height="1"
+       x="5"
+       y="3" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_ladder.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_ladder.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_ladder.svg	(revision 19015)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff;stroke-width:0.925818"
+       id="rect5"
+       width="1"
+       height="7"
+       x="10"
+       y="0" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect2"
+       width="1"
+       height="7"
+       x="5"
+       y="0" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect6"
+       width="4"
+       height="1"
+       x="6"
+       y="1" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect7"
+       width="4"
+       height="1"
+       x="6"
+       y="3" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect8"
+       width="4"
+       height="1"
+       x="6"
+       y="5" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_ladder_paired.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_ladder_paired.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_ladder_paired.svg	(revision 19015)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect5"
+       width="1"
+       height="7"
+       x="10"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2"
+       width="1"
+       height="7"
+       x="5"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect6"
+       width="4"
+       height="0.5002"
+       x="6"
+       y="0.25" />
+    <rect
+       style="fill:#ffffff"
+       id="rect7"
+       width="4"
+       height="0.5"
+       x="6"
+       y="1.25" />
+    <rect
+       style="fill:#ffffff"
+       id="rect8"
+       width="4"
+       height="0.5"
+       x="6"
+       y="2.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect10"
+       width="4"
+       height="0.5"
+       x="6"
+       y="3.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect11"
+       width="4"
+       height="0.5"
+       x="6"
+       y="5.25" />
+    <rect
+       style="fill:#ffffff"
+       id="rect12"
+       width="4"
+       height="0.5"
+       x="6"
+       y="6.25" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_ladder_skewed.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_ladder_skewed.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_ladder_skewed.svg	(revision 19015)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect5"
+       width="1"
+       height="7"
+       x="10"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2"
+       width="1"
+       height="7"
+       x="5"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect6"
+       width="7"
+       height="1"
+       x="1.803"
+       y="5.51"
+       transform="rotate(-45)" />
+    <rect
+       style="fill:#ffffff"
+       id="rect7"
+       width="7"
+       height="1"
+       x="-0.318"
+       y="7.632"
+       transform="rotate(-45)" />
+    <rect
+       style="fill:#ffffff"
+       id="rect8"
+       width="7"
+       height="1"
+       x="-2.439"
+       y="9.753"
+       transform="rotate(-45)" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_lines.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_lines.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_lines.svg	(revision 19015)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect4"
+       width="1"
+       height="7"
+       x="5"
+       y="0" />
+    <rect
+       style="fill:#ffffff;stroke-width:16"
+       id="rect5"
+       width="1"
+       height="7"
+       x="10"
+       y="0" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_lines_paired.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_lines_paired.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_lines_paired.svg	(revision 19015)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect4"
+       width="0.5"
+       height="7"
+       x="5"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect5"
+       width="0.5"
+       height="7"
+       x="10.5"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect6"
+       width="0.5"
+       height="7"
+       x="6"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect7"
+       width="0.5"
+       height="7"
+       x="9.5"
+       y="0" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_surface.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_surface.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_surface.svg	(revision 19015)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#800000"
+       id="rect2"
+       width="6"
+       height="7"
+       x="5"
+       y="0" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_zebra_bicolour.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_zebra_bicolour.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_zebra_bicolour.svg	(revision 19015)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786"
+       width="6"
+       height="1"
+       x="5"
+       y="1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3788"
+       width="6"
+       height="1"
+       x="5"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3790"
+       width="6"
+       height="1"
+       x="5"
+       y="5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffdd55"
+       id="rect1"
+       width="6"
+       height="1"
+       x="5"
+       y="2" />
+    <rect
+       style="fill:#ffdd55"
+       id="rect2"
+       width="6"
+       height="1"
+       x="5"
+       y="4" />
+    <rect
+       style="fill:#ffdd55"
+       id="rect3"
+       width="6"
+       height="1"
+       x="5"
+       y="6" />
+    <rect
+       style="fill:#ffdd55"
+       id="rect4"
+       width="6"
+       height="1"
+       x="5"
+       y="0" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_zebra_double.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_zebra_double.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_zebra_double.svg	(revision 19015)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786"
+       width="2.5"
+       height="1"
+       x="5"
+       y="1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786-9"
+       width="2.5"
+       height="1"
+       x="8.5"
+       y="1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786-9-7"
+       width="2.5"
+       height="1"
+       x="8.5"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786-9-0"
+       width="2.5"
+       height="1"
+       x="8.5"
+       y="5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3788"
+       width="2.5"
+       height="1"
+       x="5"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3790"
+       width="2.5"
+       height="1"
+       x="5"
+       y="5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_markings_zebra_paired.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_markings_zebra_paired.svg	(revision 19015)
+++ trunk/resources/images/presets/vehicle/crossing_markings_zebra_paired.svg	(revision 19015)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3046" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#999999"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3786"
+       width="6"
+       height="0.75"
+       x="5"
+       y="1.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3788"
+       width="6"
+       height="0.75"
+       x="5"
+       y="4.5" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3790"
+       width="6"
+       height="0.75"
+       x="5"
+       y="5.75" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="2"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="0"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="12"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="15"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect1"
+       width="6"
+       height="0.75"
+       x="5"
+       y="0.5" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg
===================================================================
--- trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg	(revision 18997)
+++ trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg	(revision 19015)
@@ -3,41 +3,15 @@
 
 <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="7"
    id="svg3044"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="02.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3046" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="8.3073656"
-     inkscape:cy="-4.3213805"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="988"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata3049">
@@ -48,69 +22,65 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-492,-423.14789)">
+     id="layer1">
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:none"
+       style="fill:#999999"
        id="rect3784"
        width="16"
        height="7"
-       x="492"
-       y="423.14789" />
+       x="0"
+       y="0" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3786"
        width="6"
        height="1"
-       x="497"
-       y="424.14789" />
+       x="5"
+       y="1" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3788"
        width="6"
        height="1"
-       x="497"
-       y="426.14789" />
+       x="5"
+       y="3" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3790"
        width="6"
        height="1"
-       x="497"
-       y="428.14789" />
+       x="5"
+       y="5" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3853"
        width="2"
        height="1"
-       x="494"
-       y="426.14789" />
+       x="2"
+       y="3" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3855"
        width="1"
        height="1"
-       x="492"
-       y="426.14789" />
+       x="0"
+       y="3" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3857"
        width="2"
        height="1"
-       x="504"
-       y="426.14789" />
+       x="12"
+       y="3" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff"
        id="rect3859"
        width="1"
        height="1"
-       x="507"
-       y="426.14789" />
+       x="15"
+       y="3" />
   </g>
 </svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 18997)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 19015)
@@ -834,5 +834,50 @@
     set icon_z17;
 }
-node[highway=crossing][crossing_ref=zebra] {
+node[highway=crossing]["crossing:markings"=surface] {
+    icon-image: "presets/vehicle/crossing_markings_surface.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"=lines] {
+    icon-image: "presets/vehicle/crossing_markings_lines.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="lines:paired"] {
+    icon-image: "presets/vehicle/crossing_markings_lines_paired.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"=dashes] {
+    icon-image: "presets/vehicle/crossing_markings_dashes.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"=dots] {
+    icon-image: "presets/vehicle/crossing_markings_dots.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="zebra:double"] {
+    icon-image: "presets/vehicle/crossing_markings_zebra_double.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="zebra:paired"] {
+    icon-image: "presets/vehicle/crossing_markings_zebra_paired.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="zebra:bicolour"] {
+    icon-image: "presets/vehicle/crossing_markings_zebra_bicolour.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"=ladder] {
+    icon-image: "presets/vehicle/crossing_markings_ladder.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="ladder:skewed"] {
+    icon-image: "presets/vehicle/crossing_markings_ladder_skewed.svg";
+    set icon_z17;
+}
+node[highway=crossing]["crossing:markings"="ladder:paired"] {
+    icon-image: "presets/vehicle/crossing_markings_ladder_paired.svg";
+    set icon_z17;
+}
+node[highway=crossing][crossing_ref=zebra],
+node[highway=crossing]["crossing:markings"=zebra] {
     icon-image: "presets/vehicle/crossing_ref_zebra.svg";
     set icon_z17;