diff --git a/packaging/win32/deluge-win32-installer.nsi b/packaging/win32/deluge-win32-installer.nsi
index 82f9e66c8..b78e8836e 100644
--- a/packaging/win32/deluge-win32-installer.nsi
+++ b/packaging/win32/deluge-win32-installer.nsi
@@ -13,7 +13,7 @@ SetCompressor  /FINAL /SOLID lzma
 SetCompressorDictSize 64
 
 # Script version; displayed when running the installer
-!define DELUGE_INSTALLER_VERSION "0.6"
+!define DELUGE_INSTALLER_VERSION "0.7"
 
 # Deluge program information
 !define PROGRAM_NAME "Deluge"
@@ -25,7 +25,8 @@ SetCompressorDictSize 64
 !define PROGRAM_WEB_SITE "http://deluge-torrent.org"
 
 # Python files generated with bbfreeze
-!define DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR "..\build-win32\deluge-bbfreeze-${PROGRAM_VERSION}"
+!define BUILD_DIR "..\build-win32"
+!define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}"
 
 # --- Interface settings ---
 
@@ -33,7 +34,7 @@ SetCompressorDictSize 64
 !include MUI2.nsh
 
 # Installer
-!define MUI_ICON "deluge.ico"
+!define MUI_ICON "..\..\deluge\ui\data\pixmaps\deluge.ico"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
 !define MUI_HEADERIMAGE_BITMAP "installer-top.bmp"
@@ -54,7 +55,7 @@ SetCompressorDictSize 64
 !insertmacro MUI_PAGE_WELCOME
 
 # License page
-!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
 
 # Components page
 !insertmacro MUI_PAGE_COMPONENTS
@@ -108,7 +109,7 @@ FunctionEnd
 BrandingText "Deluge Windows Installer v${DELUGE_INSTALLER_VERSION}"
 
 Name "${PROGRAM_NAME} ${PROGRAM_VERSION}"
-OutFile "..\build-win32\deluge-${PROGRAM_VERSION}-win32-setup.exe"
+OutFile "${BUILD_DIR}\deluge-${PROGRAM_VERSION}-win32-setup.exe"
 
 InstallDir "$PROGRAMFILES\Deluge"
 
@@ -120,10 +121,10 @@ Section "Deluge Bittorrent Client" Section1
   SectionIn RO
 
   SetOutPath $INSTDIR
-  File /r "${DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR}\*.*"
+  File /r "${BBFREEZE_DIR}\*.*"
 
   SetOverwrite ifnewer
-  File "..\LICENSE"
+  File "..\..\LICENSE"
 SectionEnd
 
 Section -StartMenu_Desktop_Links
diff --git a/tox.ini b/tox.ini
index eb018d8a4..8b4d10d8f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,7 +84,7 @@ whitelist_externals =
     isort
 commands =
     isort --version
-    python -c "import subprocess, sys; output = subprocess.check_output('isort --diff --recursive deluge docs win32 *.py', shell=True); print output; sys.exit(len(output) != 0)"
+    python -c "import subprocess, sys; output = subprocess.check_output('isort --diff --recursive deluge docs packaging *.py', shell=True); print output; sys.exit(len(output) != 0)"
 
 [testenv:flake8]
 setenv = {[testenv]setenv}