diff --git a/build.xml b/build.xml
index ef8fc64d8..5732cadd1 100644
--- a/build.xml
+++ b/build.xml
@@ -96,7 +96,9 @@
 
 
     <target name="installer" depends="jar" >
-        <copy file="${resources}/images/itoopie-256.png" tofile="${dist}/logo.png"/>
+        <mkdir dir="${build}/images" />
+        <copy file="${resources}/images/itoopie-256.png" tofile="${dist}/images/logo.png"/>
+        <copy file="${resources}/images/itoopie-128.ico" tofile="${dist}/images/logo.ico"/>
 		<copy file="LICENSE" tofile="${dist}/license.txt"/>
 		<copy file="history.txt" tofile="${dist}/history.txt"/>
         <ant target="doAppEXE" />
diff --git a/installer/resources/Unix_shortcutSpec.xml b/installer/resources/Unix_shortcutSpec.xml
index f1f0882b0..97c1d6dcf 100644
--- a/installer/resources/Unix_shortcutSpec.xml
+++ b/installer/resources/Unix_shortcutSpec.xml
@@ -6,7 +6,7 @@
 			target="java" 
 			commandLine="-jar &quot;$INSTALL_PATH/itoopie.jar&quot;"
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH/logo.png"
+			iconFile="$INSTALL_PATH/images/logo.png"
 			initialState="noShow"
 			applications="yes"
 			type="Application"
diff --git a/installer/resources/shortcutSpec.xml b/installer/resources/shortcutSpec.xml
index 5c82ff7da..4f9988f30 100644
--- a/installer/resources/shortcutSpec.xml
+++ b/installer/resources/shortcutSpec.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shortcuts>
  <programGroup defaultName="itoopie" location="startMenu" />
- <shortcut name="itoopie" 
+ <shortcut name="itoopie"
+			description="The simple I2P GUI!"
 			target="$INSTALL_PATH\itoopie.exe" 
 			commandLine=""
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH\logo.png"
+			iconFile="$INSTALL_PATH\images\logo.ico"
 			initialState="noShow"
 			programGroup="yes"
 			startMenu="yes"
 			desktop="yes"
 			startup="no" />
+<shortcut
+			name="Uninstaller"
+			programGroup="yes"
+			startMenu="yes"
+			startup="no"
+			target="java java -jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
+			commandLine=""
+			iconFile="trashcan_full"
+			iconIndex="0"
+			workingDirectory="$INSTALL_PATH"
+			description="IzPack uninstaller" />
 </shortcuts>
diff --git a/resources/images/itoopie-128.ico b/resources/images/itoopie-128.ico
new file mode 100644
index 000000000..6321a7b7d
Binary files /dev/null and b/resources/images/itoopie-128.ico differ
diff --git a/www-itoopie.i2p/css/styles.css b/www-itoopie.i2p/css/styles.css
index a55954fb1..8b8fc15bc 100644
--- a/www-itoopie.i2p/css/styles.css
+++ b/www-itoopie.i2p/css/styles.css
@@ -6,7 +6,7 @@ header, footer, article, section, hgroup, nav, figure {
     display: block;
 }
 body {
-    background-color: #DDDDDD;
+    background-color: #E6E6E6;
     color: #666666;
     font-family: Arial,Helvetica,sans-serif;
     font-size: 0.825em;