diff --git a/planet/System.ocg/PlayerControls.txt b/planet/System.ocg/PlayerControls.txt
index 88b6ca852..b0e1146cf 100644
--- a/planet/System.ocg/PlayerControls.txt
+++ b/planet/System.ocg/PlayerControls.txt
@@ -801,6 +801,47 @@
 		Priority=100
 		Control=WheelZoomOut
 
+		# Secondary Hotkeys for interacting (actionbar)
+		
+		[Assignment]
+		Key=Less
+		Control=InteractionHotkey1
+		
+		[Assignment]
+		Key=Y
+		Control=InteractionHotkey2
+		
+		[Assignment]
+		Key=X
+		Control=InteractionHotkey3
+		
+		[Assignment]
+		Key=C
+		Control=InteractionHotkey4
+		
+		[Assignment]
+		Key=V
+		Control=InteractionHotkey5
+		
+		[Assignment]
+		Key=B
+		Control=InteractionHotkey6
+		
+		[Assignment]
+		Key=N
+		Control=InteractionHotkey7
+		
+		[Assignment]
+		Key=M
+		Control=InteractionHotkey8
+		
+		[Assignment]
+		Key=Comma
+		Control=InteractionHotkey9
+		
+		[Assignment]
+		Key=Period
+		Control=InteractionHotkey0
 		
 	# ======================================================================= #
 	#                   Mouse control with keyboard (DVORAK)                  #
@@ -926,6 +967,47 @@
 		Priority=100
 		Control=WheelZoomOut
 		
+		# Secondary Hotkeys for interacting (actionbar)
+		
+		[Assignment]
+		Key=Backslash
+		Control=InteractionHotkey1
+		
+		[Assignment]
+		Key=Comma_US
+		Control=InteractionHotkey2
+		
+		[Assignment]
+		Key=Q
+		Control=InteractionHotkey3
+		
+		[Assignment]
+		Key=J
+		Control=InteractionHotkey4
+		
+		[Assignment]
+		Key=K
+		Control=InteractionHotkey5
+		
+		[Assignment]
+		Key=X
+		Control=InteractionHotkey6
+		
+		[Assignment]
+		Key=B
+		Control=InteractionHotkey7
+		
+		[Assignment]
+		Key=M
+		Control=InteractionHotkey8
+		
+		[Assignment]
+		Key=W
+		Control=InteractionHotkey9
+		
+		[Assignment]
+		Key=V
+		Control=InteractionHotkey0
 		
 	# ======================================================================= #
 	#     Dualshock-like gamepad (10-12 buttons, 1 D-Pad, 2 analog stick)     #
@@ -1538,6 +1620,8 @@
 		Control=InteractionHotkey0
 		Priority=101
 		
+		# Hotkeys for choosing clonk
+		
 		[Assignment]
 		Key=Ctrl+Hotkey1
 		Control=PlayerHotkey1
diff --git a/src/gui/C4KeyboardInput.cpp b/src/gui/C4KeyboardInput.cpp
index c4df2adcd..0d58bbaae 100644
--- a/src/gui/C4KeyboardInput.cpp
+++ b/src/gui/C4KeyboardInput.cpp
@@ -278,22 +278,23 @@ const C4KeyCodeMapEntry KeyCodeMap [] =
 	{ VK_LAUNCH_APP1         , "LAUNCH_APP1"          , NULL },
 	{ VK_LAUNCH_APP2         , "LAUNCH_APP2"          , NULL },
 
-	{ VK_OEM_1          , "OEM Ü"    , "Ü" }, // German hax
+	{ VK_OEM_1          , "Comma_US"    , "Ü" }, // German hax
 	{ VK_OEM_PLUS       , "OEM +"   , "+" },
 	{ VK_OEM_COMMA      , "OEM ,"   , "," },
 	{ VK_OEM_MINUS      , "OEM -"   , "-" },
 	{ VK_OEM_PERIOD     , "OEM ."   , "." },
-	{ VK_OEM_2          , "OEM 2"    , "2" },
-	{ VK_OEM_3          , "OEM Ö"    , "Ö" }, // German hax
-	{ VK_OEM_4          , "OEM 4"    , "4" },
-	{ VK_OEM_5          , "OEM 5"    , "5" },
-	{ VK_OEM_6          , "OEM 6"    , "6" },
-	{ VK_OEM_7          , "OEM Ä"    , "Ä" }, // German hax
+	{ VK_OEM_2          , "OEM 2"   , "2" },
+	{ VK_OEM_3          , "OEM Ö"   , "Ö" }, // German hax
+	{ VK_OEM_4          , "OEM 4"   , "4" },
+	{ VK_OEM_5          , "OEM 5"   , "5" },
+	{ VK_OEM_6          , "OEM 6"   , "6" },
+	{ VK_OEM_7          , "OEM Ä"   , "Ä" }, // German hax
 	{ VK_OEM_8          , "OEM 8"   , "8" },
 	{ VK_OEM_AX         , "AX"      , "AX" },
-	{ VK_OEM_102        , "< > |"    , "<" }, // German hax
+	{ VK_OEM_102        , "Less" , "<" }, // German hax
+	{ VK_OEM_102        , "Backslash", NULL }, // German hax
 	{ VK_ICO_HELP       , "Help"    , "Help" },
-	{ VK_ICO_00         , "ICO_00"   , "00" },
+	{ VK_ICO_00         , "ICO_00"  , "00" },
 
 	{ VK_ICO_CLEAR      , "ICO_CLEAR"     , NULL },