diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index e20458558..6923c1d4a 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -273,6 +273,7 @@
     "poi-windmill":             { "viewBox": "610 320 15 15" },
     "poi-hinduist":             { "viewBox": "625 320 15 15" },
     "poi-shintoist":            { "viewBox": "640 320 15 15" },
+    "poi-buffer-stop":          { "viewBox": "655 320 15 15" },
 
     "poi-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -291,6 +292,7 @@
     "poi-windmill-shape":          { "fill": "currentColor" },
     "poi-hinduist-shape":          { "fill": "currentColor" },
     "poi-shintoist-shape":         { "fill": "currentColor" },
+    "poi-buffer-stop-shape":       { "fill": "currentColor" },
 
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index 51fbb2e4c..41f0cd975 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index de6432c3a..cf35b7ac7 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -366,6 +366,9 @@
     <g id="poi-vending-machine">
       <path d="M412,335 C412.552,335 413,335.448 413,336 L413,349 C413,349.552 412.552,350 412,350 L403,350 C402.448,350 402,349.552 402,349 L402,336 C402,335.448 402.448,335 403,335 L412,335 z M409,346 L406,346 L406,347.5 L409,347.5 L409,346 z M409,341 L408,341 L408,342 L409,342 L409,341 z M405,341 L404,341 L404,342 L405,342 L405,341 z M407,341 L406,341 L406,342 L407,342 L407,341 z M411,341 L410,341 L410,342 L411,342 L411,341 z M411,339 L410,339 L410,340 L411,340 L411,339 z M407,339 L406,339 L406,340 L407,340 L407,339 z M405,339 L404,339 L404,340 L405,340 L405,339 z M409,339 L408,339 L408,340 L409,340 L409,339 z M409,337 L408,337 L408,338 L409,338 L409,337 z M405,337 L404,337 L404,338 L405,338 L405,337 z M407,337 L406,337 L406,338 L407,338 L407,337 z M411,337 L410,337 L410,338 L411,338 L411,337 z" fill="#000000" id="poi-vending-machine-shape"/>
     </g>
+    <g id="poi-buffer-stop">
+      <path d="M657,322 C657.552,322 658,322.448 658,323 L658,323.555 L667.384,332 L668,332 C668.552,332 669,332.448 669,333 C669,333.552 668.552,334 668,334 L657,334 C656.448,334 656,333.552 656,333 C656,332.448 656.448,332 657,332 L657.5,332 L659.874,328 L658,326.208 C657.956,326.732 657.428,326.914 657,327 C656.448,327 656,326.552 656,326 L656,323 C656,322.448 656.448,322 657,322 z M661.389,329.295 L659.75,332 L664.394,332 L661.389,329.295 z" fill="#000000" id="poi-buffer-stop-shape"/>
+    </g>
     <g id="poi-shintoist">
       <path d="M640,320 C640,321.071 640.701,321.756 641.071,322.126 C641.442,322.496 641.974,322.353 641.974,322.632 C641.974,322.632 642.143,323.198 642.679,323.198 L644.018,323.198 C644.018,323.506 644.286,323.733 644.286,323.733 C644.286,323.733 644.018,323.884 644.018,324.269 L642.679,324.269 C642.143,324.269 642.143,324.537 642.143,324.805 C642.143,325.37 642.143,325.876 642.143,325.876 C642.143,326.133 642.39,326.412 642.679,326.412 C642.967,326.412 644.018,326.412 644.018,326.412 L644.018,327.483 L643.214,327.483 C643.214,327.918 643.504,328.267 644.018,328.555 C644.018,328.894 644.018,334.448 644.018,334.448 C644.018,335.153 645.625,335.214 645.625,334.448 L645.625,326.412 L649.375,326.412 L649.375,334.448 C649.375,335.189 650.982,335.137 650.982,334.448 C650.982,334.448 650.982,328.894 650.982,328.555 C651.496,328.221 651.786,327.92 651.786,327.483 L650.982,327.483 L650.982,326.412 C650.982,326.412 652.033,326.412 652.321,326.412 C652.558,326.412 652.857,326.133 652.857,325.876 C652.857,325.876 652.857,325.34 652.857,324.805 C652.857,324.269 652.563,324.269 652.321,324.269 L650.982,324.269 C651.008,323.986 650.714,323.733 650.714,323.733 C650.714,323.733 650.982,323.506 650.982,323.198 L652.321,323.198 C652.857,323.198 652.857,322.662 652.857,322.662 C652.857,322.409 653.482,322.513 653.929,322.126 C654.376,321.739 655,321.071 655,320 C648.571,321.071 645.357,321.071 640,320 z M645.625,323.198 C645.625,323.198 646.696,323.198 646.696,323.198 L646.696,324.269 L645.625,324.269 C645.625,323.961 645.357,323.733 645.357,323.733 C645.357,323.733 645.625,323.531 645.625,323.198 z M648.304,323.198 L649.375,323.198 C649.375,323.481 649.643,323.733 649.643,323.733 C649.643,323.733 649.375,323.986 649.375,324.269 L648.304,324.269 z" fill="#000000" id="poi-shintoist-shape"/>
     </g>