1 files changed, 14 insertions, 5 deletions

diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 91613fcf88..d2744ea9f6 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -258,16 +258,25 @@
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define CALENDAR_QUIT       BUTTON_REC
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#define CALENDAR_QUIT       BUTTON_REW
 #define CALENDAR_SELECT     BUTTON_PLAY
 #define CALENDAR_NEXT_WEEK  BUTTON_DOWN
 #define CALENDAR_PREV_WEEK  BUTTON_UP
 #define CALENDAR_NEXT_DAY   BUTTON_RIGHT
 #define CALENDAR_PREV_DAY   BUTTON_LEFT
-#define CALENDAR_NEXT_MONTH BUTTON_FFWD
-#define CALENDAR_PREV_MONTH BUTTON_REW
+#define CALENDAR_NEXT_MONTH (BUTTON_FFWD|BUTTON_DOWN)
+#define CALENDAR_PREV_MONTH (BUTTON_FFWD|BUTTON_UP)
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+#define CALENDAR_QUIT       BUTTON_REW
+#define CALENDAR_SELECT     BUTTON_PLAY
+#define CALENDAR_NEXT_WEEK  BUTTON_DOWN
+#define CALENDAR_PREV_WEEK  BUTTON_UP
+#define CALENDAR_NEXT_DAY   BUTTON_RIGHT
+#define CALENDAR_PREV_DAY   BUTTON_LEFT
+#define CALENDAR_NEXT_MONTH (BUTTON_REC|BUTTON_DOWN)
+#define CALENDAR_PREV_MONTH (BUTTON_REC|BUTTON_UP)
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define CALENDAR_QUIT       BUTTON_REC