diff --git a/desktop/electron.js b/desktop/electron.js
index 252d9f809..557ae4cfe 100644
--- a/desktop/electron.js
+++ b/desktop/electron.js
@@ -27,7 +27,7 @@ function createWindow() {
         }
     }
 
-    mainWindow = new BrowserWindow({
+    const options = {
         width: width,
         height: height,
         minWidth: 400,
@@ -35,7 +35,13 @@ function createWindow() {
         textAreasAreResizable: false,
         plugins: true,
         show: false // Don't show it until it's ready to prevent showing a blank screen.
-    });
+    };
+
+    if (os.platform().indexOf('linux') === 0) {
+        options.icon = path.join(__dirname, '/../www/assets/icon/icon.png');
+    }
+
+    mainWindow = new BrowserWindow(options);
 
     // And load the index.html of the app.
     mainWindow.loadURL(url.format({
diff --git a/src/assets/icon/favicon.ico b/src/assets/icon/favicon.ico
index c65354c81..4c516e7b5 100644
Binary files a/src/assets/icon/favicon.ico and b/src/assets/icon/favicon.ico differ
diff --git a/src/assets/icon/icon.png b/src/assets/icon/icon.png
new file mode 100644
index 000000000..de5b0f4c6
Binary files /dev/null and b/src/assets/icon/icon.png differ