3 files changed, 24 insertions, 2 deletions

diff --git a/apps/action.c b/apps/action.c
index ee84706b09..cde57441e7 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -34,6 +34,9 @@
 #include "settings.h"
 #include "pcmbuf.h"
 #include "misc.h"
+#if defined(HAVE_LCD_BITMAP) && !defined(BOOTLOADER)
+#include "language.h"
+#endif
 
 static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to
                                                     work on startup */
@@ -56,6 +59,20 @@ static int unlock_combo = BUTTON_NONE;
 static bool screen_has_lock = false;
 #endif /* HAVE_SOFTWARE_KEYLOCK */
 
+#if defined(HAVE_LCD_BITMAP) && !defined(BOOTLOADER)
+/*
+ * checks whether the given language and context combination require that the
+ * button is horizontally inverted to support RTL language
+ *
+ */
+static bool rtl_button_flip_needed(int context)
+{
+    return lang_is_rtl() && ((context == CONTEXT_STD) ||
+            (context & CONTEXT_TREE) || (context & CONTEXT_MAINMENU) ||
+            (context & CONTEXT_TREE));
+}
+#endif
+
 /*
  * do_button_check is the worker function for get_default_action.
  * returns ACTION_UNKNOWN or the requested return value from the list.
@@ -201,6 +218,11 @@ static int get_action_worker(int context, int timeout,
     context &= ~ALLOW_SOFTLOCK;
 #endif /* HAS_BUTTON_HOLD */
 
+#if defined(HAVE_LCD_BITMAP) && !defined(BOOTLOADER)
+        if (rtl_button_flip_needed(context))
+            button = button_flip_horizontally(button);
+#endif
+
     /*   logf("%x,%x",last_button,button); */
     while (1)
     {
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 5559ecebe7..afbb19c60d 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -67,7 +67,7 @@ static int flipdisplay_callback(int action,const struct menu_item_ex *this_item)
     switch (action)
     {
         case ACTION_EXIT_MENUITEM:
-            button_set_flip(global_settings.flip_display);
+            button_set_flip_vertically(global_settings.flip_display);
             lcd_set_flip(global_settings.flip_display);
             lcd_update();
 #ifdef HAVE_REMOTE_LCD
diff --git a/apps/settings.c b/apps/settings.c
index ce1ee07054..ac80d12492 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -846,7 +846,7 @@ void settings_apply(bool read_disk)
 #endif
 #ifdef HAVE_LCD_FLIP
     lcd_set_flip(global_settings.flip_display);
-    button_set_flip(global_settings.flip_display);
+    button_set_flip_vertically(global_settings.flip_display);
 #endif
     lcd_update(); /* refresh after flipping the screen */
     settings_apply_pm_range();