diff --git a/apps/gui/icon.h b/apps/gui/icon.h
index a9ae058ce9..1eefc4850c 100644
--- a/apps/gui/icon.h
+++ b/apps/gui/icon.h
@@ -25,7 +25,7 @@
 #ifdef HAVE_LCD_BITMAP
     typedef const unsigned char * ICON;
 #else
-    typedef unsigned short ICON;
+    typedef short ICON;
 #endif
 
 #define CURSOR_CHAR 0x92
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 58f27409b1..36acb9b897 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -47,7 +47,7 @@
 #include "splash.h"
 
 /* Maximum number of tracks we can have loaded at one time */
-#define MAX_PLAYLIST_ENTRIES 40
+#define MAX_PLAYLIST_ENTRIES 200
 
 /* The number of items between the selected one and the end/start of
  * the buffer under which the buffer must reload */
@@ -598,7 +598,11 @@ void playlist_callback_icons(int selected_item, void * data, ICON * icon)
 #endif
     }
     else
+#ifdef HAVE_LCD_BITMAP
         *icon=0;
+#else
+        *icon=-1;
+#endif
 }