diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index c3d1dd7a7b..55e8a8cd95 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -9,6 +9,7 @@
         Version="$(var.CPACK_PACKAGE_VERSION)"
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
         UpgradeCode="$(var.CPACK_BOOTSTRAP_UPGRADE_GUID)"
+        IconSourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"
         DisableModify="yes">
 
         <Variable Name="InstallFolder"
@@ -20,12 +21,14 @@
             <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
                 <bal:WixStandardBootstrapperApplication
                     LicenseUrl="$(var.CPACK_LICENSE_URL)"
+                    LogoFile="$(var.CPACK_WIX_PRODUCT_LOGO)"
                     ShowVersion="yes" />
             </BootstrapperApplicationRef>
         <?else?>
             <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
                 <bal:WixStandardBootstrapperApplication
                     LicenseFile="$(var.CPACK_WIX_LICENSE_RTF)"
+                    LogoFile="$(var.CPACK_WIX_PRODUCT_LOGO)"
                     ShowVersion="yes" />
             </BootstrapperApplicationRef>
         <?endif?>
diff --git a/cmake/Platform/Windows/Packaging/product_icon.ico b/cmake/Platform/Windows/Packaging/product_icon.ico
new file mode 100644
index 0000000000..0680ceea19
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/product_icon.ico
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
+size 107016
diff --git a/cmake/Platform/Windows/Packaging/product_logo.png b/cmake/Platform/Windows/Packaging/product_logo.png
new file mode 100644
index 0000000000..d5fd60ffb8
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/product_logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac0348c906c91de864cba91c0231b4794d8a00fafa630d13f2232351b90aa59b
+size 11074
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index dbc54528b6..d379358bf4 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -30,6 +30,7 @@ set(_addtional_defines
     -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir}
     -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
     -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir}
+    -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO}
 )
 
 if(CPACK_LICENSE_URL)
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 3b99992ad3..8504447d4f 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -78,6 +78,9 @@ endif()
 set(CPACK_WIX_PRODUCT_GUID ${LY_WIX_PRODUCT_GUID})
 set(CPACK_WIX_UPGRADE_GUID ${LY_WIX_UPGRADE_GUID})
 
+set(CPACK_WIX_PRODUCT_LOGO ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/product_logo.png)
+set(CPACK_WIX_PRODUCT_ICON ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/product_icon.ico)
+
 set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Template.wxs.in")
 
 set(_embed_artifacts "yes")