diff --git a/Assets/build_mac_icons.sh b/Assets/build_mac_icons.sh
new file mode 100644
index 000000000..66423a4c8
--- /dev/null
+++ b/Assets/build_mac_icons.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+iconutil --convert icns macOs.iconset
diff --git a/Assets/macOs.icns b/Assets/macOs.icns
new file mode 100644
index 000000000..c1a73076d
Binary files /dev/null and b/Assets/macOs.icns differ
diff --git a/Assets/MacIconset/icon_128x128.png b/Assets/macOs.iconset/icon_128x128.png
similarity index 100%
rename from Assets/MacIconset/icon_128x128.png
rename to Assets/macOs.iconset/icon_128x128.png
diff --git a/Assets/MacIconset/icon_16x16.png b/Assets/macOs.iconset/icon_16x16.png
similarity index 100%
rename from Assets/MacIconset/icon_16x16.png
rename to Assets/macOs.iconset/icon_16x16.png
diff --git a/Assets/MacIconset/icon_256x256.png b/Assets/macOs.iconset/icon_256x256.png
similarity index 100%
rename from Assets/MacIconset/icon_256x256.png
rename to Assets/macOs.iconset/icon_256x256.png
diff --git a/Assets/MacIconset/icon_32x32.png b/Assets/macOs.iconset/icon_32x32.png
similarity index 100%
rename from Assets/MacIconset/icon_32x32.png
rename to Assets/macOs.iconset/icon_32x32.png
diff --git a/Assets/MacIconset/icon_512x512.png b/Assets/macOs.iconset/icon_512x512.png
similarity index 100%
rename from Assets/MacIconset/icon_512x512.png
rename to Assets/macOs.iconset/icon_512x512.png
diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json
index f9fd3da58..70f3c55d4 100644
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@@ -23,16 +23,10 @@
   "build": {
     "appId": "net.cozic.joplin-desktop",
     "win": {
-      "icon": "../../Assets/Joplin.ico",
-      "publish": [
-        "github"
-      ]
+      "icon": "../../Assets/Joplin.ico"
     },
     "mac": {
-      "asar": false
-    },
-    "linux": {
-      "asar": false
+      "icon": "../../Assets/macOs.icns"
     }
   },
   "homepage": "https://github.com/laurent22/joplin#readme",