diff --git a/installer/resources/Unix_shortcutSpec.xml b/installer/resources/Unix_shortcutSpec.xml
index f1f0882b0..8143e8755 100644
--- a/installer/resources/Unix_shortcutSpec.xml
+++ b/installer/resources/Unix_shortcutSpec.xml
@@ -6,7 +6,7 @@
 			target="java" 
 			commandLine="-jar "$INSTALL_PATH/itoopie.jar""
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH/logo.png"
+			iconFile="$INSTALL_PATH/icons/logo.png"
 			initialState="noShow"
 			applications="yes"
 			type="Application"
diff --git a/installer/resources/itoopie.ico b/installer/resources/itoopie.ico
new file mode 100644
index 000000000..1290da8b4
Binary files /dev/null and b/installer/resources/itoopie.ico differ
diff --git a/installer/resources/shortcutSpec.xml b/installer/resources/shortcutSpec.xml
index 5c82ff7da..5af65d338 100644
--- a/installer/resources/shortcutSpec.xml
+++ b/installer/resources/shortcutSpec.xml
@@ -5,10 +5,22 @@
 			target="$INSTALL_PATH\itoopie.exe" 
 			commandLine=""
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH\logo.png"
+			iconFile="$INSTALL_PATH\icons\itoopie.ico"
 			initialState="noShow"
 			programGroup="yes"
 			startMenu="yes"
 			desktop="yes"
 			startup="no" />
+
+<shortcut
+                        name="Uninstaller"
+                        programGroup="yes"
+                        startup="no"
+                        target="java"
+                        commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
+                        Categories="Java;Application;Network;"
+                        initialState="noShow"
+                        workingDirectory=""
+                        description="IzPack uninstaller" />
+
 </shortcuts>