diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index 78c772105..24a807d72 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -748,23 +748,41 @@
       <path d="M683,84 C678,84 674,87 674,93 L674,113 L677,112 L677,93 C677,89 680,87 683,87 L689,87 L691,87 L697,87 C700,87 703,89 703,93 L703,112 L706,113 L706,93 C706,87 701.932,84.822 697,84 L691,84 L689,84 z" fill="#B5B5B5" id="rect5093"/>
     </g>
     <g id="railway-abandoned">
-      <path d="M623.5,93 L622,94 L621.531,96 L618.25,96 C617.696,96 617.384,96.463 617.25,97 L617,98 C616.866,98.537 617.446,99 618,99 L628.938,99 L632.188,96 L624.031,96 L624.5,94 L623.5,93 z M641,96 L637.75,99 L641.969,99 C642.523,99 643.103,98.537 642.969,98 L642.719,97 C642.584,96.463 642.273,96 641.719,96 L641,96 z M621.5,97 C621.776,97 622,97.224 622,97.5 C622,97.776 621.776,98 621.5,98 C621.224,98 621,97.776 621,97.5 C621,97.224 621.224,97 621.5,97 z M620.562,100 L620.094,102 L617.25,102 C616.696,102 616.384,102.463 616.25,103 L616,104 C615.866,104.537 616.446,105 617,105 L622.438,105 L625.688,102 L622.594,102 L623.062,100 L620.562,100 z M636.906,100 L637.375,102 L634.5,102 L631.281,105 L642.969,105 C643.523,105 644.103,104.537 643.969,104 L643.719,103 C643.584,102.463 643.273,102 642.719,102 L639.875,102 L639.406,100 L636.906,100 z M620.5,103 C620.776,103 621,103.224 621,103.5 C621,103.776 620.776,104 620.5,104 C620.224,104 620,103.776 620,103.5 C620,103.224 620.224,103 620.5,103 z M639.469,103 C639.745,103 639.969,103.224 639.969,103.5 C639.969,103.776 639.745,104 639.469,104 C639.193,104 638.969,103.776 638.969,103.5 C638.969,103.224 639.193,103 639.469,103 z M619.156,106 L618.688,108 L616.25,108 C615.696,108 615.384,108.463 615.25,109 L615,110 C614.868,110.528 615.424,110.984 615.969,111 C615.979,111 615.99,111 616,111 L621.375,106 L619.156,106 z M638.312,106 L638.781,108 L628.031,108 L624.781,111 L643.969,111 C644.523,111 645.103,110.537 644.969,110 L644.719,109 C644.584,108.463 644.273,108 643.719,108 L641.281,108 L640.812,106 L638.312,106 z M640.469,109 C640.745,109 640.969,109.224 640.969,109.5 C640.969,109.776 640.745,110 640.469,110 C640.193,110 639.969,109.776 639.969,109.5 C639.969,109.224 640.193,109 640.469,109 z M639.75,112 L640.469,115 L641.469,116 L642.969,115 L642.25,112 L639.75,112 z" fill="#B5B5B5" id="path4185"/>
+      <g fill="#989898" id="railway-abandoned-base">
+        <path d="M636.044,103.748l-1.449,0.118l0.729,1.197h7.427c0.554,0,1.134-0.463,1-1l-0.25-1 c-0.134-0.537-0.446-1-1-1h-2.344l-0.469-2h-2.5l0.469,2h-2.826l0.179,0.248L636.044,103.748z M639.25,103.063 c0.276,0,0.5,0.224,0.5,0.5s-0.224,0.5-0.5,0.5s-0.5-0.224-0.5-0.5S638.974,103.063,639.25,103.063z"/>
+        <path d="M633.846,99.063h7.904c0.554,0,1.134-0.463,1-1l-0.25-1c-0.134-0.537-0.446-1-1-1h-2.781l-0.469-2l-1.5-1 l-1,1l0.469,2h-4.013l1.313,2.403L633.846,99.063z M638.25,97.063c0.276,0,0.5,0.224,0.5,0.5s-0.224,0.5-0.5,0.5 s-0.5-0.224-0.5-0.5S637.974,97.063,638.25,97.063z"/>
+        <path d="M627.666,96.063h-3.885l0.469-2l-1-1l-1.5,1l-0.469,2H618c-0.554,0-0.866,0.463-1,1l-0.25,1 c-0.134,0.537,0.446,1,1,1h8.277l0.347-0.635L627.666,96.063z M621.25,98.063c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5 s0.5,0.224,0.5,0.5S621.526,98.063,621.25,98.063z"/>
+        <path d="M620.936,108.063l0.472-2h-2.501l-0.469,2h-2.438c-0.554,0-0.866,0.463-1,1l-0.25,1 c-0.134,0.537,0.446,1,1,1h6.911l1.59-3H620.936z M619.25,110.063c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5 s0.5,0.224,0.5,0.5S619.526,110.063,619.25,110.063z"/>
+        <path d="M640.031,112.063L640.75 115.063 641.75 116.063 643.25 115.063 642.531 112.063 z"/>
+        <path d="M623.848,103.71l1.036-1.438l0.15-0.209h-2.691l0.472-2h-2.502l-0.469,2H617c-0.554,0-0.866,0.463-1,1 l-0.25,1c-0.134,0.537,0.446,1,1,1h7.798l0.749-1.235L623.848,103.71z M620.25,104.063c-0.276,0-0.5-0.224-0.5-0.5 s0.224-0.5,0.5-0.5s0.5,0.224,0.5,0.5S620.526,104.063,620.25,104.063z"/>
+        <path d="M644.749,110.063l-0.25-1c-0.134-0.537-0.446-1-1-1h-1.938l-0.469-2h-2.5l0.469,2h-3.436l1.588,3h6.536 C644.303,111.063,644.883,110.6,644.749,110.063z M640.25,110.063c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5 s0.5,0.224,0.5,0.5S640.526,110.063,640.25,110.063z"/>
+        <path d="M616.75,115.063L618.25 116.063 619.25 115.063 619.969 112.063 617.469 112.063 z"/>
+      </g>
+      <path fill="#000" d="M630.803,111.718L636.446 111.749 636.083 111.063 634.495 108.063 633.678 106.52 634.976 106.414 634.154 105.063 632.898 102.999 634.198 102.893 633.6 102.063 631.438 99.063 631.429 99.051 632.642 98.944 631.066 96.063 629.959 94.036 629.933 94.158 629.933 94 628.806 96.063 627.253 98.907 628.465 99.013 628.429 99.063 626.267 102.063 625.696 102.855 626.993 102.96 625.716 105.063 624.919 106.376 626.217 106.483 625.38 108.063 623.792 111.063 623.448 111.712 625.721 111.681 625.718 111.69 629.188 111.709 629.188 112.21 629.188 112.712 629.188 116.086 630.813 116.086 630.805 112.721 630.804 112.219 z" id="railway-abandoned-tree"/>
       <path d="M649.5,119 C650.881,119 652,120.119 652,121.5 C652,122.881 650.881,124 649.5,124 C648.593,124.004 648.127,123.598 647.529,123 L612.471,123 C611.978,123.678 611.297,123.92 610.5,124 C609.119,124 608,122.881 608,121.5 C608,120.119 609.119,119 610.5,119 C611.407,118.996 611.873,119.402 612.471,120 L647.529,120 C648.022,119.322 648.703,119.08 649.5,119 z" fill="#000000" id="railway-abandoned-stroke" opacity="0.697"/>
       <path d="M616,121 L616,122 L612.95,122 L613,121.5 L612.95,121 L616,121 z M627,121 L622,121 L622,122 L627,122 L627,121 z M638,121 L633,121 L633,122 L638,122 L638,121 z M647.05,121 L644,121 L644,122 L647.05,122 L647,121.5 L647.05,121 z" fill="#AAAAAA" id="railway-abandoned-dashes"/>
       <path d="M651,121.5 C651,122.328 650.328,123 649.5,123 C648.672,123 648,122.328 648,121.5 C648,120.672 648.672,120 649.5,120 C650.328,120 651,120.672 651,121.5 z" fill="#FFFFFF" id="path4201"/>
       <path d="M612,121.5 C612,122.328 611.328,123 610.5,123 C609.672,123 609,122.328 609,121.5 C609,120.672 609.672,120 610.5,120 C611.328,120 612,120.672 612,121.5 z" fill="#FFFFFF" id="path4205"/>
