diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index 5e595db4..75fa99cd 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -5,8 +5,11 @@
         <MediaTemplate EmbedCab="yes" />
         <UIRef Id="WixUI_Minimal" />
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
-        <Icon Id="ApplicationIcon" SourceFile="SafeExamBrowser.ico" />
+        <Icon Id="ApplicationIcon" SourceFile="Resources\SafeExamBrowser.ico" />
         <Property Id="ARPPRODUCTICON" Value="ApplicationIcon" />
+        <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
+        <!-- <WixVariable Id="WixUIDialogBmp" Value="Resources\Dialog.bmp" /> 493 × 312 -->
+        <!-- <WixVariable Id="WixUIBannerBmp" Value="Resources\Banner.bmp" /> 493 × 58 -->
         <Feature Id="ProductFeature" Title="Safe Exam Browser" Level="1">
             <ComponentGroupRef Id="ApplicationComponents" />
             <ComponentGroupRef Id="Shortcuts" />
diff --git a/Setup/Resources/License.rtf b/Setup/Resources/License.rtf
new file mode 100644
index 00000000..4c7f4444
Binary files /dev/null and b/Setup/Resources/License.rtf differ
diff --git a/Setup/SafeExamBrowser.ico b/Setup/Resources/SafeExamBrowser.ico
similarity index 100%
rename from Setup/SafeExamBrowser.ico
rename to Setup/Resources/SafeExamBrowser.ico
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index 840314df..3dc273bb 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -18,6 +18,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Components\Application.wxs" />
@@ -39,8 +40,17 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Components" />
+    <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\SafeExamBrowser.Client\SafeExamBrowser.Client.csproj">
+      <Name>SafeExamBrowser.Client</Name>
+      <Project>{7cc5a895-e0d3-4e43-9b39-ccec05a5a6a7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj">
       <Name>SafeExamBrowser.Runtime</Name>
       <Project>{e3aed2f8-b5df-45d1-ac19-48066923d6d8}</Project>
@@ -51,7 +61,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="SafeExamBrowser.ico" />
+    <Content Include="Resources\License.rtf" />
+    <Content Include="Resources\SafeExamBrowser.ico" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
@@ -61,6 +72,10 @@
   <PropertyGroup>
     <PreBuildEvent>"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)" -nologo -gg -g1 -srd -cg ApplicationComponents -dr ApplicationDirectory -sfrag -var var.SafeExamBrowser.Runtime.TargetDir -out $(ProjectDir)Components\Application.wxs</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>cd $(SolutionDir)
+git checkout -- Setup/Components/Application.wxs</PostBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.