2 files changed, 7 insertions, 2 deletions

diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 56d1647d9b..80de707a72 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -93,10 +93,15 @@
                                                 7*ICONS_SPACING
 #define STATUSBAR_LOCKR_WIDTH                   5
 
+#if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
 #define STATUSBAR_DISK_WIDTH                    12
 #define STATUSBAR_DISK_X_POS(statusbar_width)   statusbar_width - \
                                                 STATUSBAR_DISK_WIDTH
-#define STATUSBAR_TIME_X_END(statusbar_width)   statusbar_width-1
+#else
+#define STATUSBAR_DISK_WIDTH                    0
+#endif
+#define STATUSBAR_TIME_X_END(statusbar_width)   statusbar_width - 1 - \
+                                                STATUSBAR_DISK_WIDTH
 
 struct gui_syncstatusbar statusbars;
 
diff --git a/apps/settings.h b/apps/settings.h
index 4bc0904fe4..263147c92c 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -53,7 +53,7 @@
 #define SETTINGS_CANCEL2 BUTTON_MODE
 #define SETTINGS_PREV    BUTTON_LEFT
 #define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_MODE
+#define SETTINGS_ACCEPT  BUTTON_ON
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define SETTINGS_INC     BUTTON_UP