Index: setup/Plugins/WtiSetup/Localization_nl-NL.wxl
===================================================================
diff -u -rfbbd9584a4c38bd750d48c340b625e5b2765900c -rdc06c866920149657481b4ca16c79dcb34047f57
--- setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
+++ setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision dc06c866920149657481b4ca16c79dcb34047f57)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="nl-NL" xmlns="http://schemas.microsoft.com/wix/2006/localization">
   <String Id="ApplicationLongName">Wettelijk Toets Instrumentarium</String>
+  <String Id="ApplicationShortName">WTI</String>
   <String Id="Manufacturer">Deltares</String>
   <String Id="NetFramework45Required">De installatie vereist dat Microsoft .NET Framework 4.5 geïnstalleerd is om verder te gaan.</String>
   <String Id="DowngradeErrorMessage">Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd.</String>
Index: setup/Plugins/WtiSetup/Product.wxs
===================================================================
diff -u -rfbbd9584a4c38bd750d48c340b625e5b2765900c -rdc06c866920149657481b4ca16c79dcb34047f57
--- setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
+++ setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision dc06c866920149657481b4ca16c79dcb34047f57)
@@ -4,6 +4,7 @@
 	<Product Id="C8F4EE7D-F2BA-4E1E-ABDB-C454FC68E780" Name="!(loc.ApplicationLongName)" Language="1043" Version="0.5.0" Manufacturer="!(loc.Manufacturer)" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="WtiFull.cab" EmbedCab="yes"/>
+    <Property Id="ARPPRODUCTICON" Value="Wti.ico" />
 
 		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
 
@@ -38,7 +39,7 @@
 
               <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
               <RemoveFolder Id="RemoveDeltares" Directory="Deltares" On="uninstall" />
-              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiAppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="wtiAppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
             </Component>
             
           </Directory>
@@ -59,7 +60,7 @@
               
               <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuWti2017" On="uninstall" />
               <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
-              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="wtiProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
               
             </Component>
             
@@ -77,7 +78,7 @@
                     WorkingDirectory="APPLICATIONDIR"
                     Icon="Wti.ico"/>
 
-          <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiDesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+          <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="wtiDesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
 
         </Component>