diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-dashes.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-dashes.svg
index 319a26aca..cbf37f91c 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-dashes.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-dashes.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     d="m 0.625,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.75,1.25;stroke-dashoffset:0.875;stroke-opacity:1" />
-  <path
-     d="m 10.375,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.75,1.25;stroke-dashoffset:0.875;stroke-opacity:1" />
+  <path d="m 0.625,0 v 17 0" stroke="currentColor" stroke-width="1.25" stroke-linecap="butt" stroke-dasharray="3.75,1.25" stroke-dashoffset="0.875" />
+  <path d="m 10.375,0 v 17 0" stroke="currentColor" stroke-width="1.25" stroke-linecap="butt" stroke-dasharray="3.75,1.25" stroke-dashoffset="0.875" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-dots.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-dots.svg
index 756aecff7..e6f566030 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-dots.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-dots.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     d="m 0.75,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5,1.5;stroke-dashoffset:0;stroke-opacity:1" />
-  <path
-     d="m 10.25,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5,1.5;stroke-dashoffset:0;stroke-opacity:1" />
+  <path d="m 0.75,0 v 17 0" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" stroke-dasharray="1.5,1.5" />
+  <path d="m 10.25,0 v 17 0" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" stroke-dasharray="1.5,1.5" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder.svg
index 730af04a5..559f3591a 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder.svg
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 0.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 11,2.25 H 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 11,6.416667 H 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 11,10.583333 H 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 11,14.75 H 0" />
+  <path d="m 0.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 10.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="M 11,2.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,6.416667 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,10.583333 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,14.75 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_paired.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_paired.svg
index 1434b1bb2..0f3d07f49 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_paired.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_paired.svg
@@ -1,33 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 0.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,0 v 17 0" />
+  <path d="m 0.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 10.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
   <g transform="translate(-47,-44)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,45.5 H 47" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,47.5 H 47" />
+    <path d="M 58,45.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+    <path d="M 58,47.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
   </g>
   <g transform="translate(-47,-32)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,45.5 H 47" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,47.5 H 47" />
+    <path d="M 58,45.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+    <path d="M 58,47.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
   </g>
   <g transform="translate(-47,-38)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,45.5 H 47" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 58,47.5 H 47" />
+    <path d="M 58,45.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+    <path d="M 58,47.5 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
   </g>
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_skewed.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_skewed.svg
index 7b24eefb6..61e1be3fb 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_skewed.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-ladder_skewed.svg
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 0.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,3.071272 -10,-2" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,7.3704316 -10,-2" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10.5,11.669591 0.5,9.6695906" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,15.96875 -10,-2" />
+  <path d="m 0.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 10.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 10.5,3.071272 -10,-2" stroke="currentColor" stroke-width="2" stroke-linecap="butt" />
+  <path d="m 10.5,7.3704316 -10,-2" stroke="currentColor" stroke-width="2" stroke-linecap="butt" />
+  <path d="M 10.5,11.669591 0.5,9.6695906" stroke="currentColor" stroke-width="2" stroke-linecap="butt" />
+  <path d="m 10.5,15.96875 -10,-2" stroke="currentColor" stroke-width="2" stroke-linecap="butt" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines.svg
index 7d06fff7e..a121e2d39 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     d="m 0.75,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="m 10.25,0 v 17 0"
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path d="m 0.75,0 v 17 0" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" />
+  <path d="m 10.25,0 v 17 0" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines_paired.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines_paired.svg
index 6ea40bb49..941b38518 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines_paired.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-lines_paired.svg
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 0.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 2.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 8.5,0 v 17 0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 10.5,0 v 17 0" />
+  <path d="m 0.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 2.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 8.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+  <path d="m 10.5,0 v 17 0" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-surface.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-surface.svg
index 7dfc3b80f..5abb9037b 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-surface.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-surface.svg
@@ -1,34 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
   <defs>
-    <pattern
-       patternTransform="matrix(0.97434076,-0.97214623,0.96995664,0.97214623,-0.2343755,0.6906405)"
-       id="pattern4249"
-       xlink:href="#Checkerboard" />
-    <pattern
-       patternUnits="userSpaceOnUse"
-       width="2"
-       height="2"
-       patternTransform="translate(0,0) scale(10,10)"
-       id="Checkerboard">
-      <rect
-         style="fill:black;stroke:none"
-         x="0"
-         y="0"
-         width="1"
-         height="1" />
-      <rect
-         style="fill:black;stroke:none"
-         x="1"
-         y="1"
-         width="1"
-         height="1" />
+    <pattern patternTransform="matrix(0.97434076,-0.97214623,0.96995664,0.97214623,-0.2343755,0.6906405)" id="pattern4249" xlink:href="#Checkerboard" />
+    <pattern patternUnits="userSpaceOnUse" width="2" height="2" patternTransform="translate(0,0) scale(10,10)" id="Checkerboard">
+      <rect fill="currentColor" x="0" y="0" width="1" height="1" />
+      <rect fill="currentColor" x="1" y="1" width="1" height="1" />
     </pattern>
   </defs>
