2 files changed, 14 insertions, 24 deletions

diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index 5684ff057c..a9075b1b0f 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -44,19 +44,11 @@
 /* We dont actually do anything with these pointers,
    but they need to be grouped like this to save code
    so storing them as void* is ok. (stops compile warning) */
-static const struct bitmap inbuilt_iconset[NB_SCREENS] =
+static const struct bitmap *inbuilt_iconset[NB_SCREENS] =
 {
-    {
-        .width = BMPWIDTH_default_icons,
-        .height = BMPHEIGHT_default_icons,
-        .data = (unsigned char*)default_icons,
-    },
+    &bm_default_icons,
 #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
-    {
-        .width = BMPWIDTH_remote_default_icons,
-        .height = BMPHEIGHT_remote_default_icons,
-        .data = (unsigned char*)remote_default_icons,
-    },
+    &bm_remote_default_icons,
 #endif
 };
 
@@ -74,11 +66,11 @@ struct iconset {
 } iconsets[Iconset_Count][NB_SCREENS];
 
 #define ICON_HEIGHT(screen) (!iconsets[Iconset_user][screen].loaded ?       \
-                             inbuilt_iconset[screen] : iconsets[Iconset_user][screen].bmp).height \
+                             (*(inbuilt_iconset[screen])) : iconsets[Iconset_user][screen].bmp).height \
                             / Icon_Last_Themeable
 
 #define ICON_WIDTH(screen)  (!iconsets[Iconset_user][screen].loaded ?       \
-                             inbuilt_iconset[screen] : iconsets[Iconset_user][screen].bmp).width
+                             (*(inbuilt_iconset[screen])) : iconsets[Iconset_user][screen].bmp).width
 
 /* x,y in letters, not pixles */
 void screen_put_icon(struct screen * display, 
@@ -140,7 +132,7 @@ void screen_put_iconxy(struct screen * display,
     }
     else
     {
-        iconset = &inbuilt_iconset[screen];
+        iconset = inbuilt_iconset[screen];
     }
     /* add some left padding to the icons if they are on the edge */
     if (xpos == 0)
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 2b7d47209b..002f4557bb 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -184,6 +184,12 @@ static void usb_screen_fix_viewports(struct screen *screen,
 
 static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 {
+    static const struct bitmap* logos[NB_SCREENS] = {
+        &bm_usblogo,
+#ifdef HAVE_RE
+        &bm_remote_usblogo,
+#endif
+    };
     FOR_NB_SCREENS(i)
     {
         struct screen *screen = &screens[i];
@@ -200,17 +206,9 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 
 #ifdef HAVE_LCD_BITMAP
         screen->set_viewport(logo);
-#ifdef HAVE_REMOTE_LCD
-        if (i == SCREEN_REMOTE)
-        {
-            screen->bitmap(remote_usblogo, 0, 0, logo->width,
-                logo->height);
-        }
-        else
-#endif
+        screen->bmp(logos[i], 0, 0);
+        if (i == SCREEN_MAIN)
         {
-            screen->transparent_bitmap(usblogo, 0, 0, logo->width,
-                logo->height);
 #ifdef USB_ENABLE_HID
             if (usb_hid)
             {