diff --git a/default_app/default_app.js b/default_app/default_app.js
index a72675ea6f..bfb97a9ab0 100644
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -1,6 +1,7 @@
 const {app, BrowserWindow} = require('electron')
+const path = require('path')
 
-var mainWindow = null
+let mainWindow = null
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
@@ -9,13 +10,18 @@ app.on('window-all-closed', () => {
 
 exports.load = (appUrl) => {
   app.on('ready', () => {
-    mainWindow = new BrowserWindow({
+    const options = {
       width: 800,
       height: 600,
       autoHideMenuBar: true,
       backgroundColor: '#FFFFFF',
       useContentSize: true
-    })
+    }
+    if (process.platform === 'linux') {
+      options.icon = path.join(__dirname, 'icon.png')
+    }
+
+    mainWindow = new BrowserWindow(options)
     mainWindow.loadURL(appUrl)
     mainWindow.focus()
   })
diff --git a/default_app/icon.png b/default_app/icon.png
new file mode 100644
index 0000000000..a250ed6ecf
Binary files /dev/null and b/default_app/icon.png differ
diff --git a/filenames.gypi b/filenames.gypi
index a86c53ba4f..942fcf64ba 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -75,6 +75,7 @@
     ],
     'default_app_sources': [
       'default_app/default_app.js',
+      'default_app/icon.png',
       'default_app/index.html',
       'default_app/main.js',
       'default_app/package.json',