3 files changed, 6 insertions, 5 deletions

diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index 84d49464c0..db94362352 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -66,16 +66,17 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
     struct viewport vp = bb_vp[display->screen_type];
 
     button_width = display->lcdwidth/BUTTONBAR_MAX_BUTTONS;
-    vp.width = button_width;
+    vp.width = button_width-1;
     vp.x = button_width * num;
     display->set_viewport(&vp);
-    display->fillrect(0, 0, button_width - 1, vp.height);
+    display->fill_viewport(NULL);
     if(buttonbar->caption[num][0] != 0)
     {
         display->getstringsize(buttonbar->caption[num], &fw, &fh);
         display->putsxy((button_width - fw)/2,
                         (vp.height-fh)/2, buttonbar->caption[num]);
     }
+    display->set_viewport(NULL);
 }
 
 void gui_buttonbar_set(struct gui_buttonbar * buttonbar,
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 10dee12052..8c5f57fdd9 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -163,7 +163,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
 #endif
         vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
 
-    screen->fillrect(0, 0, vp.width, vp.height);
+    screen->fill_viewport(NULL);
 
 #if LCD_DEPTH > 1
     if (screen->depth > 1)
@@ -174,7 +174,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
 #endif
         vp.drawmode = DRMODE_SOLID;
 
-    screen->drawrect(0, 0, vp.width, vp.height);
+    screen->draw_viewport(NULL);
 
     /* prepare putting the text */
     y = RECT_SPACING;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 73ccfa7762..a05a11a502 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -280,7 +280,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
     {
         display->set_viewport(vp);
         display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
-        display->fillrect(0, 0, display->getwidth(), STATUSBAR_HEIGHT);
+        display->fill_viewport(NULL);
         display->set_drawmode(DRMODE_SOLID);
 
         if (bar->info.battery_state)