diff --git a/.eslintignore b/.eslintignore
index 443d34d99..ebc4a46e8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -61,6 +61,8 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+CliClient/tests-build/support/plugins/withExternalModules/global.d.js
+CliClient/tests-build/support/plugins/withExternalModules/src/index.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js
diff --git a/.gitignore b/.gitignore
index 75b322edc..105d28975 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,8 @@ Tools/commit_hook.txt
 *.map
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+CliClient/tests-build/support/plugins/withExternalModules/global.d.js
+CliClient/tests-build/support/plugins/withExternalModules/src/index.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js
diff --git a/Assets/ImageSources/RoundedCornersMac_1024x1024.png b/Assets/ImageSources/RoundedCornersMac_1024x1024.png
new file mode 100644
index 000000000..2541e940e
Binary files /dev/null and b/Assets/ImageSources/RoundedCornersMac_1024x1024.png differ
diff --git a/Assets/macOs.icns b/Assets/macOs.icns
index 474cfb4f0..dd3a47aa0 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 ee29f5503..fc1df0176 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 d5614e03e..f57134f1b 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 d5614e03e..f57134f1b 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 b441572d4..21eee28e7 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 b441572d4..21eee28e7 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 6f6dc46a5..91a697770 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 000000000..faebe5964
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 678f97e45..1b15de6a8 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 aff1ce96e..8afed3464 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 a8b229d0d..782db1c2b 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,37 +188,37 @@ 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,