diff --git a/src/css/ingame_hud/waypoints.scss b/src/css/ingame_hud/waypoints.scss
index 57c644ab..7a9941c0 100644
--- a/src/css/ingame_hud/waypoints.scss
+++ b/src/css/ingame_hud/waypoints.scss
@@ -49,16 +49,19 @@
         font-weight: bold;
 
         &:hover {
-            opacity: 1;
+            opacity: 0.8;
         }
 
         .editButton {
             @include S(width, 10px);
             @include S(height, 10px);
             @include S(margin-left, 4px);
-            background: uiResource("icons/edit_key.png") center center / 60% no-repeat;
+            background: uiResource("icons/edit_key.png") center center / 70% no-repeat;
             pointer-events: all;
             cursor: pointer;
+            position: relative;
+            @include IncreasedClickArea(2px);
+            transition: transform 0.04s ease-in-out;
 
             &:hover {
                 transform: scale(1.5);
diff --git a/src/js/game/hud/parts/waypoints.js b/src/js/game/hud/parts/waypoints.js
index e029913e..8cab85c5 100644
--- a/src/js/game/hud/parts/waypoints.js
+++ b/src/js/game/hud/parts/waypoints.js
@@ -109,7 +109,9 @@ export class HUDWaypoints extends BaseHUDPart {
 
         // Catch mouse and key events
         this.root.camera.downPreHandler.add(this.onMouseDown, this);
-        this.root.keyMapper.getBinding(KEYMAPPINGS.navigation.createMarker).add(this.requestSaveMarker, this);
+        this.root.keyMapper
+            .getBinding(KEYMAPPINGS.navigation.createMarker)
+            .add(() => this.requestSaveMarker({}));
 
         /**
          * Stores at how much opacity the markers should be rendered on the map.