10 files changed, 25 insertions, 22 deletions

diff --git a/src/app.js b/src/app.js
index 1c2f66592..d8fa37014 100644
--- a/src/app.js
+++ b/src/app.js
@@ -52,7 +52,6 @@ smoothScroll.polyfill();
 
 // Basic electron Setup
 webFrame.setVisualZoomLevelLimits(1, 1);
-webFrame.setLayoutZoomLevelLimits(0, 0);
 
 window.addEventListener('load', () => {
   const serverApi = new ServerApi();
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 2797a2dce..6017252bc 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -252,6 +252,9 @@ export default @observer class EditSettingsForm extends Component {
             <Toggle field={form.$('runInBackground')} />
             <Toggle field={form.$('enableSystemTray')} />
             {isTrayEnabled && <Toggle field={form.$('startMinimized')} />}
+            {process.platform === 'win32' && (
+              <Toggle field={form.$('minimizeToSystemTray')} />
+            )}
             <Toggle field={form.$('privateNotifications')} />
             <Toggle field={form.$('showServiceNavigationBar')} />
 
@@ -279,10 +282,6 @@ export default @observer class EditSettingsForm extends Component {
 
             <Hr />
 
-            {process.platform === 'win32' && (
-              <Toggle field={form.$('minimizeToSystemTray')} />
-            )}
-
             <Input
               placeholder="Server"
               onChange={e => this.submit(e)}
diff --git a/src/config.js b/src/config.js
index d19a4b8b4..895852ed8 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,8 +1,7 @@
 import electron from 'electron';
-import path from 'path';
 import isDevMode from 'electron-is-dev';
 import ms from 'ms';
-
+import path from 'path';
 import { asarPath } from './helpers/asar-helpers';
 
 const app = process.type === 'renderer' ? electron.remote.app : electron.app;
@@ -126,11 +125,11 @@ if (process.env.FERDI_APPDATA_DIR != null) {
   app.setPath('appData', process.env.FERDI_APPDATA_DIR);
   app.setPath('userData', path.join(app.getPath('appData')));
 } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`);
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`));
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
 } else if (process.platform === 'win32') {
   app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
+  app.setPath('userData', path.join(app.getPath('appData'), app.name));
 }
 
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 595cfdcc7..8eb7c3b82 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -44,7 +44,7 @@ const messages = defineMessages({
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Show Ferdi in system tray',
+    defaultMessage: '!!!Always show Ferdi in system tray',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 6ac9153a4..17f77b609 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4136,7 +4136,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Show Ferdi in system tray",
+        "defaultMessage": "!!!Always show Ferdi in system tray",
         "end": {
           "column": 3,
           "line": 48
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 22417f340..d2e53d625 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -53,7 +53,7 @@
   },
   {
     "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Ferdi in system tray",
+    "defaultMessage": "!!!Always show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 45,
diff --git a/src/index.js b/src/index.js
index 46230abd6..167d3897a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -14,15 +14,15 @@ if (process.env.FERDI_APPDATA_DIR != null) {
   app.setPath('appData', process.env.FERDI_APPDATA_DIR);
   app.setPath('userData', path.join(app.getPath('appData')));
 } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}AppData`);
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}AppData`));
+  app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`);
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}AppData`));
 } else if (process.platform === 'win32') {
   app.setPath('appData', process.env.APPDATA);
-  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
+  app.setPath('userData', path.join(app.getPath('appData'), app.name));
 }
 
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`));
+  app.setPath('userData', path.join(app.getPath('appData'), `${app.name}Dev`));
 }
 
 /* eslint-disable import/first */
diff --git a/src/internal-server b/src/internal-server
-Subproject 24c8ea3aad5b828297686a032103d2cc4eabc37
+Subproject 3ad266e1371075612ce866332472595bfd89a5d
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 6167f1c59..f2669a106 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -825,7 +825,7 @@ export default class FranzMenu {
     });
 
     tpl.unshift({
-      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      label: isMac ? app.name : intl.formatMessage(menuItems.file),
       accelerator: 'Alt+F',
       submenu: [
         {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index c0d936599..84ee8e3bb 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Tray, Menu, systemPreferences, nativeTheme, nativeImage,
+  app, Menu, nativeImage, nativeTheme, systemPreferences, Tray,
 } from 'electron';
 import path from 'path';
 
@@ -37,14 +37,20 @@ export default class TrayIcon {
     ];
 
     const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-    this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
       if (app.mainWindow.isMinimized()) {
         app.mainWindow.restore();
+      } else if (app.mainWindow.isVisible()) {
+        app.mainWindow.hide();
+      } else {
+        app.mainWindow.show();
+        app.mainWindow.focus();
       }
-      app.mainWindow.show();
-      app.mainWindow.focus();
+    });
+
+    this.trayIcon.on('right-click', () => {
+      this.trayIcon.popUpContextMenu(trayMenu);
     });
 
     if (process.platform === 'darwin') {