-  <rect
-     y="0"
-     x="0"
-     height="17"
-     width="11"
-     style="fill:url(#pattern4249);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.2525773" />
+  <rect y="0" x="0" height="17" width="11" fill="url(#pattern4249)" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra.svg
index 7c2986d53..a396d695f 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra.svg
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     d="M 11,1.25 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,6.083334 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,10.916667 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,15.75 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path d="M 11,1.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,6.083334 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,10.916667 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+  <path d="M 11,15.75 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_bicolour.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_bicolour.svg
index 2658205b6..7b004ae7f 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_bicolour.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_bicolour.svg
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
-  <path
-     d="M 11,1 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,4 H 0"
-     style="fill:none;stroke:#a6a6a6;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,10 H 0"
-     style="fill:none;stroke:#a6a6a6;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,13 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,16 H 0"
-     style="fill:none;stroke:#a6a6a6;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     d="M 11,7 H 0"
-     style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path d="M 11,1 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="1" />
+  <path d="M 11,4 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="0.6" />
+  <path d="M 11,7 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="1" />
+  <path d="M 11,10 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="0.6" />
+  <path d="M 11,13 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="1" />
+  <path d="M 11,16 H 0" stroke="currentColor" stroke-width="2" stroke-linecap="butt" opacity="0.6" />
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_double.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_double.svg
index 4bab669c9..bd564c59b 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_double.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_double.svg
@@ -1,35 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
   <g>
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 4.5,1.25 H 0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 11,1.25 H 6.5" />
+    <path d="M 4.5,1.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+    <path d="M 11,1.25 H 6.5" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
   </g>
   <g transform="translate(0,9.666667)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 4.5,1.25 H 0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 11,1.25 H 6.5" />
+    <path d="M 4.5,1.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+    <path d="M 11,1.25 H 6.5" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
   </g>
   <g transform="translate(0,4.833334)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 4.5,1.25 H 0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 11,1.25 H 6.5" />
+    <path d="M 4.5,1.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+    <path d="M 11,1.25 H 6.5" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
   </g>
   <g transform="translate(0,14.5)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 4.5,1.25 H 0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.5;stroke-opacity:1"
-       d="M 11,1.25 H 6.5" />
+    <path d="M 4.5,1.25 H 0" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
+    <path d="M 11,1.25 H 6.5" stroke="currentColor" stroke-width="2.5" stroke-linecap="butt" />
   </g>
 </svg>
diff --git a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_paired.svg b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_paired.svg
index 8dfcf32f9..2097e7b10 100644
--- a/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_paired.svg
+++ b/svg/iD-sprite/fields/crossing_markings/crossing_markings-zebra_paired.svg
@@ -2,28 +2,16 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 11 17" height="17" width="11">
   <g transform="translate(-47,-45)">
     <g transform="translate(0,0.125)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,45.375 H 47" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,47.404661 H 47" />
+      <path d="M 58,45.375 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+      <path d="M 58,47.404661 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
     </g>
     <g transform="translate(0,7.1101695)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,45.375 H 47" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,47.404661 H 47" />
+      <path d="M 58,45.375 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+      <path d="M 58,47.404661 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
     </g>
     <g transform="translate(0,14.095339)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,45.375 H 47" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 58,47.404661 H 47" />
+      <path d="M 58,45.375 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
+      <path d="M 58,47.404661 H 47" stroke="currentColor" stroke-width="1" stroke-linecap="butt" />
     </g>
   </g>
 </svg>
diff --git a/svg/iD-sprite/operations/operation-split-multiple.svg b/svg/iD-sprite/operations/operation-split-multiple.svg
index 0e470ca98..0a75c6349 100644
--- a/svg/iD-sprite/operations/operation-split-multiple.svg
+++ b/svg/iD-sprite/operations/operation-split-multiple.svg
@@ -1,64 +1,5 @@
 <?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.1"
