Index: apps/debug_menu.c
===================================================================
--- apps/debug_menu.c	(revision 16634)
+++ apps/debug_menu.c	(working copy)
@@ -231,8 +231,10 @@
 
     while(1)
     {
-        if (action_userabort(HZ/5))
+        if (action_userabort(HZ/5)){
+			lcd_setfont(FONT_UI);
             return false;
+		}
 
         audio_get_debugdata(&d);
 
@@ -265,6 +267,7 @@
 
         lcd_update();
     }
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif /* !SIMULATOR */
@@ -389,7 +392,7 @@
     }
 
     tick_remove_task(dbg_audio_task);
-
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif /* CONFIG_CODEC */
@@ -682,6 +685,7 @@
     /* Define this function in your target tree */
     return __dbg_hw_info();
 #endif /* CONFIG_CPU */
+	lcd_setfont(FONT_UI);
     return false;
 }
 #else /* !HAVE_LCD_BITMAP */
@@ -973,7 +977,7 @@
 #ifdef HAVE_SPDIF_POWER
     spdif_power_enable(global_settings.spdif_enable);
 #endif
-
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif /* CPU_COLDFIRE */
@@ -1046,8 +1050,10 @@
         lcd_puts(0, 6, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)){
+			lcd_setfont(FONT_UI);
             return false;
+		}
     }
 #elif defined(CPU_COLDFIRE)
     unsigned int gpio_out;
@@ -1130,8 +1136,10 @@
 #endif
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)){
+			lcd_setfont(FONT_UI);
             return false;
+		}
     }
 
 #elif defined(CPU_PP502x)
@@ -1222,8 +1230,10 @@
         lcd_puts(0, line++, buf);
 #endif
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)){
+			lcd_setfont(FONT_UI);
             return false;
+		}
     }
 
 #elif CONFIG_CPU == PP5002
@@ -1262,8 +1272,10 @@
         lcd_puts(0, line++, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)){
+			lcd_setfont(FONT_UI);
             return false;
+		}
     }
 #else
     return __dbg_ports();
@@ -1393,12 +1405,12 @@
         lcd_puts(0, line++, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
-        {
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)){
+			lcd_setfont(FONT_UI);
             return false;
         }
     }
-
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif
@@ -1446,10 +1458,11 @@
                 break;
 
             case ACTION_STD_CANCEL:
+				lcd_setfont(FONT_UI);
                 return false;
         }
     }
-
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif /* HAVE_ADJUSTABLE_CPU_FREQ */
@@ -1699,9 +1712,11 @@
                 break;
 
             case ACTION_STD_CANCEL:
+				lcd_setfont(FONT_UI);
                 return false;
         }
     }
+	lcd_setfont(FONT_UI);
     return false;
 }
 
@@ -2366,6 +2381,7 @@
 
         lcd_update();
     }
+	lcd_setfont(FONT_UI);
     return false;
 }
 #endif
@@ -2407,6 +2423,7 @@
 #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) || CONFIG_CPU == S3C2440
         { "View I/O ports", dbg_ports },
 #endif
+
  #if (CONFIG_RTC == RTC_PCF50605) && !defined(SIMULATOR)
         { "View PCF registers", dbg_pcf },
 #endif