diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index cd0d3694ba..d596f43b83 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -205,6 +205,7 @@ PLUGIN_HEADER
 #define VIEWER_MENU BUTTON_REW
 #define VIEWER_AUTOSCROLL BUTTON_PLAY
 
+/*M-Robe 500 keys */
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define VIEWER_QUIT BUTTON_POWER
 #define VIEWER_PAGE_UP BUTTON_RC_PLAY
@@ -214,15 +215,22 @@ PLUGIN_HEADER
 #define VIEWER_MENU BUTTON_RC_HEART
 #define VIEWER_AUTOSCROLL BUTTON_RC_MODE
 
+/*Gigabeat S keys */
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define VIEWER_QUIT BUTTON_BACK
-#define VIEWER_PAGE_UP BUTTON_VOL_UP
-#define VIEWER_PAGE_DOWN BUTTON_VOL_DOWN
-#define VIEWER_SCREEN_LEFT BUTTON_LEFT
-#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
+#define VIEWER_PAGE_UP BUTTON_PREV
+#define VIEWER_PAGE_DOWN BUTTON_NEXT
+#define VIEWER_SCREEN_LEFT (BUTTON_PLAY | BUTTON_LEFT)
+#define VIEWER_SCREEN_RIGHT (BUTTON_PLAY | BUTTON_RIGHT)
 #define VIEWER_MENU BUTTON_MENU
-#define VIEWER_AUTOSCROLL BUTTON_PLAY
+#define VIEWER_AUTOSCROLL_PRE BUTTON_PLAY
+#define VIEWER_AUTOSCROLL (BUTTON_PLAY|BUTTON_REL)
+#define VIEWER_LINE_UP BUTTON_UP
+#define VIEWER_LINE_DOWN BUTTON_DOWN
+#define VIEWER_COLUMN_LEFT BUTTON_LEFT
+#define VIEWER_COLUMN_RIGHT BUTTON_RIGHT
 
+/*M-Robe 100 keys */
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define VIEWER_QUIT BUTTON_POWER
 #define VIEWER_PAGE_UP BUTTON_UP
@@ -241,9 +249,9 @@ PLUGIN_HEADER
 #define VIEWER_SCREEN_RIGHT BUTTON_RC_FF
 #define VIEWER_MENU BUTTON_RC_MENU
 #define VIEWER_AUTOSCROLL BUTTON_RC_MODE
-
 #define VIEWER_RC_QUIT BUTTON_REC
 
+/* Cowon D2 keys */
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define VIEWER_QUIT BUTTON_POWER
 #define VIEWER_MENU BUTTON_MENU