diff --git a/css/80_app.css b/css/80_app.css
index f17ceeefb..47d65cf62 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -4932,15 +4932,6 @@ img.tile-debug {
     color: #555;
 }
 
-svg.mouseclick use.left {
-    fill: rgba(112, 146, 255, 1);
-    color: rgba(112, 146, 255, 0);
-}
-svg.mouseclick use.right {
-    fill: rgba(112, 146, 255, 0);
-    color: rgba(112, 146, 255, 1);
-}
-
 .modal-shortcuts .shortcut-keys .gesture {
     color: #333;
     padding: 3px;
diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js
index f69b7bfa8..7e712e8c9 100644
--- a/modules/ui/intro/helper.js
+++ b/modules/ui/intro/helper.js
@@ -73,8 +73,8 @@ export function helpString(id, replacements) {
         undo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-redo' : '#iD-icon-undo', 'pre-text'),
         redo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-undo' : '#iD-icon-redo', 'pre-text'),
         save_icon: icon('#iD-icon-save', 'pre-text'),
-        leftclick: icon('#iD-walkthrough-mouse', 'pre-text mouseclick', 'left'),
-        rightclick: icon('#iD-walkthrough-mouse', 'pre-text mouseclick', 'right'),
+        leftclick: icon('#iD-walkthrough-mouse-left', 'pre-text operation'),
+        rightclick: icon('#iD-walkthrough-mouse-right', 'pre-text operation'),
 
         // insert keys; may be localized and platform-dependent
         shift: uiCmd.display('⇧'),
diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js
index 5ffbb7cbf..60ed04496 100644
--- a/modules/ui/shortcuts.js
+++ b/modules/ui/shortcuts.js
@@ -198,7 +198,7 @@ export function uiShortcuts(context) {
 
                 if (click && click[1]) {   // replace "left_click", "right_click" with mouse icon
                     selection
-                        .call(svgIcon('#iD-walkthrough-mouse', 'mouseclick', click[1]));
+                        .call(svgIcon('#iD-walkthrough-mouse-' + click[1], 'operation'));
                 } else {
                     selection
                         .append('kbd')
diff --git a/svg/iD-sprite/graphics/walkthrough-mouse-left.svg b/svg/iD-sprite/graphics/walkthrough-mouse-left.svg
new file mode 100644
index 000000000..742c30ad7
--- /dev/null
+++ b/svg/iD-sprite/graphics/walkthrough-mouse-left.svg
@@ -0,0 +1,5 @@
+<?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="M10,1 L10,9 L5,9 L5,6 C5,3.23857625 7.23857625,1 10,1 Z" fill="currentColor"/>
+    <path d="M9.45,1.130523 C7.0027024,1.40387724 5.1,3.47973864 5.1,6 L5.1,8 L9.45,8 L9.45,1.130523 L9.45,1.130523 Z M10.55,1.130523 L10.55,8 L14.9,8 L14.9,6 C14.9,3.47973864 12.9972976,1.40387724 10.55,1.130523 L10.55,1.130523 Z M5.1,9 L5.1,14 C5.1,16.7061953 7.29380473,18.9 10,18.9 C12.7061953,18.9 14.9,16.7061953 14.9,14 L14.9,9 L5.1,9 Z M10,0 C13.3137085,-6.08718376e-16 16,2.6862915 16,6 L16,14 C16,17.3137085 13.3137085,20 10,20 C6.6862915,20 4,17.3137085 4,14 L4,6 C4,2.6862915 6.6862915,6.08718376e-16 10,0 Z" fill="inherit"/>
+</svg>
diff --git a/svg/iD-sprite/graphics/walkthrough-mouse-right.svg b/svg/iD-sprite/graphics/walkthrough-mouse-right.svg
new file mode 100644
index 000000000..1a48bfee9
--- /dev/null
+++ b/svg/iD-sprite/graphics/walkthrough-mouse-right.svg
@@ -0,0 +1,5 @@
+<?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="M10,1 C12.7614237,1 15,3.23857625 15,6 L15,9 L10,9 L10,1 Z" fill="currentColor"/>
+    <path d="M9.45,1.130523 C7.0027024,1.40387724 5.1,3.47973864 5.1,6 L5.1,8 L9.45,8 L9.45,1.130523 L9.45,1.130523 Z M10.55,1.130523 L10.55,8 L14.9,8 L14.9,6 C14.9,3.47973864 12.9972976,1.40387724 10.55,1.130523 L10.55,1.130523 Z M5.1,9 L5.1,14 C5.1,16.7061953 7.29380473,18.9 10,18.9 C12.7061953,18.9 14.9,16.7061953 14.9,14 L14.9,9 L5.1,9 Z M10,0 C13.3137085,-6.08718376e-16 16,2.6862915 16,6 L16,14 C16,17.3137085 13.3137085,20 10,20 C6.6862915,20 4,17.3137085 4,14 L4,6 C4,2.6862915 6.6862915,6.08718376e-16 10,0 Z" fill="inherit"/>
+</svg>
diff --git a/svg/iD-sprite/graphics/walkthrough-mouse.svg b/svg/iD-sprite/graphics/walkthrough-mouse.svg
deleted file mode 100644
index 7b5ebdbec..000000000
--- a/svg/iD-sprite/graphics/walkthrough-mouse.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-      <path d="M29.5,12 L29.5,27 L41,27 C41,17 37,12 29.5,12 z" fill="currentColor"/>
-      <path d="M29.5,12 L29.5,27 L18,27 C18,17 23,12 29.5,12 z" fill="inherit"/>
-      <path d="M29.5,11 C36.404,11 42,16.596 42,23.5 L42,41.5 C42,48.404 36.404,54 29.5,54 C22.596,54 17,48.404 17,41.5 L17,23.5 C17,16.596 22.596,11 29.5,11 z M19,28 L19,41.5 C19,47.299 23.701,52 29.5,52 C35.299,52 40,47.299 40,41.5 L40,28 L19,28 z M30.573,13.054 L30.5,13.05 L30.5,26 L40,26 L40,23.5 C39.823,17.619 36.075,14.176 30.573,13.054 z M19,26 L28.5,26 L28.5,13.05 C22.988,13.815 19.279,17.971 19,23.5 L19,26 z" fill="#000001"/>
-</svg>