Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FatalErrorDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FatalErrorDeltares.wxs	(.../FatalErrorDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FatalErrorDeltares.wxs	(.../FatalErrorDeltares.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -14,12 +14,10 @@
     <Fragment>
         <UI>
             <Dialog Id="FatalErrorDeltares" Width="370" Height="270" Title="!(loc.FatalError_Title)">
-                <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
                     <Publish Event="EndDialog" Value="Exit">1</Publish>
                 </Control>
-                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
                 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <Control Id="Title" Type="Text" X="39" Y="160" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorTitle)" />
                 <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FilesInUseDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FilesInUseDeltares.wxs	(.../FilesInUseDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/FilesInUseDeltares.wxs	(.../FilesInUseDeltares.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -23,9 +23,9 @@
                 <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="!(loc.FilesInUseExit)">
                     <Publish Event="EndDialog" Value="Exit">1</Publish>
                 </Control>
-		<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
-		<Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
-		<Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+		            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
+		            <Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
+		            <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
                 <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs
===================================================================
diff -u -r62ce6cdcb81b24f7d436033bc0015bd210742fe4 -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision 62ce6cdcb81b24f7d436033bc0015bd210742fe4)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -44,15 +44,14 @@
                 <Control Id="RemoveDisabledText" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
                     <Condition Action="show">ARPNOREMOVE</Condition>
                 </Control>
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.NextButtonText)" />
+                <Control Id="Back" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
                 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
                 </Control>
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.MaintenanceTypeDlgBannerBitmap)" />
-		<Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+		            <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-		<Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
+		            <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
                 <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgDescription)" />
             </Dialog>
         </UI>
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceWelcomeDlg.wxs
===================================================================
diff -u -r62ce6cdcb81b24f7d436033bc0015bd210742fe4 -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceWelcomeDlg.wxs	(.../MaintenanceWelcomeDlg.wxs)	(revision 62ce6cdcb81b24f7d436033bc0015bd210742fe4)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/MaintenanceWelcomeDlg.wxs	(.../MaintenanceWelcomeDlg.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -21,9 +21,7 @@
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
                 </Control>
                 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.BackButtonText)" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-<!--                <Control Id="Title" Type="Text" X="39" Y="160" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgTitle)" /> -->
                 <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgDescription)" />
             </Dialog>
 
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs
===================================================================
diff -u -r26907b2ddb2fd1aa1330adf49dee259581838174 -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -18,8 +18,6 @@
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
                 </Control>
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.ProgressDlgBannerBitmap)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.BackButtonText)" />
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.NextButtonText)" />
                 <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <!-- mutually exclusive title and description strings overlap  -->
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs
===================================================================
diff -u -r26907b2ddb2fd1aa1330adf49dee259581838174 -r2df5b2a9d78815f71ed7f30953e38d6fdc49d08e
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision 2df5b2a9d78815f71ed7f30953e38d6fdc49d08e)
@@ -25,8 +25,7 @@
                     <Publish Property="WixUI_InstallMode" Value="InstallComplete">1</Publish>
                     <Publish Event="SetInstallLevel" Value="1000">1</Publish>
                 </Control>
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.NextButtonText)" />
+                <Control Id="Back" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
                 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
                     <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
                 </Control>