diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi
index 4bdb57fa4..f6e49cfd3 100755
--- a/admin/win/nsi/tomahawk.nsi
+++ b/admin/win/nsi/tomahawk.nsi
@@ -554,6 +554,13 @@ Function .onInit
    StrCmp $R0 0 +3
       MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
       Abort
+
+   ;Use available InstallLocation when possible. This is useful in the uninstaller
+   ;via re-install, which would otherwise use a default location - a bug.
+   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
+   StrCmp $R0 "" SkipSetInstDir
+   StrCpy $INSTDIR $R0
+   SkipSetInstDir:
 FunctionEnd
 
 Function .onInstSuccess
diff --git a/admin/win/page_header.bmp b/admin/win/page_header.bmp
new file mode 100755
index 000000000..c50025a22
Binary files /dev/null and b/admin/win/page_header.bmp differ
diff --git a/admin/win/welcome.bmp b/admin/win/welcome.bmp
new file mode 100755
index 000000000..580504f50
Binary files /dev/null and b/admin/win/welcome.bmp differ