diff --git a/build/icon.icns b/build/icon.icns
new file mode 100644
index 000000000..21c7ab330
Binary files /dev/null and b/build/icon.icns differ
diff --git a/build/icon.ico b/build/icon.ico
new file mode 100644
index 000000000..4f1b8cf10
Binary files /dev/null and b/build/icon.ico differ
diff --git a/images/1024.png b/build/icons/1024.png
similarity index 100%
rename from images/1024.png
rename to build/icons/1024.png
diff --git a/images/128.png b/build/icons/128.png
similarity index 100%
rename from images/128.png
rename to build/icons/128.png
diff --git a/images/16.png b/build/icons/16.png
similarity index 100%
rename from images/16.png
rename to build/icons/16.png
diff --git a/images/24.png b/build/icons/24.png
similarity index 100%
rename from images/24.png
rename to build/icons/24.png
diff --git a/images/256.png b/build/icons/256.png
similarity index 100%
rename from images/256.png
rename to build/icons/256.png
diff --git a/images/32.png b/build/icons/32.png
similarity index 100%
rename from images/32.png
rename to build/icons/32.png
diff --git a/images/48.png b/build/icons/48.png
similarity index 100%
rename from images/48.png
rename to build/icons/48.png
diff --git a/images/512.png b/build/icons/512.png
similarity index 100%
rename from images/512.png
rename to build/icons/512.png
diff --git a/images/64.png b/build/icons/64.png
similarity index 100%
rename from images/64.png
rename to build/icons/64.png
diff --git a/package.json b/package.json
index 7843bedb4..2d65a50a5 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,8 @@
     "start": "electron .",
     "pack": "build --dir --em.NODE_ENV=$NODE_ENV",
     "dist": "build --em.NODE_ENV=$NODE_ENV",
-    "release": "build --em.NODE_ENV=$NODE_ENV",
-    "icon-gen": "icon-gen -r -t png -m 'ico,icns' -n 'ico=icon,icns=icon' -i ./images -o ./build"
+    "release": "build -mwl --em.NODE_ENV=$NODE_ENV",
+    "icon-gen": "icon-gen -r -t png -m 'ico,icns' -n 'ico=icon,icns=icon' -i ./build/icons -o ./build"
   },
   "build": {
     "appId": "org.whispersystems.signal-desktop",