diff --git a/apps/adobe-cc/info b/apps/adobe-cc/info
index a1a0e9f..c8a0051 100644
--- a/apps/adobe-cc/info
+++ b/apps/adobe-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES=""
+
+# System Icon
+ICON="AdobeUpdate"
\ No newline at end of file
diff --git a/apps/aftereffects-cc/info b/apps/aftereffects-cc/info
index f40e513..76a96be 100644
--- a/apps/aftereffects-cc/info
+++ b/apps/aftereffects-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.adobe.aftereffects.project;application/vnd.adobe.aftereffects.template;"
+
+# System Icon
+ICON="AdobeAfterEffect"
\ No newline at end of file
diff --git a/apps/audition-cc/info b/apps/audition-cc/info
index 8551913..934abc3 100644
--- a/apps/audition-cc/info
+++ b/apps/audition-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES=""
+
+# System Icon
+ICON="AdobeAudition"
\ No newline at end of file
diff --git a/apps/bridge-cc/info b/apps/bridge-cc/info
index 48379a0..02edf53 100644
--- a/apps/bridge-cc/info
+++ b/apps/bridge-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobeBridge"
\ No newline at end of file
diff --git a/apps/bridge-cs6-x86/info b/apps/bridge-cs6-x86/info
index 5f72104..eaaa69a 100644
--- a/apps/bridge-cs6-x86/info
+++ b/apps/bridge-cs6-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobeBridge"
\ No newline at end of file
diff --git a/apps/bridge-cs6/info b/apps/bridge-cs6/info
index 17009f0..66b29fc 100644
--- a/apps/bridge-cs6/info
+++ b/apps/bridge-cs6/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobeBridge"
\ No newline at end of file
diff --git a/apps/cmd/info b/apps/cmd/info
index eda4064..af457af 100644
--- a/apps/cmd/info
+++ b/apps/cmd/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Windows"
 
 # GNOME mimetypes
 MIME_TYPES=""
+
+# System Icon
+ICON="Terminal"
\ No newline at end of file
diff --git a/apps/excel-o365-x86/info b/apps/excel-o365-x86/info
index a913aa0..e50b961 100644
--- a/apps/excel-o365-x86/info
+++ b/apps/excel-o365-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
+
+# System Icon
+ICON="ms-excel"s
\ No newline at end of file
diff --git a/apps/excel-o365/info b/apps/excel-o365/info
index de6b82b..9671c74 100644
--- a/apps/excel-o365/info
+++ b/apps/excel-o365/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
+
+# System Icon
+ICON="ms-excel"
\ No newline at end of file
diff --git a/apps/excel-x86/info b/apps/excel-x86/info
index ceb3b6c..5a71f70 100644
--- a/apps/excel-x86/info
+++ b/apps/excel-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
+
+# System Icon
+ICON="ms-excel"
\ No newline at end of file
diff --git a/apps/excel/info b/apps/excel/info
index f397b76..ad891ff 100644
--- a/apps/excel/info
+++ b/apps/excel/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;"
+
+# System Icon
+ICON="ms-excel"
\ No newline at end of file
diff --git a/apps/illustrator-cc/info b/apps/illustrator-cc/info
index 701ab29..c8ba5da 100644
--- a/apps/illustrator-cc/info
+++ b/apps/illustrator-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="application/illustrator;"
+
+# System Icon
+ICON="AdobeIllustrator"
\ No newline at end of file
diff --git a/apps/indesign-cc/info b/apps/indesign-cc/info
index 7829791..b60a80e 100644
--- a/apps/indesign-cc/info
+++ b/apps/indesign-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="application/x-adobe-indesign-interchange;application/x-adobe-indesign;"
+
+# System Icon
+ICON="AdobeIndesign"
\ No newline at end of file
diff --git a/apps/lightroom-cc/info b/apps/lightroom-cc/info
index d4f19f3..23ef96b 100644
--- a/apps/lightroom-cc/info
+++ b/apps/lightroom-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES=""
+
+# System Icon
+ICON="AdobeLightroom"
\ No newline at end of file
diff --git a/apps/onenote-o365-x86/info b/apps/onenote-o365-x86/info
index 7a2553d..1ce4872 100644
--- a/apps/onenote-o365-x86/info
+++ b/apps/onenote-o365-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msonenote;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/onenote-o365/info b/apps/onenote-o365/info
index 3003121..248fea3 100644
--- a/apps/onenote-o365/info
+++ b/apps/onenote-o365/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msonenote;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/onenote-x86/info b/apps/onenote-x86/info
index fde6517..cf68779 100644
--- a/apps/onenote-x86/info
+++ b/apps/onenote-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msonenote;"
+
+# System Icon
+ICON="ms-onenote"
\ No newline at end of file
diff --git a/apps/onenote/info b/apps/onenote/info
index 1165128..d6e6636 100644
--- a/apps/onenote/info
+++ b/apps/onenote/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msonenote;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/outlook-o365-x86/info b/apps/outlook-o365-x86/info
index 14422af..31f5746 100644
--- a/apps/outlook-o365-x86/info
+++ b/apps/outlook-o365-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/outlook-o365/info b/apps/outlook-o365/info
index 9893d42..f248cab 100644
--- a/apps/outlook-o365/info
+++ b/apps/outlook-o365/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/outlook-x86/info b/apps/outlook-x86/info
index 1431add..9f68b8e 100644
--- a/apps/outlook-x86/info
+++ b/apps/outlook-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/outlook/info b/apps/outlook/info
index f3a4f43..d990949 100644
--- a/apps/outlook/info
+++ b/apps/outlook/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-outlook;application/octet-stream;"
+
+# System Icon
+ICON="ms-outlook"
\ No newline at end of file
diff --git a/apps/photoshop-cc/info b/apps/photoshop-cc/info
index 45fc878..8f8a220 100644
--- a/apps/photoshop-cc/info
+++ b/apps/photoshop-cc/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobePhotoshop"
\ No newline at end of file
diff --git a/apps/photoshop-cs6-x86/info b/apps/photoshop-cs6-x86/info
index d4fd734..2a23552 100644
--- a/apps/photoshop-cs6-x86/info
+++ b/apps/photoshop-cs6-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobePhotoshop"
\ No newline at end of file
diff --git a/apps/photoshop-cs6/info b/apps/photoshop-cs6/info
index a1ae9e6..bc1d939 100644
--- a/apps/photoshop-cs6/info
+++ b/apps/photoshop-cs6/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Adobe"
 
 # GNOME mimetypes
 MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobePhotoshop"
