diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 5ef5d93f19ff9..0f4422fcd0801 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -100,7 +100,7 @@
AspectRatio
CodecInfo
Info
- SmallStepBack
+ Seek(-7)
OSD
AnalogRewind
AnalogFastForward
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index 09c1dec842cef..5a426c8fc7caf 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -167,7 +167,7 @@
-
+
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index f559b0edc6c8e..b6c7d8545e6b0 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -269,7 +269,7 @@
-->
-
+
@@ -290,7 +290,7 @@
-
+
@@ -710,4 +710,4 @@
-
\ No newline at end of file
+
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index 68266230db19f..796dd16de1e1b 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -124,7 +124,7 @@
-
+
AnalogRewind
AnalogFastForward
diff --git a/system/keymaps/joystick.Ouya.Controller.xml b/system/keymaps/joystick.Ouya.Controller.xml
index 347188d675183..a87b526b3acfa 100644
--- a/system/keymaps/joystick.Ouya.Controller.xml
+++ b/system/keymaps/joystick.Ouya.Controller.xml
@@ -80,7 +80,7 @@
-
+
diff --git a/system/keymaps/joystick.PS4.Controller.xml b/system/keymaps/joystick.PS4.Controller.xml
index 9634bd47c3944..6981d367112e3 100644
--- a/system/keymaps/joystick.PS4.Controller.xml
+++ b/system/keymaps/joystick.PS4.Controller.xml
@@ -84,7 +84,7 @@
-
+
StepBack
StepForward
diff --git a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
index 5bc5dd47851d7..e4d2d07c9266e 100644
--- a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
+++ b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
@@ -156,7 +156,7 @@
-
+
diff --git a/system/keymaps/joystick.xml.sample b/system/keymaps/joystick.xml.sample
index b171d1a06c8db..ef1abb5bf4780 100644
--- a/system/keymaps/joystick.xml.sample
+++ b/system/keymaps/joystick.xml.sample
@@ -106,7 +106,7 @@
-->
-
+
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index ad469e38d44ab..261d438e51548 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -154,6 +154,8 @@
Notification(MCEKeypress, DVD subtitle, 3)
Notification(MCEKeypress, DVD audio, 3)
+ ReloadKeymaps
+ ToggleDebug
@@ -249,7 +251,7 @@
StepForward
StepBack
Fullscreen
- SmallStepBack
+ Seek(-7)
BigStepForward
BigStepBack
OSD
diff --git a/system/keymaps/touchscreen.xml b/system/keymaps/touchscreen.xml
index 7b015b8a9561e..bd47a89c7d654 100644
--- a/system/keymaps/touchscreen.xml
+++ b/system/keymaps/touchscreen.xml
@@ -19,7 +19,7 @@
StepForward
ChapterOrBigStepForward
ChapterOrBigStepBack
- SmallStepBack
+ Seek(-7)