-      <g id="path4212">
-        <path d="M615,116 L642,91" fill="#989898"/>
-        <path d="M615,116 L642,91" fill-opacity="0" stroke="#444444" stroke-width="3"/>
-      </g>
     </g>
     <g id="railway-disused">
-      <path d="M563.5,93 L562,94 L561.531,96 L558.25,96 C557.696,96 557.384,96.463 557.25,97 L557,98 C556.866,98.537 557.446,99 558,99 L568.938,99 L572.188,96 L564.031,96 L564.5,94 L563.5,93 z M581,96 L577.75,99 L581.969,99 C582.523,99 583.103,98.537 582.969,98 L582.719,97 C582.584,96.463 582.273,96 581.719,96 L581,96 z M561.5,97 C561.776,97 562,97.224 562,97.5 C562,97.776 561.776,98 561.5,98 C561.224,98 561,97.776 561,97.5 C561,97.224 561.224,97 561.5,97 z M560.562,100 L560.094,102 L557.25,102 C556.696,102 556.384,102.463 556.25,103 L556,104 C555.866,104.537 556.446,105 557,105 L562.438,105 L565.688,102 L562.594,102 L563.062,100 L560.562,100 z M576.906,100 L577.375,102 L574.5,102 L571.281,105 L582.969,105 C583.523,105 584.103,104.537 583.969,104 L583.719,103 C583.584,102.463 583.273,102 582.719,102 L579.875,102 L579.406,100 L576.906,100 z M560.5,103 C560.776,103 561,103.224 561,103.5 C561,103.776 560.776,104 560.5,104 C560.224,104 560,103.776 560,103.5 C560,103.224 560.224,103 560.5,103 z M579.469,103 C579.745,103 579.969,103.224 579.969,103.5 C579.969,103.776 579.745,104 579.469,104 C579.193,104 578.969,103.776 578.969,103.5 C578.969,103.224 579.193,103 579.469,103 z M559.156,106 L558.688,108 L556.25,108 C555.696,108 555.384,108.463 555.25,109 L555,110 C554.868,110.528 555.424,110.984 555.969,111 C555.979,111 555.99,111 556,111 L561.375,106 L559.156,106 z M578.312,106 L578.781,108 L568.031,108 L564.781,111 L583.969,111 C584.523,111 585.103,110.537 584.969,110 L584.719,109 C584.584,108.463 584.273,108 583.719,108 L581.281,108 L580.812,106 L578.312,106 z M580.469,109 C580.745,109 580.969,109.224 580.969,109.5 C580.969,109.776 580.745,110 580.469,110 C580.193,110 579.969,109.776 579.969,109.5 C579.969,109.224 580.193,109 580.469,109 z M579.75,112 L580.469,115 L581.469,116 L582.969,115 L582.25,112 L579.75,112 z" fill="#B5B5B5" id="path7042"/>
-      <path d="M589.5,119 C590.881,119 592,120.119 592,121.5 C592,122.881 590.881,124 589.5,124 C588.593,124.004 588.127,123.598 587.529,123 L552.471,123 C551.978,123.678 551.297,123.92 550.5,124 C549.119,124 548,122.881 548,121.5 C548,120.119 549.119,119 550.5,119 C551.407,118.996 551.873,119.402 552.471,120 L587.529,120 C588.022,119.322 588.703,119.08 589.5,119 z" fill="#000000" id="railway-disused-stroke" opacity="0.703"/>
-      <path d="M556,121 L556,122 L552.95,122 L553,121.5 L552.95,121 L556,121 z M567,121 L562,121 L562,122 L567,122 L567,121 z M578,121 L573,121 L573,122 L578,122 L578,121 z M587.05,121 L584,121 L584,122 L587.05,122 L587,121.5 L587.05,121 z" fill="#AAAAAA" id="railway-disused-dashes"/>
-      <path d="M591,121.5 C591,122.328 590.328,123 589.5,123 C588.672,123 588,122.328 588,121.5 C588,120.672 588.672,120 589.5,120 C590.328,120 591,120.672 591,121.5 z" fill="#FFFFFF" id="path7058"/>
-      <path d="M552,121.5 C552,122.328 551.328,123 550.5,123 C549.672,123 549,122.328 549,121.5 C549,120.672 549.672,120 550.5,120 C551.328,120 552,120.672 552,121.5 z" fill="#FFFFFF" id="path7062"/>
-      <path d="M578.844,91.857 L580.906,94.075 L583.031,92.107 L580.969,89.888 z M572.25,97.982 L574.281,100.169 L578.688,96.107 L576.656,93.919 z M565.656,104.107 L567.688,106.294 L572.094,102.232 L570.063,100.013 z M559.031,110.2 L561.094,112.419 L565.5,108.325 L563.438,106.138 z M553.969,114.888 L556.031,117.107 L558.875,114.45 L556.844,112.263 z" fill="#444444" id="path7066"/>
+      <g id="railway-disused-base">
+        <path fill="#989898" d="M557,115L558.5 116 559.5 115 560.219 112 557.719 112 z"/>
+        <path fill="#989898" d="M580.281,112L581 115 582 116 583.5 115 582.781 112 z"/>
+        <path fill="#989898" d="M561.186,108l0.472-2h-2.501l-0.469,2h-2.438c-0.554,0-0.866,0.463-1,1l-0.25,1c-0.134,0.537,0.446,1,1,1 h11.79c-0.313-1.031-0.775-2.081-1.457-3H561.186z M559.5,110c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5s0.5,0.224,0.5,0.5 S559.776,110,559.5,110z"/>
+        <path fill="#989898" d="M557,105h26c0.554,0,1.134-0.463,1-1l-0.25-1c-0.134-0.537-0.446-1-1-1h-2.344l-0.469-2h-2.5l0.469,2 h-15.313l0.472-2h-2.502l-0.469,2h-2.844c-0.554,0-0.866,0.463-1,1l-0.25,1C555.866,104.537,556.446,105,557,105z M579.5,103 c0.276,0,0.5,0.224,0.5,0.5s-0.224,0.5-0.5,0.5s-0.5-0.224-0.5-0.5S579.224,103,579.5,103z M560.5,103c0.276,0,0.5,0.224,0.5,0.5 s-0.224,0.5-0.5,0.5s-0.5-0.224-0.5-0.5S560.224,103,560.5,103z"/>
+        <path fill="#989898" d="M558,99h24c0.554,0,1.134-0.463,1-1l-0.25-1c-0.134-0.537-0.446-1-1-1h-2.781l-0.469-2l-1.5-1l-1,1 l0.469,2h-12.438l0.469-2l-1-1l-1.5,1l-0.469,2h-3.281c-0.554,0-0.866,0.463-1,1L557,98C556.866,98.537,557.446,99,558,99z M578.5,97c0.276,0,0.5,0.224,0.5,0.5s-0.224,0.5-0.5,0.5s-0.5-0.224-0.5-0.5S578.224,97,578.5,97z M561.5,97 c0.276,0,0.5,0.224,0.5,0.5s-0.224,0.5-0.5,0.5s-0.5-0.224-0.5-0.5S561.224,97,561.5,97z"/>
+        <path fill="#989898" d="M584.999,110l-0.25-1c-0.134-0.537-0.446-1-1-1h-1.938l-0.469-2h-2.5l0.469,2h-4.244l-0.315,0.285 c-1.087,0.982-1.675,1.941-2.01,2.715h11.258C584.553,111,585.133,110.537,584.999,110z M580.5,110c-0.276,0-0.5-0.224-0.5-0.5 s0.224-0.5,0.5-0.5s0.5,0.224,0.5,0.5S580.776,110,580.5,110z"/>
+      </g>
+      <path id="railway-disused-stroke" opacity="0.703" enable-background="new    " d="M589.5,119c1.381,0,2.5,1.119,2.5,2.5 s-1.119,2.5-2.5,2.5c-0.907,0.004-1.373-0.402-1.971-1h-35.061c-0.492,0.678-1.174,0.92-1.971,1c-1.381,0-2.5-1.119-2.5-2.5 s1.119-2.5,2.5-2.5c0.907-0.004,1.373,0.402,1.971,1h35.061C588.021,119.322,588.703,119.08,589.5,119z"/>
+      <path id="railway-disused-dashes" fill="#AAAAAA" d="M556,121v1h-3.05l0.05-0.5l-0.05-0.5H556z M567,121h-5v1h5V121z M578,121h-5 v1h5V121z M587.05,121H584v1h3.05l-0.05-0.5L587.05,121z"/>
+      <path id="path7058" fill="#FFFFFF" d="M591,121.5c0,0.828-0.672,1.5-1.5,1.5s-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5 S591,120.672,591,121.5z"/>
+      <path id="path7062" fill="#FFFFFF" d="M552,121.5c0,0.828-0.672,1.5-1.5,1.5s-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5 S552,120.672,552,121.5z"/>
+      <g fill="#000" id="railway-disused-weed">
+        <path d="M564.406,111.625c3.038,3.078,2.378,4.385,2.378,4.385s0.211,0.039,1.669,0.039 C568.572,112.92,566.16,112.188,564.406,111.625z"/>
+        <path d="M570.977,116.031c0.046-2.014-0.264-3.628-0.749-4.922c-0.491-1.309-1.162-2.282-1.833-3 c-1.276-1.365-2.546-1.8-2.546-1.8c0.625,0.527,1.128,1.144,1.55,1.8c0.612,0.952,1.035,1.99,1.321,3 c0.732,2.581,0.603,4.935,0.603,4.935S569.895,116.031,570.977,116.031z"/>
+        <path d="M573.556,108c-1.804,0.807-2.44,2.824-2.44,2.824l0.047,0.176l0.437,1.64c0,0-0.001-0.664,0.373-1.64 c0.321-0.84,0.927-1.912,2.053-3c0.083-0.08,0.161-0.16,0.25-0.24C574.016,107.816,573.778,107.9,573.556,108z"/>
+        <path d="M572.018,116.038l1.58-0.009c0,0-0.23-2.368,1.996-4.326C573.86,112.201,572.209,113.783,572.018,116.038z"/>
+      </g>
     </g>
     <g id="railway-rail">
       <path d="M529.5,119 C530.881,119 532,120.119 532,121.5 C532,122.881 530.881,124 529.5,124 C528.593,124.004 528.127,123.598 527.529,123 L492.471,123 C491.978,123.678 491.297,123.92 490.5,124 C489.119,124 488,122.881 488,121.5 C488,120.119 489.119,119 490.5,119 C491.407,118.996 491.873,119.402 492.471,120 L527.529,120 C528.022,119.322 528.703,119.08 529.5,119 z" fill="#000000" id="railway-rail-stroke"/>