diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index c8ba502d2..00963dbfe 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -136,15 +136,18 @@ macro(configurePackingResources)
             set(CPACK_PACKAGE_NAME "ImHex")
             set(CPACK_PACKAGE_VENDOR "WerWolv")
             set(CPACK_WIX_UPGRADE_GUID "05000E99-9659-42FD-A1CF-05C554B39285")
-            set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/resources/icon.ico")
+            set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/resources/dist/windows/icon.ico")
+            set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_banner.png")
+            set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png")
+            set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW")
             set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex")
             set_property(INSTALL "$<TARGET_FILE_NAME:main>"
                     PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
                     )
-            set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/resources/LICENSE.rtf")
+            set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/resources/dist/windows/LICENSE.rtf")
         endif()
     elseif (APPLE)
-        set (IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/AppIcon.icns")
+        set (IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/dist/macos/AppIcon.icns")
 
         if (CREATE_BUNDLE)
             set(APPLICATION_TYPE MACOSX_BUNDLE)
@@ -152,12 +155,14 @@ macro(configurePackingResources)
             set(MACOSX_BUNDLE_ICON_FILE "AppIcon.icns")
             set(MACOSX_BUNDLE_INFO_STRING "WerWolv")
             set(MACOSX_BUNDLE_BUNDLE_NAME "ImHex")
-            set(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/Info.plist.in")
+            set(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/dist/macos/Info.plist.in")
             set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
             set(MACOSX_BUNDLE_GUI_IDENTIFIER "net.WerWolv.ImHex")
             set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}-${GIT_COMMIT_HASH}")
             set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-            set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 2020 WerWolv and Thog. All rights reserved." )
+
+            string(TIMESTAMP CURR_YEAR "%Y")
+            set(MACOSX_BUNDLE_COPYRIGHT "Copyright © 2020 - ${CURR_YEAR} WerWolv. All rights reserved." )
             if ("${CMAKE_GENERATOR}" STREQUAL "Xcode")
                 set ( bundle_path "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/ImHex.app" )
             else ()
@@ -286,7 +291,7 @@ macro(createPackage)
 
     if (CREATE_PACKAGE)
         set (CPACK_BUNDLE_NAME "ImHex")
-        set (CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/resources/AppIcon.icns" )
+        set (CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/resources/dist/macos/AppIcon.icns" )
         set (CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/ImHex.app/Contents/Info.plist")
 
         include(CPack)
diff --git a/resources/AppIcon.icns b/resources/dist/macos/AppIcon.icns
similarity index 100%
rename from resources/AppIcon.icns
rename to resources/dist/macos/AppIcon.icns
diff --git a/resources/Info.plist.in b/resources/dist/macos/Info.plist.in
similarity index 100%
rename from resources/Info.plist.in
rename to resources/dist/macos/Info.plist.in
diff --git a/resources/LICENSE.rtf b/resources/dist/windows/LICENSE.rtf
similarity index 100%
rename from resources/LICENSE.rtf
rename to resources/dist/windows/LICENSE.rtf
diff --git a/resources/icon.ico b/resources/dist/windows/icon.ico
similarity index 100%
rename from resources/icon.ico
rename to resources/dist/windows/icon.ico
diff --git a/resources/dist/windows/wix_banner.png b/resources/dist/windows/wix_banner.png
new file mode 100644
index 000000000..ce25aeed7
Binary files /dev/null and b/resources/dist/windows/wix_banner.png differ
diff --git a/resources/dist/windows/wix_dialog.png b/resources/dist/windows/wix_dialog.png
new file mode 100644
index 000000000..16c99be3c
Binary files /dev/null and b/resources/dist/windows/wix_dialog.png differ
diff --git a/resources/projects/wix_banner.xcf b/resources/projects/wix_banner.xcf
new file mode 100644
index 000000000..c00754cb6
Binary files /dev/null and b/resources/projects/wix_banner.xcf differ
diff --git a/resources/projects/wix_dialog.xcf b/resources/projects/wix_dialog.xcf
new file mode 100644
index 000000000..ceaf108f8
Binary files /dev/null and b/resources/projects/wix_dialog.xcf differ
diff --git a/resources/resource.rc b/resources/resource.rc
index dec34be73..e7dca4d2c 100644
--- a/resources/resource.rc
+++ b/resources/resource.rc
@@ -1,4 +1,4 @@
-GLFW_ICON ICON icon.ico
+GLFW_ICON ICON dist/windows/icon.ico
 
 1 VERSIONINFO
     FILEVERSION PROJECT_VERSION_MAJOR,PROJECT_VERSION_MINOR,PROJECT_VERSION_PATCH