plugins/.iconlookup  | 7 ++++---
 src/icons-nerdfont.h | 5 +++--
 src/icons.h          | 4 +++-

diff --git a/plugins/.iconlookup b/plugins/.iconlookup
index 24e00ab994c7582a4dbbc8f75e80d94f7bd8670a..e43c1ad47e2bda2917d81b3e536abebb405dc974 100755
--- a/plugins/.iconlookup
+++ b/plugins/.iconlookup
@@ -84,7 +84,7 @@     icons["python"][1] = ""; icons["python"][2] = color_python
     icons["database"][1] = ""; icons["database"][2] = color_default
     icons["worddoc"][1] = ""; icons["worddoc"][2] = color_document
     icons["playlist"][1] = "蘿"; icons["playlist"][2] = color_audio
-    icons["opticaldisk"][1] = "ﴞ"; icons["opticaldisk"][2] = color_archive
+    icons["opticaldisk"][1] = ""; icons["opticaldisk"][2] = color_archive
 
 # numbers
     icons["1"][1] = icons["manual"][1]; icons["1"][2] = icons["manual"][2]
@@ -165,7 +165,7 @@     icons["hxx"][1] = icons["cplusplus"][1]; icons["hxx"][2] = icons["cplusplus"][2]
 
 # i
     icons["ico"][1] = icons["picturefile"][1]; icons["ico"][2] = icons["picturefile"][2]
-    icons["img"][1] = icons["picturefile"][1]; icons["img"][2] = icons["picturefile"][2]
+    icons["img"][1] = icons["opticaldisc"][1]; icons["img"][2] = icons["opticaldisc"][2]
     icons["ini"][1] = icons["configure"][1]; icons["ini"][2] = icons["configure"][2]
     icons["iso"][1] = icons["opticaldisc"][1]; icons["iso"][2] = icons["opticaldisc"][2]
 
@@ -271,7 +271,8 @@     icons["wma"][1] = icons["videofile"][1]; icons["wma"][2] = icons["videofile"][2]
     icons["wmv"][1] = icons["videofile"][1]; icons["wmv"][2] = icons["videofile"][2]
 
 # x
-    icons["xbps"][1] = icons["archive"][1]" " color_archive
+    icons["xbps"][1] = icons["archive"][1]; icons["xbps"][2] = color_archive
+    icons["xcf"][1] = icons["imagefile"][1]; icons["xcf"][2] = color_image
     icons["xhtml"][1] = icons["htm"][1]; icons["xhtml"][2] = icons["htm"][2]
     icons["xls"][1] = ""; icons["xls"][2] = color_default
     icons["xlsx"][1] = ""; icons["xlsx"][2] = color_default
diff --git a/src/icons-nerdfont.h b/src/icons-nerdfont.h
index 7d2a0d0149ea3c40f24cf842da58e938dc8b8830..8936c1d874321cbdeea800057955475bbc57faf8 100644
--- a/src/icons-nerdfont.h
+++ b/src/icons-nerdfont.h
@@ -44,7 +44,7 @@ #define ICON_PYTHON        "\ue235"
 #define ICON_DATABASE      "\uf6b7"
 #define ICON_WORDDOC       "\uf72b"
 #define ICON_PLAYLIST      "\uf910"
-#define ICON_OPTICALDISK   "\ufd1e"
+#define ICON_OPTICALDISK   "\ue271"
 
 
 /* Numbers */
@@ -126,7 +126,7 @@ #define ICON_EXT_HXX       ICON_CPLUSPLUS
 
 /* I */
 #define ICON_EXT_ICO       ICON_PICTUREFILE
-#define ICON_EXT_IMG       ICON_PICTUREFILE
+#define ICON_EXT_IMG       ICON_OPTICALDISK
 #define ICON_EXT_INI       ICON_CONFIGURE
 #define ICON_EXT_ISO       ICON_OPTICALDISK
 
@@ -232,6 +232,7 @@ #define ICON_EXT_WMV       ICON_VIDEOFILE
 
 /* X */
 #define ICON_EXT_XBPS      ICON_ARCHIVE
+#define ICON_EXT_XCF       ICON_PICTUREFILE
 #define ICON_EXT_XHTML     ICON_HTML
 #define ICON_EXT_XLS       "\uf71a"
 #define ICON_EXT_XLSX      "\uf71a"
diff --git a/src/icons.h b/src/icons.h
index 1d145cb961ad0ba397d314490dc2f45df9084e53..aaefab63c47ddb46c71774750a92b93f83c940f3 100644
--- a/src/icons.h
+++ b/src/icons.h
@@ -180,7 +180,7 @@ 	{"hxx",      MFIZZ_CPLUSPLUS,      0},
 
 	/* I */
 	{"ico",      FA_FILE_IMAGE_O,      COLOR_IMAGE},
-	{"img",      FA_FILE_ARCHIVE_O,    COLOR_ARCHIVE},
+	{"img",      LINEA_MUSIC_CD,       COLOR_ARCHIVE},
 	{"ini",      FA_COGS,              0},
 	{"iso",      LINEA_MUSIC_CD,       COLOR_ARCHIVE},
 
@@ -286,6 +286,7 @@ 	{"wmv",      FA_FILE_MOVIE_O,      COLOR_VIDEO},
 
 	/* X */
 	{"xbps",     FA_FILE_ARCHIVE_O,    COLOR_ARCHIVE},
+	{"xcf",      FA_FILE_IMAGE_O,      COLOR_IMAGE},
 	{"xhtml",    FA_FILE_CODE_O,       0},
 	{"xls",      FILE_EXCEL,           0},
 	{"xlsx",     FILE_EXCEL,           0},
@@ -488,6 +489,7 @@ 	{"wmv",        ICON_EXT_WMV,       COLOR_VIDEO},
 
 	/* X */
 	{"xbps",       ICON_EXT_XBPS,      COLOR_ARCHIVE},
+	{"xcf",        ICON_EXT_XCF,       COLOR_IMAGE},
 	{"xhtml",      ICON_EXT_XHTML,     0},
 	{"xls",        ICON_EXT_XLS,       0},
 	{"xlsx",       ICON_EXT_XLSX,      0},