diff --git a/Assets/ImageSources/RoundedCornersMac_1024x1024.png b/Assets/ImageSources/RoundedCornersMac_1024x1024.png
new file mode 100644
index 0000000000..2541e940ed
Binary files /dev/null and b/Assets/ImageSources/RoundedCornersMac_1024x1024.png differ
diff --git a/Assets/macOs.icns b/Assets/macOs.icns
index 474cfb4f02..adbf554ea1 100644
Binary files a/Assets/macOs.icns and b/Assets/macOs.icns differ
diff --git a/Assets/macOs.iconset/icon_128x128.png b/Assets/macOs.iconset/icon_128x128.png
index ee29f55031..fc1df0176d 100644
Binary files a/Assets/macOs.iconset/icon_128x128.png and b/Assets/macOs.iconset/icon_128x128.png differ
diff --git a/Assets/macOs.iconset/icon_128x128@2x.png b/Assets/macOs.iconset/icon_128x128@2x.png
index d5614e03ef..f57134f1b4 100644
Binary files a/Assets/macOs.iconset/icon_128x128@2x.png and b/Assets/macOs.iconset/icon_128x128@2x.png differ
diff --git a/Assets/macOs.iconset/icon_256x256.png b/Assets/macOs.iconset/icon_256x256.png
index d5614e03ef..f57134f1b4 100644
Binary files a/Assets/macOs.iconset/icon_256x256.png and b/Assets/macOs.iconset/icon_256x256.png differ
diff --git a/Assets/macOs.iconset/icon_256x256@2x.png b/Assets/macOs.iconset/icon_256x256@2x.png
index b441572d44..21eee28e73 100644
Binary files a/Assets/macOs.iconset/icon_256x256@2x.png and b/Assets/macOs.iconset/icon_256x256@2x.png differ
diff --git a/Assets/macOs.iconset/icon_512x512.png b/Assets/macOs.iconset/icon_512x512.png
index b441572d44..21eee28e73 100644
Binary files a/Assets/macOs.iconset/icon_512x512.png and b/Assets/macOs.iconset/icon_512x512.png differ
diff --git a/Assets/macOs.iconset/icon_512x512@2x.png b/Assets/macOs.iconset/icon_512x512@2x.png
index 6f6dc46a5e..91a6977703 100644
Binary files a/Assets/macOs.iconset/icon_512x512@2x.png and b/Assets/macOs.iconset/icon_512x512@2x.png differ
diff --git a/Assets/macOsIcon.psd b/Assets/macOsIcon.psd
new file mode 100644
index 0000000000..faebe5964b
Binary files /dev/null and b/Assets/macOsIcon.psd differ
diff --git a/ElectronClient/build-win/icons/SmallTile.png b/ElectronClient/build-win/icons/SmallTile.png
index 678f97e452..1b15de6a8e 100644
Binary files a/ElectronClient/build-win/icons/SmallTile.png and b/ElectronClient/build-win/icons/SmallTile.png differ
diff --git a/ElectronClient/build-win/icons/Square150x150Logo.png b/ElectronClient/build-win/icons/Square150x150Logo.png
index aff1ce96e8..8afed34642 100644
Binary files a/ElectronClient/build-win/icons/Square150x150Logo.png and b/ElectronClient/build-win/icons/Square150x150Logo.png differ
diff --git a/Tools/generate-images.js b/Tools/generate-images.js
index a8b229d0df..93f13ea3ba 100644
--- a/Tools/generate-images.js
+++ b/Tools/generate-images.js
@@ -31,6 +31,10 @@ const sources = [
 		id: 6,
 		name: '../JoplinLetter.png',
 	},
+	{
+		id: 7,
+		name: 'RoundedCornersMac_1024x1024.png',
+	},
 ];
 
 function sourceById(id) {
@@ -184,43 +188,45 @@ const operations = [
 		height: 64,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_128x128.png',
 		width: 128,
 		height: 128,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_128x128@2x.png',
 		width: 256,
 		height: 256,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_256x256.png',
 		width: 256,
 		height: 256,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_256x256@2x.png',
 		width: 512,
 		height: 512,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_512x512.png',
 		width: 512,
 		height: 512,
 	},
 	{
-		source: 4,
+		source: 7,
 		dest: 'Assets/macOs.iconset/icon_512x512@2x.png',
 		width: 1024,
 		height: 1024,
 	},
 
-
+	// ============================================================================
+	// PortableApps launcher
+	// ============================================================================
 
 	{
 		source: 5,