Index: apps/plugins/sliding_puzzle.c
===================================================================
--- apps/plugins/sliding_puzzle.c	(revision 20700)
+++ apps/plugins/sliding_puzzle.c	(working copy)
@@ -414,6 +414,7 @@
         rb->lcd_getstringsize(s, &w, &h);
         rb->lcd_putsxy(x + (SPOTS_WIDTH/2) - w / 2,
                        y + (SPOTS_HEIGHT/2) - h / 2, s);
+        rb->lcd_setfont(FONT_UI);
     }
 }
 
Index: apps/plugins/flipit.c
===================================================================
--- apps/plugins/flipit.c	(revision 20700)
+++ apps/plugins/flipit.c	(working copy)
@@ -773,7 +773,9 @@
     rb->srand(*rb->current_tick);
 
     rc = flipit_loop();
-#ifdef HAVE_LCD_CHARCELLS
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setfont(FONT_UI);
+#else /* HAVE_LCD_CHARCELLS */
     release_gfx();
 #endif
     return rc;
Index: apps/plugins/rockblox1d.c
===================================================================
--- apps/plugins/rockblox1d.c	(revision 20700)
+++ apps/plugins/rockblox1d.c	(working copy)
@@ -300,6 +300,7 @@
 
     } while (!quit);
  
+    rb->lcd_setfont(FONT_UI);
     return PLUGIN_OK;
 }
 #endif
Index: apps/plugins/battery_bench.c
===================================================================
--- apps/plugins/battery_bench.c	(revision 20700)
+++ apps/plugins/battery_bench.c	(working copy)
@@ -240,6 +240,9 @@
 {
     long button;
     (void)reenter;
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setfont(FONT_SYSFIXED);
+#endif
     rb->lcd_clear_display();
     rb->lcd_puts_scroll(0, 0, "Batt.Bench is currently running.");
     rb->lcd_puts_scroll(0, 1, "Press " BATTERY_OFF_TXT " to cancel the test");
@@ -247,6 +250,9 @@
     rb->lcd_puts_scroll(0, 2, "Anything else will resume");
 #endif
     rb->lcd_update();
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setfont(FONT_UI);
+#endif
 
     while (1)
     {
@@ -471,6 +477,9 @@
                     rb->lcd_remote_putsxy,LCD_REMOTE_WIDTH,2);
     rb->lcd_remote_update();
 #endif
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setfont(FONT_UI);
+#endif
     
     do
     {
Index: apps/plugins/fireworks.c
===================================================================
--- apps/plugins/fireworks.c	(revision 20700)
+++ apps/plugins/fireworks.c	(working copy)
@@ -349,7 +349,6 @@
     int m, result;
     bool menu_quit = false;
 
-    rb->lcd_setfont(FONT_UI);
 #ifdef HAVE_LCD_COLOR
     rb->lcd_set_background(LCD_BLACK);
     rb->lcd_set_foreground(LCD_WHITE);
@@ -369,8 +368,6 @@
         switch(result)
         {
             case 0:
-                rb->lcd_setfont(FONT_SYSFIXED);
-
 #ifdef HAVE_LCD_COLOR
                 rb->lcd_set_background(LCD_BLACK);
                 rb->lcd_set_foreground(LCD_WHITE);
Index: apps/plugins/snake2.c
===================================================================
--- apps/plugins/snake2.c	(revision 20700)
+++ apps/plugins/snake2.c	(working copy)
@@ -1477,6 +1477,7 @@
 
     if (num_levels == 0) {
         rb->splash(HZ*2, "Failed loading levels!");
+        rb->lcd_setfont(FONT_UI);
         return PLUGIN_OK;
     }
 
@@ -1498,6 +1499,7 @@
     }
 
     iohiscore();
+    rb->lcd_setfont(FONT_UI);
     return (quit==1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED;
 }
 
Index: apps/plugins/midi/midiplay.c
===================================================================
--- apps/plugins/midi/midiplay.c	(revision 20700)
+++ apps/plugins/midi/midiplay.c	(working copy)
@@ -423,7 +423,7 @@
         rb->splash(HZ*2, " Play .MID file ");
         return PLUGIN_OK;
     }
-    rb->lcd_setfont(0);
+    rb->lcd_setfont(FONT_SYSFIXED);
 
 #if defined(HAVE_ADJUSTABLE_CPU_FREQ)
     rb->cpu_boost(true);
@@ -450,6 +450,7 @@
 #endif
     rb->splash(HZ, "FINISHED PLAYING");
 
+    rb->lcd_setfont(FONT_UI);
     if (retval == -1)
         return PLUGIN_ERROR;
     return PLUGIN_OK;
Index: apps/plugins/star.c
===================================================================
--- apps/plugins/star.c	(revision 20700)
+++ apps/plugins/star.c	(working copy)
@@ -1147,6 +1147,7 @@
         rb->lcd_getstringsize("a", &char_width, &char_height);
         level--;
         star_run_game(level);
+        rb->lcd_setfont(FONT_UI);
     }
     return PLUGIN_OK;
 }
