diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index 5db0fb434..99b78448b 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -431,11 +431,11 @@ export function validationCrossingWays(context) {
                 } else {
                     // don't recommend adding bridges to waterways since they're uncommmon
                     if (allowsBridge(selectedFeatureType) && selectedFeatureType !== 'waterway') {
-                        fixes.push(makeAddBridgeOrTunnelFix('add_a_bridge', 'maki-bridge', 'bridge'));
+                        fixes.push(makeAddBridgeOrTunnelFix('add_a_bridge', 'iD-structure-bridge', 'bridge'));
                     }
 
                     if (allowsTunnel(selectedFeatureType)) {
-                        fixes.push(makeAddBridgeOrTunnelFix('add_a_tunnel', 'tnp-2009642', 'tunnel'));
+                        fixes.push(makeAddBridgeOrTunnelFix('add_a_tunnel', 'iD-structure-tunnel', 'tunnel'));
                     }
                 }
 
diff --git a/svg/iD-sprite/tools/structure-bridge.svg b/svg/iD-sprite/tools/structure-bridge.svg
new file mode 100644
index 000000000..2511a2296
--- /dev/null
+++ b/svg/iD-sprite/tools/structure-bridge.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path d="M19,8 C17.3431458,8 16,9.34314575 16,11 L16,15 L13,15 L13,11 C13,9.34314575 11.6568542,8 10,8 C8.34314575,8 7,9.34314575 7,11 L7,15 L4,15 L4,11 C4,9.34314575 2.65685425,8 1,8 L1,5 L19,5 L19,8 Z" fill="currentColor"></path>
+</svg>
diff --git a/svg/iD-sprite/tools/structure-tunnel.svg b/svg/iD-sprite/tools/structure-tunnel.svg
new file mode 100644
index 000000000..8ec7dbbf0
--- /dev/null
+++ b/svg/iD-sprite/tools/structure-tunnel.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path d="M9,14 L10,14 L10,10 C10,7.790861 8.209139,6 6,6 C3.790861,6 2,7.790861 2,10 L2,14 L3,14 L3,10 C3,8.34314575 4.34314575,7 6,7 C7.65685425,7 9,8.34314575 9,10 L9,14 Z M6,5 L14,5 C16.7614237,5 19,7.23857625 19,10 L19,15 L1,15 L1,10 C1,7.23857625 3.23857625,5 6,5 Z" fill="currentColor"></path>
+</svg>