diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 5c4cf2b7f4..8a50181732 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -50,7 +50,7 @@
         <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
 
         <Text X="42" Y="202" Width="70" Height="17" FontId="1" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="40" Y="202" Width="-42" Height="17" FontId="1" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="17" FontId="1" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
         <Progressbar Name="OverallCalculatedProgressbar" X="42" Y="230" Width="-90" Height="20" />
 
         <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>
@@ -69,7 +69,7 @@
 
     <!-- final page (failure state) -->
     <Page Name="Failure">
-        <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@" Visible="yes"/>
+        <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@" HideWhenDisabled="yes"/>
         <Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
         <Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
         <Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>