Index: apps/plugins/calendar.c
===================================================================
--- apps/plugins/calendar.c	(revision 20700)
+++ apps/plugins/calendar.c	(working copy)
@@ -876,6 +876,8 @@
                 break;
         }
     }
+    if(use_system_font)
+        rb->lcd_setfont(FONT_UI);
     return been_in_usb_mode?PLUGIN_USB_CONNECTED:PLUGIN_OK;
 }
 
Index: apps/plugins/doom/rockdoom.c
===================================================================
--- apps/plugins/doom/rockdoom.c	(revision 20700)
+++ apps/plugins/doom/rockdoom.c	(working copy)
@@ -688,7 +688,7 @@
    rb->cpu_boost(true);
 #endif
 
-   rb->lcd_setfont(0);
+   rb->lcd_setfont(FONT_SYSFIXED);
 
    // We're using doom's memory management since it implements a proper free (and re-uses the memory)
    // and now with prboom's code: realloc and calloc
@@ -711,6 +711,7 @@
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
        rb->cpu_boost(false);
 #endif
+       rb->lcd_setfont(FONT_UI);
        if( result == -1 )
            return PLUGIN_OK; // Quit was selected
        else
@@ -732,7 +733,7 @@
 
    Dhandle_ver( namemap[ result ] );
 
-   rb->lcd_setfont(0);
+   rb->lcd_setfont(FONT_SYSFIXED);
 
    rb->lcd_clear_display();
 
@@ -773,6 +774,7 @@
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
    rb->cpu_boost(false);
 #endif
+   rb->lcd_setfont(FONT_UI);
 
    return PLUGIN_OK;
 }
Index: apps/plugins/greyscale.c
===================================================================
--- apps/plugins/greyscale.c	(revision 20700)
+++ apps/plugins/greyscale.c	(working copy)
@@ -363,6 +363,7 @@
             case GREYSCALE_OFF:
 
                 cleanup(NULL);
+                rb->lcd_setfont(FONT_UI);
                 return PLUGIN_OK;
         }
     }
Index: apps/plugins/cube.c
===================================================================
--- apps/plugins/cube.c	(revision 20700)
+++ apps/plugins/cube.c	(working copy)
@@ -809,9 +809,12 @@
             lastbutton = button;
     }
 
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setfont(FONT_UI);
 #ifdef USE_GSLIB
     grey_release();
-#elif defined(HAVE_LCD_CHARCELLS)
+#endif
+#else /* HAVE_LCD_CHARCELLS */
     pgfx_release();
 #endif
     return PLUGIN_OK;
Index: apps/plugins/test_boost.c
===================================================================
--- apps/plugins/test_boost.c	(revision 20700)
+++ apps/plugins/test_boost.c	(working copy)
@@ -63,5 +63,6 @@
         }
     }
 
+    rb->lcd_setfont(FONT_UI);
     return PLUGIN_OK;
 }
Index: apps/plugins/vu_meter.c
===================================================================
--- apps/plugins/vu_meter.c	(revision 20700)
+++ apps/plugins/vu_meter.c	(working copy)
@@ -782,6 +782,7 @@
 #endif
             case VUMETER_QUIT:
                 save_settings();
+                rb->lcd_setfont(FONT_UI);
                 return PLUGIN_OK;
                 break;
 
@@ -808,8 +809,10 @@
                 if (lastbutton != VUMETER_MENU_PRE)
                     break;
 #endif
-                if(vu_meter_menu())
+                if(vu_meter_menu()) {
+                    rb->lcd_setfont(FONT_UI);
                     return PLUGIN_OK;
+                }
                 break;
 
             case VUMETER_UP:
@@ -823,8 +826,10 @@
                 break;
 
             default:
-                if(rb->default_event_handler(button) == SYS_USB_CONNECTED)
+                if(rb->default_event_handler(button) == SYS_USB_CONNECTED) {
+                    rb->lcd_setfont(FONT_UI);
                     return PLUGIN_USB_CONNECTED;
+                }
                 break;
         }
         if (button != BUTTON_NONE)
