diff --git a/apps/filetypes.c b/apps/filetypes.c
index 481c0df6de..779337e0ca 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -159,7 +159,7 @@ void tree_get_filetypes(const struct filetype** types, int* count)
 #define ROCK_EXTENSION "rock"
 
 struct file_type {
-    int  icon; /* the icon which shall be used for it, NOICON if unknown */
+    enum themable_icons icon; /* the icon which shall be used for it, NOICON if unknown */
     unsigned char  attr; /* FILE_ATTR_MASK >> 8 */
     char* plugin; /* Which plugin to use, NULL if unknown, or builtin */
     char* extension; /* NULL for none */
diff --git a/apps/filetypes.h b/apps/filetypes.h
index a957f1631f..0b50b45580 100644
--- a/apps/filetypes.h
+++ b/apps/filetypes.h
@@ -51,8 +51,8 @@
 struct filetype {
     char* extension;
     int tree_attr;
-    int icon;
     int voiceclip;
+    enum themable_icons icon;
 };
 void tree_get_filetypes(const struct filetype**, int*);
 
diff --git a/apps/gui/icon.h b/apps/gui/icon.h
index 9a58076509..e79defe798 100644
--- a/apps/gui/icon.h
+++ b/apps/gui/icon.h
@@ -30,12 +30,11 @@ typedef const unsigned char * ICON;
 typedef long ICON;
 #endif
 
-#define NOICON Icon_NOICON
-#define FORCE_INBUILT_ICON 0x80000000
 /* Don't #ifdef icon values, or we wont be able to use the same 
    bmp for every target. */
 enum themable_icons {
-    Icon_NOICON = -1, /* Dont put this in a .bmp */
+    NOICON = -1,
+    Icon_NOICON = NOICON, /* Dont put this in a .bmp */
     Icon_Audio,
     Icon_Folder,
     Icon_Playlist,