diff --git a/Makefile b/Makefile
index 2e5d4c5e..b4b33395 100644
--- a/Makefile
+++ b/Makefile
@@ -284,16 +284,16 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(
 # GUI
 # ---------------------------------------------------------------------
 
-assets/dmg-installer.tiff: assets/dmg-installer.png assets/dmg-installer@2x.png
+assets/dmg/background.tiff: assets/dmg/background.png assets/dmg/background@2x.png
 	tiffutil -cathidpicheck $^ -out $@
 
-$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/dmg-installer.tiff \
+$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/dmg/background.tiff \
 	| $(BUILD_DIRECTORY)
 	TARGET_ARCH=$(TARGET_ARCH) build --mac dmg $(ELECTRON_BUILDER_OPTIONS) \
 		--extraMetadata.version=$(APPLICATION_VERSION) \
 		--extraMetadata.packageType=dmg
 
-$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/dmg-installer.tiff \
+$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/dmg/background.tiff \
 	| $(BUILD_DIRECTORY)
 	TARGET_ARCH=$(TARGET_ARCH) build --mac zip $(ELECTRON_BUILDER_OPTIONS) \
 		--extraMetadata.version=$(APPLICATION_VERSION) \
diff --git a/assets/dmg-installer.png b/assets/dmg/background.png
similarity index 100%
rename from assets/dmg-installer.png
rename to assets/dmg/background.png
diff --git a/assets/dmg-installer.tiff b/assets/dmg/background.tiff
similarity index 100%
rename from assets/dmg-installer.tiff
rename to assets/dmg/background.tiff
diff --git a/assets/dmg-installer@2x.png b/assets/dmg/background@2x.png
similarity index 100%
rename from assets/dmg-installer@2x.png
rename to assets/dmg/background@2x.png
diff --git a/assets/128x128.png b/assets/iconset/128x128.png
similarity index 100%
rename from assets/128x128.png
rename to assets/iconset/128x128.png
diff --git a/assets/16x16.png b/assets/iconset/16x16.png
similarity index 100%
rename from assets/16x16.png
rename to assets/iconset/16x16.png
diff --git a/assets/256x256.png b/assets/iconset/256x256.png
similarity index 100%
rename from assets/256x256.png
rename to assets/iconset/256x256.png
diff --git a/assets/32x32.png b/assets/iconset/32x32.png
similarity index 100%
rename from assets/32x32.png
rename to assets/iconset/32x32.png
diff --git a/assets/48x48.png b/assets/iconset/48x48.png
similarity index 100%
rename from assets/48x48.png
rename to assets/iconset/48x48.png
diff --git a/assets/512x512.png b/assets/iconset/512x512.png
similarity index 100%
rename from assets/512x512.png
rename to assets/iconset/512x512.png
diff --git a/electron-builder.yml b/electron-builder.yml
index 4a3e4a07..c20c8e22 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -13,7 +13,7 @@ mac:
   icon: assets/icon.icns
   category: public.app-category.developer-tools
 dmg:
-  background: assets/dmg-installer.tiff
+  background: assets/dmg/background.tiff
   icon: assets/icon.icns
   iconSize: 110
   contents:
@@ -44,7 +44,7 @@ linux:
   packageCategory: utils
   executableName: etcher-electron
   synopsis: Etcher is a powerful OS image flasher built with web technologies to ensure flashing an SDCard or USB drive is a pleasant and safe experience. It protects you from accidentally writing to your hard-drives, ensures every byte of data was written correctly and much more.
-  icon: assets
+  icon: assets/iconset
 deb:
   priority: optional
   depends: