diff --git a/cmake/installer/Installer.ico b/cmake/installer/Installer.ico
index c4316f5de6..8d84d9d094 100644
Binary files a/cmake/installer/Installer.ico and b/cmake/installer/Installer.ico differ
diff --git a/cmake/installer/add-remove.ico b/cmake/installer/add-remove.ico
deleted file mode 100644
index 8d84d9d094..0000000000
Binary files a/cmake/installer/add-remove.ico and /dev/null differ
diff --git a/cmake/installer/installer-header.bmp b/cmake/installer/installer-header.bmp
index 28101932c7..7588a338b1 100644
Binary files a/cmake/installer/installer-header.bmp and b/cmake/installer/installer-header.bmp differ
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index c046a8ac1a..fcd7b4f19b 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -27,9 +27,8 @@ macro(GENERATE_INSTALLERS)
   if (WIN32)
     set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
 
-    # install the uninstaller icon and reference it for Add/Remove icon
-    set(ADD_REMOVE_ICON_NAME "add-remove.ico")
-    set(ADD_REMOVE_ICON_BAD_PATH "${HF_CMAKE_DIR}/installer/${ADD_REMOVE_ICON_NAME}")
+    # reference the installer icon for Add/Remove icon
+    set(ADD_REMOVE_ICON_BAD_PATH "${CPACK_NSIS_MUI_ICON}")
     fix_path_for_nsis(${ADD_REMOVE_ICON_BAD_PATH} ADD_REMOVE_ICON_PATH)
     set(CPACK_NSIS_INSTALLED_ICON_NAME ${ADD_REMOVE_ICON_NAME})