-   x="0"
-   y="0"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
-   id="svg4"
-   sodipodi:docname="operation-split-multiple.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <metadata
-     id="metadata10">
-    <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>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1884"
-     inkscape:window-height="2096"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="32"
-     inkscape:cx="11.531136"
-     inkscape:cy="22.639016"
-     inkscape:window-x="1956"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4" />
-  <path
-     style="stroke-width:0.94534558"
-     d="m 3.3515625,1.4042969 c -0.9453456,0 -1.890625,0.9452795 -1.890625,1.890625 v 1.890625 H 4.296875 L 6.1875,6.1308594 4.296875,7.0761719 H 1.4609375 v 1.890625 c 0,0.9453456 0.9452794,1.8906251 1.890625,1.8906251 l 0.066291,0.01105 -0.00678,-0.343914 c -0.00651,-0.256267 0.00548,-0.398159 0.053768,-0.5851046 -0.1452918,0.00768 -0.109145,-0.00229 -0.109145,-0.00229 0,0 -0.9494488,-0.025022 -0.9494488,-0.9703681 V 8.0214844 H 6.1875 c 1.5478745,0.021396 0,0 1.4202466,0.012016 L 8.078125,7.0761719 16.585938,2.3496094 c 0,0 6.4e-5,-0.9453125 -1.890626,-0.9453125 L 8.0488281,5.0976562 7.1328125,3.2949219 C 6.6658118,2.3609205 6.1875661,1.4042969 4.296875,1.4042969 Z m 0,0.9453125 h 1.890625 L 6.1875,4.2402344 H 2.40625 V 3.2949219 c 0,-0.957635 0.9453125,-0.9453125 0.9453125,-0.9453125 z M 11.003906,6.8105469 9.1132812,7.7558594 13.617188,10.355469 15.527344,9.2988281 Z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sscccccssccccsccccccccssccccscccccc" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m 6.0834963,8.7362595 c -0.9453455,0 -1.8906912,0.945346 -1.8906912,1.8906925 v 1.890692 H 7.0288419 L 8.9195338,13.46299 7.0288419,14.408334 H 4.1928051 v 1.890692 c 0,0.945345 0.9453457,1.89069 1.8906912,1.89069 h 0.9453456 c 1.8906919,0 2.3510749,-0.920767 2.8360379,-1.89069 l 0.9453452,-1.890692 8.508111,-4.7267285 c 0,0 0,-0.945346 -1.890691,-0.945346 L 10.78092,12.428781 9.8648798,10.626952 C 9.3978788,9.6929495 8.9195338,8.7362595 7.0288419,8.7362595 Z m 0,0.945346 h 1.8906912 l 0.9453463,1.8906915 h -3.781383 c 0,0 0,-0.630545 0,-0.945345 0,-0.9576365 0.9453455,-0.9453465 0.9453455,-0.9453465 z m 7.6516287,4.4610875 -1.890692,0.945345 5.583212,3.101678 c 1.890691,0 1.890691,-0.945345 1.890691,-0.945345 z M 5.1381508,15.35368 h 3.781383 L 7.9741875,17.244371 H 6.0834963 c 0,0 -0.9453455,0 -0.9453455,-0.945345 z"
-     fill="inherit"
-     id="path2-3"
-     style="stroke-width:0.94534558" />
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="20" height="20" viewBox="0 0 20 20">
+  <path d="m 3.3515625,1.4042969 c -0.9453456,0 -1.890625,0.9452795 -1.890625,1.890625 v 1.890625 H 4.296875 L 6.1875,6.1308594 4.296875,7.0761719 H 1.4609375 v 1.890625 c 0,0.9453456 0.9452794,1.8906251 1.890625,1.8906251 l 0.066291,0.01105 -0.00678,-0.343914 c -0.00651,-0.256267 0.00548,-0.398159 0.053768,-0.5851046 -0.1452918,0.00768 -0.109145,-0.00229 -0.109145,-0.00229 0,0 -0.9494488,-0.025022 -0.9494488,-0.9703681 V 8.0214844 H 6.1875 c 1.5478745,0.021396 0,0 1.4202466,0.012016 L 8.078125,7.0761719 16.585938,2.3496094 c 0,0 6.4e-5,-0.9453125 -1.890626,-0.9453125 L 8.0488281,5.0976562 7.1328125,3.2949219 C 6.6658118,2.3609205 6.1875661,1.4042969 4.296875,1.4042969 Z m 0,0.9453125 h 1.890625 L 6.1875,4.2402344 H 2.40625 V 3.2949219 c 0,-0.957635 0.9453125,-0.9453125 0.9453125,-0.9453125 z M 11.003906,6.8105469 9.1132812,7.7558594 13.617188,10.355469 15.527344,9.2988281 Z" fill="inherit"/>
+  <path d="m 6.0834963,8.7362595 c -0.9453455,0 -1.8906912,0.945346 -1.8906912,1.8906925 v 1.890692 H 7.0288419 L 8.9195338,13.46299 7.0288419,14.408334 H 4.1928051 v 1.890692 c 0,0.945345 0.9453457,1.89069 1.8906912,1.89069 h 0.9453456 c 1.8906919,0 2.3510749,-0.920767 2.8360379,-1.89069 l 0.9453452,-1.890692 8.508111,-4.7267285 c 0,0 0,-0.945346 -1.890691,-0.945346 L 10.78092,12.428781 9.8648798,10.626952 C 9.3978788,9.6929495 8.9195338,8.7362595 7.0288419,8.7362595 Z m 0,0.945346 h 1.8906912 l 0.9453463,1.8906915 h -3.781383 c 0,0 0,-0.630545 0,-0.945345 0,-0.9576365 0.9453455,-0.9453465 0.9453455,-0.9453465 z m 7.6516287,4.4610875 -1.890692,0.945345 5.583212,3.101678 c 1.890691,0 1.890691,-0.945345 1.890691,-0.945345 z M 5.1381508,15.35368 h 3.781383 L 7.9741875,17.244371 H 6.0834963 c 0,0 -0.9453455,0 -0.9453455,-0.945345 z" fill="inherit"/>
 </svg>