diff --git a/app/icon.png b/app/icon.png
new file mode 100644
index 000000000..ca66a1057
Binary files /dev/null and b/app/icon.png differ
diff --git a/app/package.json b/app/package.json
index be08bdb20..6ed404afe 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,12 +10,14 @@
   "build": {
     "appId": "org.dbgate",
     "mac": {
-      "category": "database"
+      "category": "database",
+      "icon": "icon.png"
     },
     "linux": {
       "target": [
         "AppImage"
-      ]
+      ],
+      "icon": "icon.png"
     },
     "win": {
       "target": [
diff --git a/app/src/electron.js b/app/src/electron.js
index 6fc1bef55..85dace52c 100644
--- a/app/src/electron.js
+++ b/app/src/electron.js
@@ -1,4 +1,5 @@
 const electron = require('electron');
+const os = require('os');
 const { Menu } = require('electron');
 const { fork } = require('child_process');
 var { autoUpdater } = require('electron-updater');
@@ -47,10 +48,7 @@ function buildMenu() {
     },
     {
       label: 'Edit',
-      submenu: [
-        { role: 'copy' },
-        { role: 'paste' },
-      ],
+      submenu: [{ role: 'copy' }, { role: 'paste' }],
     },
     {
       label: 'View',
@@ -114,7 +112,7 @@ function createWindow() {
     width: 1200,
     height: 800,
     title: 'DbGate',
-    icon: 'icon.ico',
+    icon: os.platform() == 'win32' ? 'icon.ico' : 'icon.png',
     ...bounds,
     show: false,
     webPreferences: {