Index: apps/plugins/rockboy/menu.c
===================================================================
--- apps/plugins/rockboy/menu.c	(revision 20700)
+++ apps/plugins/rockboy/menu.c	(working copy)
@@ -135,7 +135,7 @@
 
     menu_exit(m);
 
-    rb->lcd_setfont(0); /* Reset the font */
+    rb->lcd_setfont(FONT_SYSFIXED); /* Reset the font */
     rb->lcd_clear_display(); /* Clear display for screen size changes */
     
     /* Keep the RTC in sync */
Index: apps/plugins/rockboy/rockboy.c
===================================================================
--- apps/plugins/rockboy/rockboy.c	(revision 20700)
+++ apps/plugins/rockboy/rockboy.c	(working copy)
@@ -332,8 +332,6 @@
 {
     PLUGIN_IRAM_INIT(rb)
 
-    rb->lcd_setfont(0);
-
     rb->lcd_clear_display();
 
     if (!parameter)
@@ -368,8 +366,12 @@
     rb->wheel_send_events(false);
 #endif
 
+    rb->lcd_setfont(FONT_SYSFIXED);
+
     gnuboy_main(parameter);
 
+    rb->lcd_setfont(FONT_UI);
+
 #ifdef HAVE_WHEEL_POSITION
     rb->wheel_send_events(true);
 #endif
Index: apps/plugins/sokoban.c
===================================================================
--- apps/plugins/sokoban.c	(revision 20700)
+++ apps/plugins/sokoban.c	(working copy)
@@ -893,6 +893,7 @@
     int c, r;
     int rows, cols;
 
+    rb->lcd_setfont(SOKOBAN_FONT);
 #if LCD_WIDTH - (COLS*SOKOBAN_TILESIZE) < 32
 #define STAT_HEIGHT 25
 #define STAT_X (LCD_WIDTH - 120)/2
@@ -1001,6 +1002,7 @@
 
     /* print out the screen */
     rb->lcd_update();
+    rb->lcd_setfont(FONT_UI);
 }
 
 static void draw_level(void)
@@ -1358,6 +1360,7 @@
 
                 FOR_NB_SCREENS(i)
                     rb->screens[i]->update();
+                rb->lcd_setfont(FONT_UI);
 
                 /* Display until keypress */
                 do {
@@ -1386,9 +1389,6 @@
 
     } while (!menu_quit);
 
-    /* Restore font */
-    rb->lcd_setfont(SOKOBAN_FONT);
-
     FOR_NB_SCREENS(i) {
         rb->screens[i]->clear_display();
         rb->screens[i]->update();
@@ -1519,6 +1519,7 @@
 
             if (moved) {
                 rb->lcd_clear_display();
+                rb->lcd_setfont(SOKOBAN_FONT);
 
                 /* Show level complete message & stats */
                 rb->snprintf(buf, sizeof(buf), "Level %d Complete!",
@@ -1544,6 +1545,7 @@
                 }
 
                 rb->lcd_update();
+                rb->lcd_setfont(FONT_UI);
                 rb->sleep(HZ/4);
                 rb->button_clear_queue();
 
@@ -1582,8 +1584,6 @@
                             save(buf, true);
                     } else
                         rb->splash(HZ*2, "Solution too long to save");
-
-                    rb->lcd_setfont(SOKOBAN_FONT); /* Restore font */
                 }
             }
 
@@ -1599,6 +1599,7 @@
 
             if (current_info.level.index >= current_info.max_level) {
                 /* Show levelset complete message */
+                rb->lcd_setfont(SOKOBAN_FONT);
                 rb->snprintf(buf, sizeof(buf), "You WIN!!");
                 rb->lcd_getstringsize(buf, &w, &h);
                 rb->lcd_putsxy(LCD_WIDTH/2 - w/2, LCD_HEIGHT/2 - h/2, buf);
@@ -1615,6 +1616,7 @@
                         break;
                 }
                 rb->lcd_set_drawmode(DRMODE_SOLID);
+                rb->lcd_setfont(FONT_UI);
 
                 /* Reset to first level & show quit menu */
                 current_info.level.index = 0;
@@ -1652,6 +1654,7 @@
 
     init_boards();
 
