diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 85f8799775..7da81d0397 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -51,7 +51,9 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
     <String Id="FailureUninstallHeader">Uninstall Failed</String>
     <String Id="FailureRepairHeader">Repair Failed</String>
     <String Id="FailureHyperlinkLogText">
-One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.
+One or more issues caused the setup to fail.  Please fix the issues and then retry setup.  For more information, see the log file.
+
+&lt;a href="#"&gt;View Log File&lt;/a&gt;
     </String>
     <String Id="FailureCloseButton">&amp;Close</String>
 
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 0e198c4236..bb1023ae0c 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -65,13 +65,14 @@
 
     <!-- final page (failure state) -->
     <Page Name="Failure">
-        <Text Name="FailureHeader" X="38" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-        <Text Name="FailureInstallHeader" X="38" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
-        <Text Name="FailureUninstallHeader" X="38" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
-        <Text Name="FailureRepairHeader" X="38" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
+        <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@" Visible="yes"/>
+        <Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+        <Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
+        <Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
+        <Text Name="FailureRepairHeader" X="86" Y="142" Width="-42" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
 
-        <Hypertext Name="FailureLogFileLink" X="42" Y="202" Width="-42" Height="64" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="64" Y="266" Width="-42" Height="64" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
+        <Hypertext Name="FailureLogFileLink" X="90" Y="202" Width="-42" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+        <Hypertext Name="FailureMessageText" X="135" Y="282" Width="-42" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
 
         <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
     </Page>
diff --git a/cmake/Platform/Windows/Packaging/warning.png b/cmake/Platform/Windows/Packaging/warning.png
new file mode 100644
index 0000000000..75a5fd75a7
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/warning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d727994fd1819f7ff01d56e2d2f59c1fe2ed1e839156e70e3d2dec93d54ca04
+size 566
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 0e4b408637..3c2b5214f2 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -102,6 +102,8 @@ set(_raw_text_license "
 
 if(LY_INSTALLER_DOWNLOAD_URL)
 
+    set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png)
+
     if(LY_INSTALLER_LICENSE_URL)
         set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license})
         set(WIX_THEME_EULA_ACCEPTANCE_TEXT "&lt;a href=\"#\"&gt;Terms of Use&lt;/a&gt;")