diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h
index 8dcd2b653d..57f537be9b 100644
--- a/apps/plugins/lib/pluginlib_actions.h
+++ b/apps/plugins/lib/pluginlib_actions.h
@@ -64,19 +64,19 @@ static const struct button_mapping generic_directions[] =
 #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
     { PLA_UP,                BUTTON_SCROLL_FWD,      BUTTON_NONE},
     { PLA_DOWN,              BUTTON_SCROLL_BACK,     BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_SCROLL_BACK,     BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_SCROLL_FWD,      BUTTON_NONE},
+    { PLA_LEFT,              BUTTON_LEFT,            BUTTON_NONE},
+    { PLA_RIGHT,             BUTTON_RIGHT,           BUTTON_NONE},
     { PLA_UP_REPEAT,         BUTTON_SCROLL_FWD,      BUTTON_NONE},
     { PLA_DOWN_REPEAT,       BUTTON_SCROLL_BACK,     BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_SCROLL_BACK,     BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_SCROLL_FWD,      BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_LEFT,            BUTTON_NONE},
+    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT,           BUTTON_NONE},
 #elif CONFIG_KEYPAD == ONDIO_PAD
-    { PLA_UP,                BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_LEFT,                BUTTON_NONE},
+    { PLA_UP,                BUTTON_UP,                  BUTTON_NONE},
+    { PLA_DOWN,              BUTTON_DOWN,                BUTTON_NONE},
     { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
     { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
+    { PLA_UP_REPEAT,         BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE},
+    { PLA_DOWN_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
 #elif CONFIG_KEYPAD == PLAYER_PAD