diff --git a/.gitignore b/.gitignore
index f0427ee4..0d9112fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ node_modules
 dist
 build
 icon-build
-icns-build
+build-resources
 doc
 /ffmpeg
diff --git a/icon-gen.js b/icon-gen.js
index 1cb80b77..fba97591 100644
--- a/icon-gen.js
+++ b/icon-gen.js
@@ -16,5 +16,9 @@ const svg2png = (from, to, width, height) => sharp(from)
   await svg2png('src/icon.svg', './build-resources/appx/Square44x44Logo.png', 44, 44);
   await svg2png('src/icon.svg', './build-resources/appx/Wide310x150Logo.png', 620, 300);
 
-  await icongen('./src/icon.svg', './icns-build', { icns: { sizes: [512, 1024] } });
+  await icongen('./src/icon.svg', './icon-build', { icns: { sizes: [512, 1024] } });
+
+  // https://github.com/mifi/lossless-cut/issues/778
+  // https://stackoverflow.com/questions/3236115/which-icon-sizes-should-my-windows-applications-icon-include
+  await icongen('./src/icon.svg', './icon-build', { ico: { sizes: [16, 24, 32, 40, 48, 64, 96, 128, 256, 512] } });
 })();
diff --git a/package.json b/package.json
index 3645fe82..e9c6f843 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "homepage": "./",
   "scripts": {
     "start": "concurrently -k \"cross-env BROWSER=none PORT=3001 DISABLE_ESLINT_PLUGIN=true react-scripts start\" \"wait-on http://localhost:3001 && electron .\"",
-    "icon-gen": "mkdirp icon-build icns-build build-resources/appx && node icon-gen.js",
+    "icon-gen": "mkdirp icon-build build-resources/appx && node icon-gen.js",
     "download-ffmpeg-mac": "mkdir -p ffmpeg/darwin && cd ffmpeg/darwin && wget https://github.com/mifi/ffmpeg-build-script/releases/download/n4.4.1/ffmpeg -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/n4.4.1/ffprobe -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
     "download-ffmpeg-linux": "mkdir -p ffmpeg/linux && cd ffmpeg/linux && wget https://github.com/mifi/ffmpeg-builds/releases/download/4.4.1/ffmpeg-release-amd64-static.tar.xz -O ffmpeg.xz && tar xvf ffmpeg.xz && mv ffmpeg-4.4.1-amd64-static/{ffmpeg,ffprobe} ./",
     "download-ffmpeg-windows": "npx shx mkdir -p ffmpeg/win32 && cd ffmpeg/win32 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/4.4.1/ffmpeg-n4.4.1-2-gcc33e73618-win64-gpl-4.4.zip --out . --filename ffmpeg.zip && 7z x ffmpeg.zip && npx shx mv ffmpeg-n4.4.1-2-gcc33e73618-win64-gpl-4.4/bin/ffmpeg.exe ./ && npx shx mv ffmpeg-n4.4.1-2-gcc33e73618-win64-gpl-4.4/bin/ffprobe.exe ./",
@@ -164,7 +164,7 @@
           "to": "ffprobe"
         }
       ],
-      "icon": "icns-build/app.icns",
+      "icon": "icon-build/app.icns",
       "fileAssociations": [
         {
           "ext": [
@@ -289,7 +289,7 @@
           "to": "ffprobe.exe"
         }
       ],
-      "icon": "icon-build/app-512.png",
+      "icon": "icon-build/app.ico",
       "fileAssociations": [
         {
           "ext": [