diff --git a/build.xml b/build.xml
index 2eea9de7a..44378dac3 100644
--- a/build.xml
+++ b/build.xml
@@ -102,8 +102,8 @@
         <ant target="doAppEXE" />
 
         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
-        <izpack input="${basedir}/installer/install.xml" 
-            output="${basedir}/install.jar" 
+        <izpack input="${basedir}/installer/installer.xml" 
+            output="${basedir}/installer.jar" 
             installerType="standard" 
             basedir="${basedir}"
             compression="deflate"
@@ -135,8 +135,8 @@
 	<taskdef name="launch4j"
                  classname="net.sf.launch4j.ant.Launch4jTask"
                  classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
-        <launch4j configFile="installer/itoopieinstaller.xml" />
-	<checksum file="itoopieinstall.exe" algorithm="SHA-512" fileext=".sha512"/>
+        <launch4j configFile="installer/installerstandalone.xml" />
+	<checksum file="itoopie-install.exe" algorithm="SHA-512" fileext=".sha512"/>
 
 	</target>
 	<!-- thazzit -->
diff --git a/installer/install.xml b/installer/installer.xml
similarity index 100%
rename from installer/install.xml
rename to installer/installer.xml
diff --git a/installer/itoopiestandalone.xml b/installer/itoopiestandalone.xml
index 285fd98dc..a2cb15e14 100644
--- a/installer/itoopiestandalone.xml
+++ b/installer/itoopiestandalone.xml
@@ -5,7 +5,7 @@
   <errTitle>itoopie</errTitle>
   <chdir>.</chdir>
   <customProcName>false</customProcName>
-  <icon>resources/itoopie.ico</icon>
+  <icon>../resources/images/itoopie-128.ico</icon>
   <jre>
     <minVersion>1.5.0</minVersion>
     <!--
diff --git a/installer/resources/shortcutSpec.xml b/installer/resources/shortcutSpec.xml
index 26e89c4bf..26364a2f5 100644
--- a/installer/resources/shortcutSpec.xml
+++ b/installer/resources/shortcutSpec.xml
@@ -6,7 +6,7 @@
 			target="$INSTALL_PATH\itoopie.exe" 
 			commandLine=""
 			workingDirectory="$INSTALL_PATH"
-			iconFile="$INSTALL_PATH\images\logo.ico"
+			iconFile="$INSTALL_PATH\images\itoopie-128.ico"
 			initialState="noShow"
 			programGroup="yes"
 			startMenu="yes"
@@ -20,7 +20,7 @@
 			startup="no"
 			target="java -jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
 			commandLine=""
-			iconFile="$INSTALL_PATH\images\thrash.ico"
+			iconFile="$INSTALL_PATH\icons\thrash-128.ico"
 			iconIndex="0"
 			workingDirectory="$INSTALL_PATH"
 			description="Uninstall itoopie" />
diff --git a/www-itoopie.i2p/index.html b/www-itoopie.i2p/index.html
index 324c26fb6..48f3daac4 100644
--- a/www-itoopie.i2p/index.html
+++ b/www-itoopie.i2p/index.html
@@ -102,8 +102,8 @@ I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping privacy an
                         </figure>
                         
                         <p>Before running itoopie, <b>I2PControl needs to be installed</b>. Instruction can be found <a href="#installation">below</a>.</p>
-                        <p>itoopie can be downloaded from here, <a href="files/itoopieinstall.exe">itoopieinstall.exe</a>, <a href="files/itoopieinstall.exe.sha512">checksum</a>.</p>
-						<p>The installer can be run by opening <tt>itoopieinstall.exe</tt> or running <tt>java -jar itoopieinstall.exe</tt> (yes, really).</p>
+                        <p>itoopie can be downloaded from here, <a href="files/itoopie-install.exe">itoopie-install.exe</a>, <a href="files/itoopie-install.exe.sha512">checksum</a>.</p>
+						<p>The installer can be run by opening <tt>itoopie-install.exe</tt> or running <tt>java -jar itoopie-install.exe</tt> (yes, really).</p>
 						<p>If you're having issues starting itoopie or connecting to the <a href="http://i2p2.de">I2P</a> node, have a look at the <a href="#troubleshoot">Troubleshoot</a>-section.</p>
 						
                     </div>