diff --git a/dist/win/build.bat b/dist/win/build.bat
index 84013ec1b..b65bda600 100644
--- a/dist/win/build.bat
+++ b/dist/win/build.bat
@@ -7,7 +7,7 @@ SET UPDATE_URL="https://cryptomator.org/downloads/"
 SET HELP_URL="https://cryptomator.org/contact/"
 powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1^
  -AppName %APPNAME%^
- -Vendor "%VENDOR%"^
+ -Vendor ""%VENDOR%""^
  -CopyrightStartYear %FIRST_COPYRIGHT_YEAR%^
  -AboutUrl "%ABOUT_URL%"^
  -HelpUrl "%HELP_URL%"^
diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs
index 26f968fbd..9397bab8a 100644
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -86,7 +86,7 @@
     <!-- Non-Opening ProgID -->
     <DirectoryRef Id="INSTALLDIR">
         <Component Win64="yes" Id="nonStartingProgID" >
-          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.JpAppName)-Vault.ico" Name="$(var.ProgIdIcon)-Vault.ico"></File>
+          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.JpAppName)-Vault.ico" Name="$(var.JpAppName)-Vault.ico"></File>
           <ProgId Id="$(var.JpAppName).Encrypted.1" Description="$(var.JpAppName) Encrypted Data" Icon="IconFileForEncryptedData" IconIndex="0">
             <Extension Id="c9r" Advertise="no" ContentType="$(var.ProgIdContentType)">
               <MIME ContentType="$(var.ProgIdContentType)" Default="yes"></MIME>