1 files changed, 18 insertions, 19 deletions

diff --git a/firmware/target/hosted/sdl/app/button-target.h b/firmware/target/hosted/sdl/app/button-target.h
index 54ae3a2fae..5295315e2e 100644
--- a/firmware/target/hosted/sdl/app/button-target.h
+++ b/firmware/target/hosted/sdl/app/button-target.h
@@ -34,27 +34,26 @@ void button_init_device(void);
 int button_read_device(int *data);
 
 /* Main unit's buttons */
-#define BUTTON_POWER      0x00000001
-#define BUTTON_PLUS       0x00000002
-#define BUTTON_MINUS      0x00000004
-#define BUTTON_MENU       0x00000008
-
-/* Compatibility hacks for flipping. Needs a somewhat better fix. */
-#define BUTTON_LEFT  BUTTON_MIDLEFT
-#define BUTTON_RIGHT BUTTON_MIDRIGHT
-#define BUTTON_UP    BUTTON_TOPMIDDLE
-#define BUTTON_DOWN  BUTTON_BOTTOMMIDDLE
+#define BUTTON_UP           0x00000001
+#define BUTTON_DOWN         0x00000002
+#define BUTTON_LEFT         0x00000004
+#define BUTTON_RIGHT        0x00000008
+#define BUTTON_SELECT       0x00000010
+#define BUTTON_MENU         0x00000020
+#define BUTTON_BACK         0x00000040
+#define BUTTON_SCROLL_FWD   0x00000100
+#define BUTTON_SCROLL_BACK  0x00000200
 
 /* Touch Screen Area Buttons */
-#define BUTTON_TOPLEFT      0x00000010
-#define BUTTON_TOPMIDDLE    0x00000020
-#define BUTTON_TOPRIGHT     0x00000040
-#define BUTTON_MIDLEFT      0x00000080
-#define BUTTON_CENTER       0x00000100
-#define BUTTON_MIDRIGHT     0x00000200
-#define BUTTON_BOTTOMLEFT   0x00000400
-#define BUTTON_BOTTOMMIDDLE 0x00000800
-#define BUTTON_BOTTOMRIGHT  0x00001000
+#define BUTTON_TOPLEFT      0x00001000
+#define BUTTON_TOPMIDDLE    0x00002000
+#define BUTTON_TOPRIGHT     0x00004000
+#define BUTTON_MIDLEFT      0x00008000
+#define BUTTON_CENTER       0x00010000
+#define BUTTON_MIDRIGHT     0x00020000
+#define BUTTON_BOTTOMLEFT   0x00040000
+#define BUTTON_BOTTOMMIDDLE 0x00080000
+#define BUTTON_BOTTOMRIGHT  0x00100000
 
 #define BUTTON_MAIN 0x1FFF