diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 2c8e473c11..bcb9169c57 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -2101,6 +2101,7 @@ static bool f2_rec_screen(void)
 
     FOR_NB_SCREENS(i)
     {
+        screens[i].set_viewport(NULL);
         screens[i].setfont(FONT_SYSFIXED);
         screens[i].getstringsize("A",&w,&h);
     }
@@ -2236,6 +2237,7 @@ static bool f3_rec_screen(void)
 
     FOR_NB_SCREENS(i)
     {
+        screens[i].set_viewport(NULL);
         screens[i].setfont(FONT_SYSFIXED);
         screens[i].getstringsize("A",&w,&h);
     }
diff --git a/apps/settings.c b/apps/settings.c
index 51846fa2b2..412bedc464 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -966,7 +966,7 @@ void settings_apply(bool read_disk)
 #endif
 #ifdef HAVE_LCD_BITMAP
     /* already called with THEME_STATUSBAR in settings_apply_skins() */
-    viewportmanager_theme_changed(THEME_UI_VIEWPORT|THEME_LANGUAGE);
+    viewportmanager_theme_changed(THEME_UI_VIEWPORT|THEME_LANGUAGE|THEME_BUTTONBAR);
 #endif
 }