diff --git a/Setup/Components/Application.xslt b/Setup/Components/Application.xslt
index 415e819b..57c5daa7 100644
--- a/Setup/Components/Application.xslt
+++ b/Setup/Components/Application.xslt
@@ -1,4 +1,5 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
     <xsl:output method="xml" indent="yes"/>
     <xsl:template match="@*|node()">
         <xsl:copy>
@@ -12,5 +13,24 @@
                 <xsl:text>MainExecutable</xsl:text>
             </xsl:attribute>
         </xsl:copy>
+        <wix:File Id="ApplicationIconFile" Source="Resources\Application.ico" />
+        <wix:File Id="ConfigurationIconFile" Source="Resources\Configuration.ico" />
+        <wix:ProgId Id="ConfigurationFileExtension" Description="SEB Configuration File" Icon="ConfigurationIconFile" Advertise="no">
+            <wix:Extension Id="seb" ContentType="application/seb" Advertise="no">
+                <wix:Verb Id="open" Command="Open" Argument="&quot;%1&quot;" TargetFile="MainExecutable" />
+            </wix:Extension>
+        </wix:ProgId>
+        <wix:RegistryKey Root="HKCR" Key="seb">
+            <wix:RegistryValue Value="URL:Safe Exam Browser Protocol" Type="string" />
+            <wix:RegistryValue Name="URL Protocol" Value="" Type="string" />
+            <wix:RegistryValue Key="DefaultIcon" Value="[#ApplicationIconFile]" Type="string" />
+            <wix:RegistryValue Key="shell\open\command" Value="&quot;[ApplicationDirectory]$(var.SafeExamBrowser.Runtime.TargetFileName)&quot; &quot;%1&quot;" Type="string" />
+        </wix:RegistryKey>
+        <wix:RegistryKey Root="HKCR" Key="sebs">
+            <wix:RegistryValue Value="URL:Safe Exam Browser Secure Protocol" Type="string" />
+            <wix:RegistryValue Name="URL Protocol" Value="" Type="string" />
+            <wix:RegistryValue Key="DefaultIcon" Value="[#ApplicationIconFile]" Type="string" />
+            <wix:RegistryValue Key="shell\open\command" Value="&quot;[ApplicationDirectory]$(var.SafeExamBrowser.Runtime.TargetFileName)&quot; &quot;%1&quot;" Type="string" />
+        </wix:RegistryKey>
     </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/Setup/Components/Reset.xslt b/Setup/Components/Reset.xslt
index 7da6b7d7..c34cbd76 100644
--- a/Setup/Components/Reset.xslt
+++ b/Setup/Components/Reset.xslt
@@ -1,4 +1,5 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
     <xsl:output method="xml" indent="yes"/>
     <xsl:template match="@*|node()">
         <xsl:copy>
diff --git a/Setup/Directories.wxs b/Setup/Directories.wxs
index 528e5d9e..9eea72f7 100644
--- a/Setup/Directories.wxs
+++ b/Setup/Directories.wxs
@@ -3,7 +3,7 @@
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="SafeExamBrowser">
+                <Directory Id="InstallFolder" Name="SafeExamBrowser">
                     <Directory Id="ApplicationDirectory" Name="Application" />
                     <Directory Id="ResetDirectory" Name="Reset" />
                     <!--<Directory Id="ServiceDirectory" Name="Service" />-->
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index a6d2035d..edf4afd4 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -6,7 +6,7 @@
         <MediaTemplate EmbedCab="yes" />
         <UIRef Id="WixUI_Minimal" />
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
-        <Icon Id="ApplicationIcon" SourceFile="Resources\SafeExamBrowser.ico" />
+        <Icon Id="ApplicationIcon" SourceFile="Resources\Application.ico" />
         <Property Id="ARPPRODUCTICON" Value="ApplicationIcon" />
         <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
         <!-- <WixVariable Id="WixUIDialogBmp" Value="Resources\Dialog.bmp" /> 493 × 312 -->
