diff --git a/electron/main.js b/electron/main.js
index 08b0e14c..3adde34d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -80,7 +80,7 @@ function createWindow () {
 	// Create the browser window using the state information
 	mainWindow = new BrowserWindow({
 		 title: 'Rambox-OS'
-		,icon: __dirname + '/../resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico')
+		,icon: app.getAppPath() + '/resources/Icon.' + (process.platform === 'linux' ? 'png' : 'ico')
 		,backgroundColor: '#FFF'
 		,x: config.get('x')
 		,y: config.get('y')
diff --git a/electron/tray.js b/electron/tray.js
index d0cd1f47..aef171c3 100644
--- a/electron/tray.js
+++ b/electron/tray.js
@@ -12,7 +12,7 @@ exports.create = function(win, config) {
 
 	const locale = require('../resources/languages/'+config.get('locale'));
 	const icon = process.platform === 'linux' || process.platform === 'darwin' ? 'IconTray.png' : 'Icon.ico';
-	const iconPath = path.join(__dirname, `../resources/${icon}`);
+	const iconPath = path.join(app.getAppPath(), `/resources/${icon}`);
 
 	const contextMenu = electron.Menu.buildFromTemplate([
 		{
@@ -73,6 +73,6 @@ exports.setBadge = function(messageCount, showUnreadTray) {
 		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
 	}
 
-	const iconPath = path.join(__dirname, `../resources/${icon}`);
+	const iconPath = path.join(app.getAppPath(), `/resources/${icon}`);
 	appIcon.setImage(iconPath);
 };