1 files changed, 8 insertions, 3 deletions

diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 53fede1c2c..414c191e6f 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -61,7 +61,6 @@
 #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2)
 
 #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \
-    CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD || \
     CONFIG_KEYPAD == MPIO_HD300_PAD
 #define USE_CORE_PREVNEXT
 #endif
@@ -154,9 +153,15 @@ const struct button_mapping pf_context_buttons[] =
 #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \
     CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD
     {PF_QUIT,         BUTTON_OFF,                 BUTTON_NONE},
-#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD || CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
-    CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
     {PF_QUIT,         BUTTON_REC,                 BUTTON_NONE},
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+    {PF_QUIT,         BUTTON_REW|BUTTON_REPEAT,   BUTTON_REW},
+    {PF_MENU,         BUTTON_REW|BUTTON_REL,      BUTTON_REW},
+    {PF_SELECT,       BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY},
+    {PF_CONTEXT,      BUTTON_FFWD|BUTTON_REPEAT,  BUTTON_FFWD},
+    {PF_TRACKLIST,    BUTTON_FFWD|BUTTON_REL,     BUTTON_FFWD},
+    {PF_WPS,          BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY},
 #endif
 #if CONFIG_KEYPAD == IAUDIO_M3_PAD
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD|CONTEXT_REMOTE)