diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index babdd0d1f..a17d8b561 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -461,7 +461,6 @@ jobs:
           --win-dir-chooser
           --resource-dir dist/win/resources
           --license-file dist/win/resources/license.rtf
-          --file-associations dist/win/resources/FAencryptedData.properties
           --file-associations dist/win/resources/FAvaultFile.properties
         env:
           JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
diff --git a/dist/win/resources/Cryptomator-Vault.ico b/dist/win/resources/Cryptomator-Vault.ico
new file mode 100644
index 000000000..662089969
Binary files /dev/null and b/dist/win/resources/Cryptomator-Vault.ico differ
diff --git a/dist/win/resources/FAencryptedData.properties b/dist/win/resources/FAencryptedData.properties
deleted file mode 100644
index c28cfd4ce..000000000
--- a/dist/win/resources/FAencryptedData.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-mime-type=application/vnd.cryptomator.encrypted
-extension=c9r,c9s
-description=Cryptomator Encrypted Data
-icon=resources/Cryptomator.ico
\ No newline at end of file
diff --git a/dist/win/resources/FAvaultFile.properties b/dist/win/resources/FAvaultFile.properties
index 01be3ee82..4d0284e69 100644
--- a/dist/win/resources/FAvaultFile.properties
+++ b/dist/win/resources/FAvaultFile.properties
@@ -1,4 +1,4 @@
 mime-type=application/vnd.cryptomator.vault
 extension=cryptomator
 description=Cryptomator Vault File
-icon=resources/Cryptomator.ico
\ No newline at end of file
+icon=resources/Cryptomator-Vault.ico
\ No newline at end of file
diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs
index 3b1c220bb..4f9b19ebe 100644
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -50,10 +50,25 @@
     <!-- Standard required root -->
     <Directory Id="TARGETDIR" Name="SourceDir"/>
 
+    <!-- Non-Opening ProgID -->
+    <DirectoryRef Id="INSTALLDIR">
+        <Component Win64="yes" Id="nonStartingProgID" >
+          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\Cryptomator-Vault.ico" Name="encrypted.ico"></File>
+          <ProgId Id="Cryptomator.Encrypted.1" Description="Cryptomator Encrypted Data" Icon="IconFileForEncryptedData" IconIndex="0">
+            <Extension Id="c9r" Advertise="no" ContentType="application/vnd.cryptomator.encrypted">
+              <MIME ContentType="application/vnd.cryptomator.encrypted" Default="yes"></MIME>
+            </Extension>
+            <Extension Id="c9s" Advertise="no" ContentType="application/vnd.cryptomator.encrypted"/>
+          </ProgId>
+        </Component>
+    </DirectoryRef>
+
     <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
       <ComponentGroupRef Id="Shortcuts"/>
       <ComponentGroupRef Id="Files"/>
       <ComponentGroupRef Id="FileAssociations"/>
+      <!-- Ref to additional ProgIDs -->
+      <ComponentRef Id="nonStartingProgID" />
     </Feature>
 
     <?ifdef JpInstallDirChooser ?>