1 files changed, 15 insertions, 4 deletions

diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index c378ecbb81..f516cef1c3 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -380,17 +380,28 @@ F3: equal to "="
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define CALCULATOR_QUIT           BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
 
 #define CALCULATOR_LEFT  BUTTON_LEFT
 #define CALCULATOR_RIGHT BUTTON_RIGHT
 #define CALCULATOR_UP    BUTTON_UP
 #define CALCULATOR_DOWN  BUTTON_DOWN
-#define CALCULATOR_QUIT  BUTTON_REC
+#define CALCULATOR_QUIT  (BUTTON_REW|BUTTON_REPEAT)
+#define CALCULATOR_INPUT BUTTON_PLAY
+#define CALCULATOR_CALC  BUTTON_FFWD
+#define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL)
+#define CALCULATOR_OPERATORS BUTTON_REC
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+
+#define CALCULATOR_LEFT  BUTTON_LEFT
+#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_UP    BUTTON_UP
+#define CALCULATOR_DOWN  BUTTON_DOWN
+#define CALCULATOR_QUIT  (BUTTON_REW|BUTTON_REPEAT)
 #define CALCULATOR_INPUT BUTTON_PLAY
 #define CALCULATOR_CALC  BUTTON_FFWD
-#define CALCULATOR_CLEAR BUTTON_REW
+#define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL)
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD