diff --git a/nw/assets/icons/novelwriter.ico b/nw/assets/icons/novelwriter.ico
index 470ebe72..df883296 100644
Binary files a/nw/assets/icons/novelwriter.ico and b/nw/assets/icons/novelwriter.ico differ
diff --git a/nw/assets/icons/novelwriter.svg b/nw/assets/icons/novelwriter.svg
index 18be89c1..36880a7f 100644
--- a/nw/assets/icons/novelwriter.svg
+++ b/nw/assets/icons/novelwriter.svg
@@ -1,184 +1,184 @@
-
-
+
+
diff --git a/nw/assets/icons/x-novelwriter-project.ico b/nw/assets/icons/x-novelwriter-project.ico
new file mode 100644
index 00000000..b349aa30
Binary files /dev/null and b/nw/assets/icons/x-novelwriter-project.ico differ
diff --git a/nw/assets/icons/x-novelwriter-project.svg b/nw/assets/icons/x-novelwriter-project.svg
new file mode 100644
index 00000000..f314187f
--- /dev/null
+++ b/nw/assets/icons/x-novelwriter-project.svg
@@ -0,0 +1,207 @@
+
+
diff --git a/setup/icons/novelwriter.ico b/setup/icons/novelwriter.ico
index c96e8bdb..df883296 100644
Binary files a/setup/icons/novelwriter.ico and b/setup/icons/novelwriter.ico differ
diff --git a/setup/icons/x-novelwriter-project.ico b/setup/icons/x-novelwriter-project.ico
new file mode 100644
index 00000000..b349aa30
Binary files /dev/null and b/setup/icons/x-novelwriter-project.ico differ
diff --git a/setup/win_setup.iss b/setup/win_setup.iss
index 8b6be609..ee4c8439 100644
--- a/setup/win_setup.iss
+++ b/setup/win_setup.iss
@@ -27,11 +27,12 @@ UsedUserAreasWarning=no
;PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
OutputDir={#nwAppDir}
-OutputBaseFilename=novelwriter_{#nwAppVersion}_win_amd64_setup
+OutputBaseFilename=novelwriter-{#nwAppVersion}-win10-amd64-setup
Compression=lzma
SolidCompression=yes
WizardStyle=modern
ArchitecturesInstallIn64BitMode=x64
+ChangesAssociations=yes
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -46,7 +47,19 @@ Source: "{#nwAppDir}\novelWriter\*"; DestDir: "{app}"; Flags: ignoreversion recu
[Icons]
Name: "{autoprograms}\{#nwAppName}"; Filename: "{app}\{#nwAppExeName}"
Name: "{autodesktop}\{#nwAppName}"; Filename: "{app}\{#nwAppExeName}"; Tasks: desktopicon
+Name: "{autodesktop}\{#nwAppName}"; Filename: "{app}\assets\icons\x-novelwriter-project.ico"; Tasks: icon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#nwAppName}"; Filename: "{app}\{#nwAppExeName}"; Tasks: quicklaunchicon
[Run]
Filename: "{app}\{#nwAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(nwAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\.nwx\OpenWithProgids"; ValueType: string; ValueName: "novelWriterProject.nwx"; ValueData: ""; Flags: uninsdeletevalue
+; ".myp" is the extension we're associating. "MyProgramFile.myp" is the internal name for the file type as stored in the registry. Make sure you use a unique name for this so you don't inadvertently overwrite another application's registry key.
+Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx"; ValueType: string; ValueName: ""; ValueData: "novelWriter Project File"; Flags: uninsdeletekey
+; "My Program File" above is the name for the file type as shown in Explorer.
+Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\novelWriter.exe,2"
+; "DefaultIcon" is the registry key that specifies the filename containing the icon to associate with the file type. ",0" tells Explorer to use the first icon from MyProg.exe. (",1" would mean the second icon.)
+Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\novelWriter.exe"" ""%1"""
+; "shell\open\command" is the registry key that specifies the program to execute when a file of the type is double-clicked in Explorer. The surrounding quotes are in the command line so it handles long filenames correctly.
+Root: HKA; Subkey: "Software\Classes\Applications\novelWriter.exe\SupportedTypes"; ValueType: string; ValueName: ".nwx"; ValueData: ""
\ No newline at end of file