diff --git a/apps/gui/line.c b/apps/gui/line.c
index 3d563d171c..c0fb936f27 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -31,6 +31,7 @@
 #include "screens.h"
 #include "settings.h"
 #include "debug.h"
+#include "viewport.h"
 
 #ifdef HAVE_REMOTE_LCD
 #define MAX_LINES (LCD_SCROLLABLE_LINES + LCD_REMOTE_SCROLLABLE_LINES)
@@ -278,7 +279,7 @@ static void style_line(struct screen *display,
 
     switch (style & _STYLE_DECO_MASK)
     {
-#if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
+#ifdef HAVE_LCD_COLOR
         case STYLE_GRADIENT:
             display->set_drawmode(DRMODE_FG);
             display->gradient_fillrect_part(x, y, width, height,
@@ -318,7 +319,7 @@ static void style_line(struct screen *display,
         else if (style & (STYLE_GRADIENT|STYLE_COLORBAR))
             display->set_foreground(line->text_color);
         else
-            display->set_foreground(global_settings.fg_color);
+            display->set_foreground(get_viewport_default_colour(display->screen_type, true));
     }
 #endif
 }
@@ -332,7 +333,7 @@ void vput_line(struct screen *display,
     print_line(display, x, y, line, fmt, ap);
 #if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
     if (display->depth > 1)
-        display->set_foreground(global_settings.fg_color);
+        display->set_foreground(get_viewport_default_colour(display->screen_type, true));
 #endif
     display->set_drawmode(DRMODE_SOLID);
 }
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index 43914699d6..7d0f42259b 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -105,7 +105,6 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
 #ifdef HAVE_LCD_BITMAP
     struct wps_data *data = gwps->data;
     bool do_refresh = (element->tag->flags & info->refresh_type) > 0;
-    struct line_desc *linedes = &info->line_desc;
 #endif
     switch (token->type)
     {   
@@ -132,6 +131,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
              * come before the text style tag color fields need to be preserved */
             if (data->style & STYLE_GRADIENT)
             {
+                struct line_desc *linedes = &info->line_desc;
                 fb_data tc  = linedes->text_color,
                         lc  = linedes->line_color,
                         lec = linedes->line_end_color;
@@ -149,6 +149,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
         case SKIN_TOKEN_VIEWPORT_GRADIENT_SETUP:
         {
             struct gradient_config *cfg = SKINOFFSETTOPTR(skin_buffer, token->value.data);
+            struct line_desc *linedes = &info->line_desc;
             linedes->text_color     = cfg->text;
             linedes->line_color     = cfg->start;
             linedes->line_end_color = cfg->end;