2 files changed, 17 insertions, 3 deletions

diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index 2062a1dc21..4c36ee19e3 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -32,6 +32,9 @@
 #include "panic.h"
 #endif
 
+#if defined(SIMULATOR)
+#include "sim_icons.h"
+#endif
 
 
 /*** definitions ***/
@@ -492,8 +495,7 @@ void lcd_icon(int icon, bool enable)
 #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
 void lcd_icon(int icon, bool enable)
 {
-    icon = icon;
-    enable = enable;
+    sim_lcd_icon(icon, enable);
 }
 #endif
 
@@ -648,11 +650,19 @@ void lcd_update_rect (int x_start, int y,
  */
 void lcd_clear_display (void)
 {
-    memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
 #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
+    /* Clear just the text portion of the display */
+    int x, y;
+    for (y = 8; y <= (32 + 7); ++y)
+    {
+        for (x = 0; x < LCD_WIDTH; x++)
+            CLEAR_PIXEL(x, y);
+    }
     /* this function is being used when simulating a charcell LCD and
        then we update immediately */
     lcd_update();
+#else
+    memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
 #endif
 }
 
diff --git a/firmware/drivers/lcd.h b/firmware/drivers/lcd.h
index 4aab039f97..b99fa54389 100644
--- a/firmware/drivers/lcd.h
+++ b/firmware/drivers/lcd.h
@@ -46,6 +46,10 @@ extern void lcd_update_rect(int x, int y, int width, int height);
   #define lcd_update()
 #endif
 
+#if defined(SIMULATOR)
+#include "sim_icons.h"
+#endif
+
 #ifdef HAVE_LCD_CHARCELLS
 
 /* Icon definitions for lcd_icon() */