+    rb->lcd_setfont(FONT_UI);
     if (parameter == NULL) {
         /* Attempt to resume saved progress, otherwise start at beginning */
         if (!load(SOKOBAN_SAVE_FILE, true)) {
Index: apps/plugins/beatbox/beatbox.c
===================================================================
--- apps/plugins/beatbox/beatbox.c	(revision 20700)
+++ apps/plugins/beatbox/beatbox.c	(working copy)
@@ -238,7 +238,7 @@
 
     PLUGIN_IRAM_INIT(rb)
 
-    rb->lcd_setfont(0);
+    rb->lcd_setfont(FONT_SYSFIXED);
 
 #if defined(HAVE_ADJUSTABLE_CPU_FREQ)
     rb->cpu_boost(true);
@@ -277,6 +277,7 @@
 #endif
 
 
+    rb->lcd_setfont(FONT_UI);
     if(retval == -1)
         return PLUGIN_ERROR;
     return PLUGIN_OK;
Index: apps/plugins/calculator.c
===================================================================
--- apps/plugins/calculator.c	(revision 20700)
+++ apps/plugins/calculator.c	(working copy)
@@ -1709,13 +1709,17 @@
         rb->lcd_update();
 
         if(rb->default_event_handler(btn) == SYS_USB_CONNECTED)
+        {
+            rb->lcd_setfont(FONT_UI);
             return PLUGIN_USB_CONNECTED;
+        }
 
         if (btn != BUTTON_NONE)
             lastbtn = btn;
     } /* while (calStatus != cal_exit ) */
 
     rb->button_clear_queue();
+    rb->lcd_setfont(FONT_UI);
     return PLUGIN_OK;
 }
 
Index: apps/plugins/wormlet.c
===================================================================
--- apps/plugins/wormlet.c	(revision 20700)
+++ apps/plugins/wormlet.c	(working copy)
@@ -2697,6 +2697,7 @@
             case 0:
                 rb->lcd_setfont(FONT_SYSFIXED);
                 launch_wormlet();
+                rb->lcd_setfont(FONT_UI);
                 break;
             case 1:
                 new_setting = worm_count - 1;
Index: firmware/target/arm/tcc780x/debug-tcc780x.c
===================================================================
--- firmware/target/arm/tcc780x/debug-tcc780x.c	(revision 20700)
+++ firmware/target/arm/tcc780x/debug-tcc780x.c	(working copy)
@@ -85,5 +85,6 @@
         
         lcd_update();
     }
+    lcd_setfont(FONT_UI);
     return false;
 }
Index: firmware/target/arm/tcc77x/debug-tcc77x.c
===================================================================
--- firmware/target/arm/tcc77x/debug-tcc77x.c	(revision 20700)
+++ firmware/target/arm/tcc77x/debug-tcc77x.c	(working copy)
@@ -81,5 +81,6 @@
         
         lcd_update();
     }
+    lcd_setfont(FONT_UI);
     return false;
 }
Index: firmware/target/arm/tms320dm320/debug-dm320.c
===================================================================
--- firmware/target/arm/tms320dm320/debug-dm320.c	(revision 20700)
+++ firmware/target/arm/tms320dm320/debug-dm320.c	(working copy)
@@ -204,5 +204,6 @@
 
         lcd_update();
     }
+    lcd_setfont(FONT_UI);
     return false;
 }
Index: firmware/target/arm/imx31/debug-imx31.c
===================================================================
--- firmware/target/arm/imx31/debug-imx31.c	(revision 20700)
+++ firmware/target/arm/imx31/debug-imx31.c	(working copy)
@@ -240,6 +240,8 @@
 
         lcd_update();
         if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
-            return false;
+            break;
     }
+    lcd_setfont(FONT_UI);
+    return false;
 }  
Index: firmware/target/arm/s3c2440/debug-s3c2440.c
===================================================================
--- firmware/target/arm/s3c2440/debug-s3c2440.c	(revision 20700)
+++ firmware/target/arm/s3c2440/debug-s3c2440.c	(working copy)
@@ -83,6 +83,8 @@
 
         lcd_update();
         if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
-            return false;
+            break;
     }
+    lcd_setfont(FONT_UI);
+    return false;
 }  
Index: firmware/target/mips/ingenic_jz47xx/debug-jz4740.c
===================================================================
--- firmware/target/mips/ingenic_jz47xx/debug-jz4740.c	(revision 20700)
+++ firmware/target/mips/ingenic_jz47xx/debug-jz4740.c	(working copy)
@@ -176,6 +176,7 @@
         lcd_update();
         sleep(HZ/16);
     }
+    lcd_setfont(FONT_UI);
     return true;
 }