@@ -15,7 +15,7 @@
             <ComponentGroupRef Id="ApplicationComponents" />
             <ComponentGroupRef Id="ResetComponents" />
             <!--<ComponentGroupRef Id="ServiceComponents" />-->
-            <ComponentRef Id="ShortcutComponents" />
+            <ComponentRef Id="ShortcutComponent" />
         </Feature>
     </Product>
 </Wix>
diff --git a/Setup/Resources/SafeExamBrowser.ico b/Setup/Resources/Application.ico
similarity index 100%
rename from Setup/Resources/SafeExamBrowser.ico
rename to Setup/Resources/Application.ico
diff --git a/Setup/Resources/Configuration.ico b/Setup/Resources/Configuration.ico
new file mode 100644
index 00000000..e5b24bec
Binary files /dev/null and b/Setup/Resources/Configuration.ico differ
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index 9a55f459..d40615f9 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -72,20 +72,21 @@
     <Content Include="Components\Application.xslt" />
     <Content Include="Components\Reset.xslt" />
     <Content Include="Resources\License.rtf" />
-    <Content Include="Resources\SafeExamBrowser.ico" />
+    <Content Include="Resources\Application.ico" />
+    <Content Include="Resources\Configuration.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') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
-  <PropertyGroup>
-    <PostBuildEvent>git -C $(SolutionDir) checkout -- Setup/Components/Application.wxs
-git -C $(SolutionDir) checkout -- Setup/Components/Reset.wxs</PostBuildEvent>
-  </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.ResetUtility\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -srd -cg ResetComponents -dr ResetDirectory -sfrag -var var.SafeExamBrowser.ResetUtility.TargetDir -out $(ProjectDir)Components\Reset.wxs -t $(ProjectDir)Components\Reset.xslt
 "$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -srd -cg ApplicationComponents -dr ApplicationDirectory -sfrag -var var.SafeExamBrowser.Runtime.TargetDir -out $(ProjectDir)Components\Application.wxs -t $(ProjectDir)Components\Application.xslt</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>git -C $(SolutionDir) checkout -- Setup/Components/Application.wxs
+git -C $(SolutionDir) checkout -- Setup/Components/Reset.wxs</PostBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Setup/Shortcuts.wxs b/Setup/Shortcuts.wxs
index 83d28de8..76d3feb8 100644
--- a/Setup/Shortcuts.wxs
+++ b/Setup/Shortcuts.wxs
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
-        <Component Id="ShortcutComponents" Guid="F6B8A57A-84BB-4264-96C5-3DD59F745E58" Directory="StartMenuDirectory">
+        <Component Id="ShortcutComponent" Directory="StartMenuDirectory">
             <Shortcut Id="ApplicationShortcut" Name="Safe Exam Browser" Icon="ApplicationIcon" IconIndex="0" Advertise="no" Directory="ProgramMenuFolder"
-                        Target="[ApplicationDirectory]\$(var.SafeExamBrowser.Runtime.TargetFileName)" WorkingDirectory="ApplicationDirectory"
-                        Description="Starts the main application." />
+                      Target="[ApplicationDirectory]\$(var.SafeExamBrowser.Runtime.TargetFileName)" WorkingDirectory="ApplicationDirectory"
+                      Description="Starts the main application." />
             <Shortcut Id="ResetUtilityShortcut" Name="SEB Reset Utility" Icon="ApplicationIcon" IconIndex="0" Advertise="no" Directory="StartMenuDirectory"
-                        Target="[ResetDirectory]\$(var.SafeExamBrowser.ResetUtility.TargetFileName)" WorkingDirectory="ResetDirectory"
-                        Description="Provides options to reset any changes made by the main application." />
+                      Target="[ResetDirectory]\$(var.SafeExamBrowser.ResetUtility.TargetFileName)" WorkingDirectory="ResetDirectory"
+                      Description="Provides options to reset any changes made by the main application." />
             <RemoveFolder Id="StartMenuDirectory" On="uninstall" />
-            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes" />
         </Component>
     </Fragment>
 </Wix>