diff --git a/doc/tinyerp-icon.png b/pixmaps/tinyerp-icon.png
similarity index 100%
rename from doc/tinyerp-icon.png
rename to pixmaps/tinyerp-icon.png
diff --git a/pixmaps/tinyerp.ico b/pixmaps/tinyerp.ico
deleted file mode 100644
index cde3e961e79..00000000000
Binary files a/pixmaps/tinyerp.ico and /dev/null differ
diff --git a/setup_py2exe.py b/setup_py2exe.py
index 46deeb415c4..992e5ac11f3 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -16,11 +16,19 @@ options = {"py2exe": {"compressed": 0,
 data_files = []
 
 os.chdir('bin')
-for (dp,dn,names) in os.walk('addons', 'i18n'):
+for (dp,dn,names) in os.walk('addons'):
+	if '.svn' in dn:
+		dn.remove('.svn')
+	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
+for (dp,dn,names) in os.walk('i18n'):
 	if '.svn' in dn:
 		dn.remove('.svn')
 	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
 os.chdir('..')
+for (dp,dn,names) in os.walk('doc'):
+	if '.svn' in dn:
+		dn.remove('.svn')
+	data_files.append((dp, map(lambda x: os.path.join(dp,x), names)))
 
 setup(
 	name="tinyerp-server",
diff --git a/tinyerp-server-installer.nsi b/tinyerp-server-installer.nsi
index a1206ecc92b..7dca10ad667 100644
--- a/tinyerp-server-installer.nsi
+++ b/tinyerp-server-installer.nsi
@@ -145,13 +145,26 @@ Section "Uninstall"
   Push "$INSTDIR\addons"
   Push ""
   Call un.RmFilesButOne
+  Push "$INSTDIR\i18n"
+  Push ""
+  Call un.RmFilesButOne
   Delete "$INSTDIR\service\*"
+  Push "$INSTDIR\doc"
+  Push ""
+  Call un.RmFilesButOne
   Delete "$INSTDIR\*"
   Delete "$INSTDIR\Uninstall.exe"
 
   Push "$INSTDIR\addons"
   Push ""
   Call un.RmDirsButOne
+  Push "$INSTDIR\i18n"
+  Push ""
+  Call un.RmDirsButOne
+  Push "$INSTDIR\doc"
+  Push ""
+  Call un.RmDirsButOne
+  RMDir "$INSTDIR\doc"
   RMDir "$INSTDIR\addons"
   RMDir "$INSTDIR\service"
   RMDir "$INSTDIR"