diff --git a/data/shortcuts.json b/data/shortcuts.json
index c235a1e18..6b910899b 100644
--- a/data/shortcuts.json
+++ b/data/shortcuts.json
@@ -15,7 +15,7 @@
             "separator": ","
           },
           {
-            "modifiers": ["⌘"],
+            "modifiers": ["⌥"],
             "shortcuts": ["↓", "↑", "←", "→"],
             "text": "shortcuts.browsing.navigation.pan_more",
             "separator": ","
@@ -26,7 +26,7 @@
             "separator": ","
           },
           {
-            "modifiers": ["⌘"],
+            "modifiers": ["⌥"],
             "shortcuts": ["+", "-"],
             "text": "shortcuts.browsing.navigation.zoom_more",
             "separator": ","
@@ -276,7 +276,7 @@
             "separator": ","
           },
           {
-            "modifiers": ["⌘", "⇧"],
+            "modifiers": ["⌥", "⇧"],
             "shortcuts": ["↓", "↑", "←", "→"],
             "text": "shortcuts.editing.operations.nudge_more",
             "separator": ","
diff --git a/modules/modes/select.js b/modules/modes/select.js
index d10961293..ac9e35f29 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -239,10 +239,10 @@ export function modeSelect(context, selectedIDs) {
             .on(uiCmd('⇧↑'), nudgeSelection([0, -10]))
             .on(uiCmd('⇧→'), nudgeSelection([10, 0]))
             .on(uiCmd('⇧↓'), nudgeSelection([0, 10]))
-            .on(uiCmd('⇧⌘←'), nudgeSelection([-100, 0]))
-            .on(uiCmd('⇧⌘↑'), nudgeSelection([0, -100]))
-            .on(uiCmd('⇧⌘→'), nudgeSelection([100, 0]))
-            .on(uiCmd('⇧⌘↓'), nudgeSelection([0, 100]))
+            .on(uiCmd('⇧⌥←'), nudgeSelection([-100, 0]))
+            .on(uiCmd('⇧⌥↑'), nudgeSelection([0, -100]))
+            .on(uiCmd('⇧⌥→'), nudgeSelection([100, 0]))
+            .on(uiCmd('⇧⌥↓'), nudgeSelection([0, 100]))
             .on(['\\', 'pause'], nextParent)
             .on('⎋', esc, true);
 
diff --git a/modules/ui/init.js b/modules/ui/init.js
index ce71c6bc5..6f51d89d3 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -356,10 +356,10 @@ export function uiInit(context) {
             .on('↑', pan([0, panPixels]))
             .on('→', pan([-panPixels, 0]))
             .on('↓', pan([0, -panPixels]))
-            .on(uiCmd('⌘←'), pan([map.dimensions()[0], 0]))
-            .on(uiCmd('⌘↑'), pan([0, map.dimensions()[1]]))
-            .on(uiCmd('⌘→'), pan([-map.dimensions()[0], 0]))
-            .on(uiCmd('⌘↓'), pan([0, -map.dimensions()[1]]))
+            .on(uiCmd('⌥←'), pan([map.dimensions()[0], 0]))
+            .on(uiCmd('⌥↑'), pan([0, map.dimensions()[1]]))
+            .on(uiCmd('⌥→'), pan([-map.dimensions()[0], 0]))
+            .on(uiCmd('⌥↓'), pan([0, -map.dimensions()[1]]))
             .on(uiCmd('⌘' + t('background.key')), function quickSwitch() {
                 if (d3_event) {
                     d3_event.stopImmediatePropagation();
diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js
index 5e6ffc23d..1a1cc4c55 100644
--- a/modules/ui/zoom.js
+++ b/modules/ui/zoom.js
@@ -97,12 +97,12 @@ export function uiZoom(context) {
 
         ['plus', 'ffplus', '=', 'ffequals'].forEach(function(key) {
             context.keybinding().on([key], zoomIn);
-            context.keybinding().on([uiCmd('⌘' + key)], zoomInFurther);
+            context.keybinding().on([uiCmd('⌥' + key)], zoomInFurther);
         });
 
         ['_', '-', 'ffminus', 'dash'].forEach(function(key) {
             context.keybinding().on([key], zoomOut);
-            context.keybinding().on([uiCmd('⌘' + key)], zoomOutFurther);
+            context.keybinding().on([uiCmd('⌥' + key)], zoomOutFurther);
         });
 
         function updateButtonStates() {