2 files changed, 13 insertions, 4 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 38fa55b02d..5bf4706c59 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -82,15 +82,20 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
     unsigned short ch;
     unsigned short *ucs;
     struct font* pf = font_get(current_vp->font);
+    int vp_flags = current_vp->flags;
 
     ucs = bidi_l2v(str, 1);
 
-    if (VP_IS_RTL(current_vp))
+    if ((vp_flags & VP_FLAG_ALIGNMENT_MASK) != 0)
     {
         int w;
 
         LCDFN(getstringsize)(str, &w, NULL);
-        x = current_vp->width - w - x;
+        /* center takes precedence */
+        if (vp_flags & VP_FLAG_CENTER_ALIGN)
+            x = ((current_vp->width - w)/ 2) + x;
+        else
+            x = current_vp->width - w - x;
     }
 
     while ((ch = *ucs++) != 0 && x < current_vp->width)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 2c66b5f8b3..463714ff03 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -26,9 +26,13 @@
 #include "cpu.h"
 #include "config.h"
 
-#define VP_FLAG_IS_RTL 0x01
+#define VP_FLAG_IS_RTL       0x01
+#define VP_FLAG_CENTER_ALIGN 0x02
 
-#define VP_IS_RTL(vp) (((vp)->flags & VP_FLAG_IS_RTL) != 0)
+#define VP_FLAG_ALIGNMENT_MASK \
+        (VP_FLAG_IS_RTL|VP_FLAG_CENTER_ALIGN)
+
+#define VP_IS_RTL(vp) (((vp)->flags & VP_FLAG_ALIGNMENT_MASK) == VP_FLAG_IS_RTL)
 
 struct viewport {
     int x;