diff --git a/pixmaps/tinyerp-header.bmp b/pixmaps/tinyerp-header.bmp
new file mode 100644
index 00000000000..c22ca74328e
Binary files /dev/null and b/pixmaps/tinyerp-header.bmp differ
diff --git a/pixmaps/tinyerp-intro.bmp b/pixmaps/tinyerp-intro.bmp
new file mode 100644
index 00000000000..efff657a3f5
Binary files /dev/null and b/pixmaps/tinyerp-intro.bmp differ
diff --git a/tinyerp-icon.ico b/pixmaps/tinyerp.ico
similarity index 100%
rename from tinyerp-icon.ico
rename to pixmaps/tinyerp.ico
diff --git a/setup_win32.py b/setup_py2exe.py
similarity index 92%
rename from setup_win32.py
rename to setup_py2exe.py
index 223a9dd537e..46deeb415c4 100644
--- a/setup_win32.py
+++ b/setup_py2exe.py
@@ -24,7 +24,7 @@ os.chdir('..')
 
 setup(
 	name="tinyerp-server",
-	console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"tinyerp-icon.ico")]}],
+	console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"pixmaps\\tinyerp.ico")]}],
 	data_files = data_files,
 	options = options
 	)
diff --git a/setup.nsi b/tinyerp-server-installer.nsi
similarity index 95%
rename from setup.nsi
rename to tinyerp-server-installer.nsi
index 756a3a191d2..ce0324003b1 100644
--- a/setup.nsi
+++ b/tinyerp-server-installer.nsi
@@ -37,6 +37,12 @@
 ;--------------------------------
 ;Pages
 
+  !define MUI_ICON ".\pixmaps\tinyerp.ico"
+  !define MUI_UNICON ".\pixmaps\tinyerp.ico"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\tinyerp-intro.bmp"
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP ".\pixmaps\tinyerp-header.bmp"
+
   !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE "doc\\License.rtf"
  # !insertmacro MUI_PAGE_COMPONENTS