diff --git a/setup.py b/setup.py
index c83d6bd33..a9dbc36d1 100755
--- a/setup.py
+++ b/setup.py
@@ -487,32 +487,34 @@ cmdclass = {
     'egg_info_plugins': egg_info_plugins
 }
 
-# Data files to be installed to the system
-_data_files = [
-    ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
-    ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
-    ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
-    ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-    ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
-    ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
-    ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
-    ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
-    ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
-    ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
-    ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
-    ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
-    ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
-    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
-    ('share/man/man1', [
-        'docs/man/deluge.1',
-        'docs/man/deluged.1',
-        'docs/man/deluge-gtk.1',
-        'docs/man/deluge-web.1',
-        'docs/man/deluge-console.1'])
-]
+# Data files to be installed to the system.
+_data_files = []
+if not windows_check():
+    _data_files = [
+        ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/hicolor/scalable/apps/deluge.svg']),
+        ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
+        ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
+        ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
+        ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
+        ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
+        ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
+        ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
+        ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
+        ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
+        ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
+        ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
+        ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
+        ('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
+        ('share/man/man1', [
+            'docs/man/deluge.1',
+            'docs/man/deluged.1',
+            'docs/man/deluge-gtk.1',
+            'docs/man/deluge-web.1',
+            'docs/man/deluge-console.1'])
+    ]
 
-if not windows_check() and os.path.exists(desktop_data):
-    _data_files.append(('share/applications', [desktop_data]))
+    if os.path.exists(desktop_data):
+        _data_files.append(('share/applications', [desktop_data]))
 
 entry_points = {
     "console_scripts": [
diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py
index 40f538f5c..e20184377 100644
--- a/win32/deluge-bbfreeze.py
+++ b/win32/deluge-bbfreeze.py
@@ -55,9 +55,8 @@ build_version = deluge.common.get_version()
 python_path = os.path.dirname(sys.executable)
 if python_path.endswith("Scripts"):
     python_path = python_path[:-8]
-python_path += os.path.sep
-gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") + os.path.sep
-build_dir = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"
+gtk_root = os.path.join(gtk.__path__[0], "..", "runtime")
+build_dir = os.path.join("build-win32", "deluge-bbfreeze-" + build_version)
 
 if DEBUG:
     print("Python Path: %s" % python_path)
@@ -90,7 +89,7 @@ fzr.setIcon(os.path.join(os.path.dirname(deluge.common.__file__), "ui", "data",
 # Hide cmd console popup for these console entries force gui_script True.
 force_gui = ["deluge-web", "deluged", "deluge-console"]
 script_list = []
-for script in glob.glob(python_path + "Scripts\\deluge*-script.py*"):
+for script in glob.glob(os.path.join(python_path, "Scripts\\deluge*-script.py*")):
     # Copy the scripts to remove the '-script' suffix before adding to freezer.
     new_script = script.replace("-script", "")
     shutil.copy(script, new_script)
diff --git a/win32/deluge-win32-installer.nsi b/win32/deluge-win32-installer.nsi
index 9a3a3a7c5..435468f9d 100644
--- a/win32/deluge-win32-installer.nsi
+++ b/win32/deluge-win32-installer.nsi
@@ -46,7 +46,7 @@ SetCompressorDictSize 64
 !define PROGRAM_WEB_SITE "http://deluge-torrent.org"
 
 # Python files generated with bbfreeze
-!define BUILD_DIR "..\build-win32"
+!define BUILD_DIR "build-win32"
 !define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}"
 
 # --- Interface settings ---