diff --git a/nextcloudtheme/OEM.cmake b/nextcloudtheme/OEM.cmake
index 9a53b10..e87bd7c 100644
--- a/nextcloudtheme/OEM.cmake
+++ b/nextcloudtheme/OEM.cmake
@@ -6,9 +6,9 @@ set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string
 
 set( THEME_CLASS            "NextcloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
+set( WIN_SETUP_BITMAP_PATH  "${OEM_THEME_DIR}/win" )
 
-set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
+set( MAC_INSTALLER_BACKGROUND_FILE "${OEM_THEME_DIR}/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
 
 set( THEME_INCLUDE          "${OEM_THEME_DIR}/nextcloudtheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
@@ -16,3 +16,7 @@ set( THEME_INCLUDE          "${OEM_THEME_DIR}/nextcloudtheme.h" )
 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
 set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
+
+if(CPACK_GENERATOR MATCHES "NSIS")
+    SET( CPACK_PACKAGE_ICON  "{OEM_THEME_DIR}/win/installer.ico" ) # Set installer icon
+endif(CPACK_GENERATOR MATCHES "NSIS")
diff --git a/osx/installer-background.png b/nextcloudtheme/osx/installer-background.png
similarity index 100%
rename from osx/installer-background.png
rename to nextcloudtheme/osx/installer-background.png
diff --git a/osx/installer-background.svg b/nextcloudtheme/osx/installer-background.svg
similarity index 100%
rename from osx/installer-background.svg
rename to nextcloudtheme/osx/installer-background.svg
diff --git a/osx/installer-background_2x.png b/nextcloudtheme/osx/installer-background_2x.png
similarity index 100%
rename from osx/installer-background_2x.png
rename to nextcloudtheme/osx/installer-background_2x.png
diff --git a/win/page_header.bmp b/nextcloudtheme/win/page_header.bmp
similarity index 100%
rename from win/page_header.bmp
rename to nextcloudtheme/win/page_header.bmp
diff --git a/win/page_header.svg b/nextcloudtheme/win/page_header.svg
similarity index 100%
rename from win/page_header.svg
rename to nextcloudtheme/win/page_header.svg
diff --git a/win/welcome.bmp b/nextcloudtheme/win/welcome.bmp
similarity index 100%
rename from win/welcome.bmp
rename to nextcloudtheme/win/welcome.bmp
diff --git a/win/welcome.svg b/nextcloudtheme/win/welcome.svg
similarity index 100%
rename from win/welcome.svg
rename to nextcloudtheme/win/welcome.svg