diff --git a/apps/gui/backdrop.c b/apps/gui/backdrop.c
index 28216da4e0..e97c17ab73 100644
--- a/apps/gui/backdrop.c
+++ b/apps/gui/backdrop.c
@@ -27,9 +27,9 @@
 #endif
 #include "backdrop.h"
 
-static fb_data main_backdrop[LCD_FBHEIGHT][LCD_FBHEIGHT]
+static fb_data main_backdrop[LCD_FBHEIGHT][LCD_FBWIDTH]
                 __attribute__ ((aligned (16)));
-static fb_data skin_backdrop[LCD_FBHEIGHT][LCD_FBHEIGHT]
+static fb_data skin_backdrop[LCD_FBHEIGHT][LCD_FBWIDTH]
                 __attribute__ ((aligned (16)));
 
 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
@@ -155,6 +155,11 @@ static inline void unload_remote_skin_backdrop(void)
     remote_skin_backdrop_valid = false;
 }
 
+static inline void show_remote_main_backdrop(void)
+{
+    lcd_remote_set_backdrop(NULL);
+}
+
 static inline void show_remote_skin_backdrop(void)
 {
     /* if no wps backdrop, fall back to main backdrop */
@@ -168,11 +173,6 @@ static inline void show_remote_skin_backdrop(void)
     }
 }
 
-static line void show_remote_main_backdrop(void)
-{
-    lcd_remote_set_backdrop(NULL);
-}
-
 
 /* api functions */
 bool remote_backdrop_load(enum backdrop_type bdrop,
diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h
index f3ef1d7686..0778fa9f2f 100644
--- a/apps/gui/backdrop.h
+++ b/apps/gui/backdrop.h
@@ -59,7 +59,7 @@ static inline void backdrop_show(enum backdrop_type bdrop)
 /* no main backdrop, stubs! */
 #if LCD_REMOTE_DEPTH > 1
 bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename);
-void remote_backdropunload(enum backdrop_type bdrop);
+void remote_backdrop_unload(enum backdrop_type bdrop);
 void remote_backdrop_show(enum backdrop_type bdrop);
 #else
 static inline