diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index e65d8bb703..b9529f4e54 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -161,24 +161,22 @@ PLUGIN_HEADER
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
 
 #define CALCULATOR_LEFT BUTTON_LEFT
-#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_RIGHT        BUTTON_RIGHT
 #define CALCULATOR_UP_W_SHIFT   BUTTON_SCROLL_BACK
 #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD
-#define CALCULATOR_QUIT BUTTON_MENU
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
-#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL)
-#define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT)
+#define CALCULATOR_QUIT         BUTTON_MENU
+#define CALCULATOR_INPUT        BUTTON_SELECT
+#define CALCULATOR_CALC         BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
 
-#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_LEFT  BUTTON_LEFT
 #define CALCULATOR_RIGHT BUTTON_RIGHT
-#define CALCULATOR_UP   BUTTON_UP
-#define CALCULATOR_DOWN BUTTON_DOWN
-#define CALCULATOR_QUIT BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
-#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL)
-#define CALCULATOR_CALC BUTTON_PLAY
+#define CALCULATOR_UP    BUTTON_UP
+#define CALCULATOR_DOWN  BUTTON_DOWN
+#define CALCULATOR_QUIT  BUTTON_POWER
+#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_CALC  BUTTON_PLAY
 #define CALCULATOR_CLEAR BUTTON_REC
 
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
@@ -223,14 +221,13 @@ PLUGIN_HEADER
 
 #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
 
-#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_LEFT  BUTTON_LEFT
 #define CALCULATOR_RIGHT BUTTON_RIGHT
-#define CALCULATOR_UP   BUTTON_UP
-#define CALCULATOR_DOWN BUTTON_DOWN
-#define CALCULATOR_QUIT BUTTON_BACK
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU
-#define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL)
-#define CALCULATOR_CALC BUTTON_SELECT
+#define CALCULATOR_UP    BUTTON_UP
+#define CALCULATOR_DOWN  BUTTON_DOWN
+#define CALCULATOR_QUIT  BUTTON_BACK
+#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_CALC  BUTTON_MENU
 #define CALCULATOR_CLEAR BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == MROBE100_PAD)