Index: apps/gui/skin_engine/skin_parser.c
===================================================================
--- apps/gui/skin_engine/skin_parser.c	(revision 30825)
+++ apps/gui/skin_engine/skin_parser.c	(working copy)
@@ -833,7 +833,7 @@
     }
     else
     {
-        if (vp->font > FONT_UI)
+        if (vp->font != font_get_ui())
             pb->height = -1; /* calculate at display time */
         else
         {
@@ -1645,7 +1645,7 @@
         font_id = skin_vp->parsed_fontid;
         if (font_id == 1)
         {   /* the usual case -> built-in fonts */
-            vp->font = global_status.font_id[curr_screen];
+            vp->font = font_get_ui();
             continue;
         }
         else if (font_id <= 0)
Index: apps/gui/skin_engine/skin_render.c
===================================================================
--- apps/gui/skin_engine/skin_render.c	(revision 30825)
+++ apps/gui/skin_engine/skin_render.c	(working copy)
@@ -48,6 +48,7 @@
 #include "root_menu.h"
 #include "misc.h"
 #include "list.h"
+#include "font.h"
 
 
 #define MAX_LINE 1024
@@ -658,8 +659,13 @@
 
     /* fix font ID's */
     if (skin_viewport->parsed_fontid == 1)
-        skin_viewport->vp.font = global_status.font_id[display->screen_type];
+        skin_viewport->vp.font = font_get_ui();
+
+#ifndef HAVE_TOUCHSCREEN
+    skin_viewport->vp.line_height = font_get(skin_viewport->vp.font)->height;
 #endif
+
+#endif
     
     while (line)
     {