diff --git a/app/src/components/mainWindow/mainWindow.js b/app/src/components/mainWindow/mainWindow.js
index 0a0a55d..783cc64 100644
--- a/app/src/components/mainWindow/mainWindow.js
+++ b/app/src/components/mainWindow/mainWindow.js
@@ -39,7 +39,8 @@ function createMainWindow(options, onAppQuit, setDockBadge) {
             preload: path.join(__dirname, 'static', 'preload.js')
         },
         // after webpack path here should reference `resources/app/`
-        icon: path.join(__dirname, '../', '/icon.png')
+        icon: options.icon
+        //icon: path.join(__dirname, '../', '/icon.png')
     });
 
     let currentZoom = 1;
diff --git a/app/src/main.js b/app/src/main.js
index de07a90..48c39ef 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -10,15 +10,21 @@ const {app, ipcMain} = electron;
 const {isOSX} = helpers;
 
 const APP_ARGS_FILE_PATH = path.join(__dirname, '..', 'nativefier.json');
-
 const appArgs = JSON.parse(fs.readFileSync(APP_ARGS_FILE_PATH, 'utf8'));
 
+const DEFAULT_ICON_PATH = path.join(__dirname, '/icon.png');
+const Tray = electron.Tray;
+
 let mainWindow;
 
 if (appArgs.insecure) {
     app.commandLine.appendSwitch('ignore-certificate-errors');
 }
 
+if(!appArgs.icon){
+    appArgs.icon = DEFAULT_ICON_PATH;
+}
+
 // do nothing for setDockBadge if not OSX
 let setDockBadge = () => {};
 
@@ -53,8 +59,11 @@ app.on('before-quit', () => {
     }
 });
 
+let appIcon = null;
 app.on('ready', () => {
     mainWindow = createMainWindow(appArgs, app.quit, setDockBadge);
+
+    appIcon = new Tray(appArgs.icon);
 });
 
 app.on('login', (event, webContents, request, authInfo, callback) => {