\ No newline at end of file
diff --git a/apps/powerpoint-o365-x86/info b/apps/powerpoint-o365-x86/info
index 8496695..9c89d89 100644
--- a/apps/powerpoint-o365-x86/info
+++ b/apps/powerpoint-o365-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
+
+# System Icon
+ICON="ms-powerpoint"
\ No newline at end of file
diff --git a/apps/powerpoint-o365/info b/apps/powerpoint-o365/info
index 45b7916..ce16e08 100644
--- a/apps/powerpoint-o365/info
+++ b/apps/powerpoint-o365/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
+
+# System Icon
+ICON="ms-powerpoint"
\ No newline at end of file
diff --git a/apps/powerpoint-x86/info b/apps/powerpoint-x86/info
index 1170358..409318f 100644
--- a/apps/powerpoint-x86/info
+++ b/apps/powerpoint-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
+
+# System Icon
+ICON="ms-powerpoint"
\ No newline at end of file
diff --git a/apps/powerpoint/info b/apps/powerpoint/info
index 17f1cba..e08c80d 100644
--- a/apps/powerpoint/info
+++ b/apps/powerpoint/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;"
+
+# System Icon
+ICON="ms-powerpoint"
\ No newline at end of file
diff --git a/apps/word-o365-x86/info b/apps/word-o365-x86/info
index b6a001e..8a3011a 100644
--- a/apps/word-o365-x86/info
+++ b/apps/word-o365-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
+
+# System Icon
+ICON="ms-word"
\ No newline at end of file
diff --git a/apps/word-o365/info b/apps/word-o365/info
index 2e1a365..4223a4d 100644
--- a/apps/word-o365/info
+++ b/apps/word-o365/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
+
+# System Icon
+ICON="ms-word"
\ No newline at end of file
diff --git a/apps/word-x86/info b/apps/word-x86/info
index a4b9c45..ffe7a81 100644
--- a/apps/word-x86/info
+++ b/apps/word-x86/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
+
+# System Icon
+ICON="ms-word"
\ No newline at end of file
diff --git a/apps/word/info b/apps/word/info
index 4236346..62b6774 100644
--- a/apps/word/info
+++ b/apps/word/info
@@ -12,3 +12,6 @@ CATEGORIES="WinApps;Office"
 
 # GNOME mimetypes
 MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;"
+
+# System Icon
+ICON="ms-word"
\ No newline at end of file
diff --git a/installer.sh b/installer.sh
index 696283d..66fad71 100755
--- a/installer.sh
+++ b/installer.sh
@@ -81,6 +81,10 @@ function waFindInstalled() {
 }
 
 function waConfigureApp() {
+  if [ -z "${ICON}" ]; then
+		ICON=${SYS_PATH}/apps/${1}/icon.${2}
+	fi
+  
 	. "${SYS_PATH}/apps/${1}/info"
 	echo -n "  Configuring ${NAME}..."
 	if [ ${USEDEMO} != 1 ]; then
@@ -90,7 +94,7 @@ Name=${NAME}
 Exec=${BIN_PATH}/winapps ${1} %F
 Terminal=false
 Type=Application
-Icon=${SYS_PATH}/apps/${1}/icon.${2}
+Icon=$ICON
 StartupWMClass=${FULL_NAME}
 Comment=${FULL_NAME}
 Categories=${CATEGORIES}
@@ -103,6 +107,8 @@ ${BIN_PATH}/winapps ${1} $@
 		${SUDO} chmod a+x "${BIN_PATH}/${1}"
 	fi
 	echo " Finished."
+
+  ICON=""
 }
 
 function waConfigureApps() {
@@ -249,7 +255,6 @@ Type=Application
 Icon=${SYS_PATH}/icons/windows.svg
 StartupWMClass=Microsoft Windows
 Comment=Microsoft Windows
-Categories=Windows
 " | ${SUDO} tee "${APP_PATH}/windows.desktop" >/dev/null
 		${SUDO} rm -f "${BIN_PATH}/windows"
 		echo "#!/usr/bin/env bash