2 files changed, 7 insertions, 8 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 1a9636e8d8..1f49d4ec48 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -211,9 +211,7 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_RIGHT       BUTTON_RIGHT
 #define MPEG_START_TIME_UP          BUTTON_UP
 #define MPEG_START_TIME_DOWN        BUTTON_DOWN
-#define MPEG_START_TIME_LEFT2       BUTTON_REW
-#define MPEG_START_TIME_RIGHT2      BUTTON_FFWD
-#define MPEG_START_TIME_EXIT        BUTTON_REC
+#define MPEG_START_TIME_EXIT        BUTTON_REW
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define MPEG_START_TIME_SELECT      BUTTON_PLAY
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 66da5d52f7..712e6489a1 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -319,13 +319,14 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
       (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define MPEG_MENU       BUTTON_LEFT
-#define MPEG_STOP       BUTTON_RIGHT
-#define MPEG_PAUSE      BUTTON_PLAY
+#define MPEG_MENU       BUTTON_REW
+#define MPEG_STOP       (BUTTON_PLAY | BUTTON_REPEAT)
+#define MPEG_PAUSE      (BUTTON_PLAY | BUTTON_REL)
 #define MPEG_VOLDOWN    BUTTON_DOWN
 #define MPEG_VOLUP      BUTTON_UP
-#define MPEG_RW         BUTTON_REW
-#define MPEG_FF         BUTTON_FFWD
+#define MPEG_RW         BUTTON_LEFT
+#define MPEG_FF         BUTTON_RIGHT
+#define MPEG_SHOW_OSD   BUTTON_FFWD
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define MPEG_MENU       BUTTON_MENU