diff --git a/share/windows/installer-banner.png b/share/windows/installer-banner.png
new file mode 100644
index 000000000..36c27ab18
Binary files /dev/null and b/share/windows/installer-banner.png differ
diff --git a/share/windows/installer-header.bmp b/share/windows/installer-header.bmp
deleted file mode 100644
index d76a56b2e..000000000
Binary files a/share/windows/installer-header.bmp and /dev/null differ
diff --git a/share/windows/installer-wizard.bmp b/share/windows/installer-wizard.bmp
deleted file mode 100644
index 229ead7c4..000000000
Binary files a/share/windows/installer-wizard.bmp and /dev/null differ
diff --git a/share/windows/installer-wizard.png b/share/windows/installer-wizard.png
new file mode 100644
index 000000000..b16ce674d
Binary files /dev/null and b/share/windows/installer-wizard.png differ
diff --git a/share/windows/wix-banner.bmp b/share/windows/wix-banner.bmp
deleted file mode 100644
index aae5d698b..000000000
Binary files a/share/windows/wix-banner.bmp and /dev/null differ
diff --git a/share/windows/wix-dialog.bmp b/share/windows/wix-dialog.bmp
deleted file mode 100644
index 1040f0f03..000000000
Binary files a/share/windows/wix-dialog.bmp and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b5c4b582..f37f55b0a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -446,14 +446,13 @@ if(WIN32)
     set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROGNAME})
     set(CPACK_PACKAGE_VERSION ${KEEPASSXC_VERSION_CLEAN})
     set(CPACK_PACKAGE_VENDOR "${PROGNAME} Team")
-    string(REGEX REPLACE "/" "\\\\\\\\" CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/share/windows/installer-header.bmp")
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/INSTALLER_LICENSE.txt")
     set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
     set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/share/windows/keepassxc.ico")
     set(CPACK_NSIS_MUI_UNIICON "${CPACK_NSIS_MUI_ICON}")
     set(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\${PROGNAME}.exe")
-    string(REGEX REPLACE "/" "\\\\\\\\" CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/share/windows/installer-wizard.bmp")
-    set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP}")
+    set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/share/windows/installer-wizard.png")
+    set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/share/windows/installer-wizard.png")
     set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROGNAME}.lnk' '$INSTDIR\\\\${PROGNAME}.exe'")
     set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\${PROGNAME}.lnk'")
     set(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS "ExecWait 'Taskkill /IM KeePassXC.exe'")
@@ -466,8 +465,8 @@ if(WIN32)
     set(CPACK_NSIS_MUI_FINISHPAGE_RUN "../${PROGNAME}.exe")
     set(CPACK_WIX_UPGRADE_GUID 88785A72-3EAE-4F29-89E3-BC6B19BA9A5B)
     set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/share/windows/keepassxc.ico")
-    set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/share/windows/wix-banner.bmp")
-    set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/share/windows/wix-dialog.bmp")
+    set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/share/windows/installer-banner.png")
+    set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/share/windows/installer-wizard.png")
     set(CPACK_WIX_UI_REF "KPXC_InstallDir")
     set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/share/windows/wix-template.xml")
     set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/share/windows/wix-patch.xml")