diff --git a/gpt4all-chat/cmake/Gpt4allCPack.cmake b/gpt4all-chat/cmake/Gpt4allCPack.cmake
index f13f01ce..6a305b83 100644
--- a/gpt4all-chat/cmake/Gpt4allCPack.cmake
+++ b/gpt4all-chat/cmake/Gpt4allCPack.cmake
@@ -15,7 +15,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://www.nomic.ai/gpt4all")
-set(CPACK_PACKAGE_EXECUTABLES "gpt4all")
+set(CPACK_PACKAGE_EXECUTABLES chat;gpt4all)
 set(CPACK_CREATE_DESKTOP_LINKS "gpt4all")
 # TODO: Is there another intro message we want?
 set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/../README.md")
@@ -59,11 +59,16 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Windows)
                    "${CMAKE_BINARY_DIR}/cmake/deploy-qt-windows.cmake" @ONLY)
     set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_BINARY_DIR}/cmake/deploy-qt-windows.cmake)
     set(CPACK_PACKAGE_FILE_NAME "${COMPONENT_NAME_MAIN}-installer-win64")
-    set(CPACK_GENERATOR "InnoSetup")
-    set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/gpt4all.ico")
+    set(CPACK_GENERATOR "INNOSETUP")
+    set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.bmp")
     # Todo - extend this to all languages we want to support
     set(GPT4ALL_DIST_LANGUAGES english)
-    set(GPT4ALL_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.png")
+    set(GPT4ALL_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.ico")
+    if (CMAKE_SIZEOF_VOID_P GREATER 4)
+      set(GPT4ALL_INSTALLER_ARCH x64)
+  else()
+      set(GPT4ALL_INSTALLER_ARCH x86)
+  endif()
 elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
     find_program(MACDEPLOYQT macdeployqt HINTS ${_qt_bin_dir})
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/deploy-qt-mac.cmake.in"
diff --git a/gpt4all-chat/icons/gpt4all-48.bmp b/gpt4all-chat/icons/gpt4all-48.bmp
new file mode 100644
index 00000000..34e6041a
Binary files /dev/null and b/gpt4all-chat/icons/gpt4all-48.bmp differ
diff --git a/gpt4all-chat/icons/gpt4all-48.ico b/gpt4all-chat/icons/gpt4all-48.ico
new file mode 100644
index 00000000..1af4647f
Binary files /dev/null and b/gpt4all-chat/icons/gpt4all-48.ico differ