diff --git a/jslib b/jslib
index e614cfff..3270d8bd 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e614cffffbaf2b7e290aa5fe511d39e387efb4d5
+Subproject commit 3270d8bd0ed46b62262575f5d59fca2414aaf8c7
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 951140a4..ea39b857 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -42,7 +42,7 @@
                             </div>
                             <small class="help-block">{{'enableTrayDesc' | i18n}}</small>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" *ngIf="showMinToTray">
                             <div class="checkbox">
                                 <label for="enableMinToTray">
                                     <input id="enableMinToTray" type="checkbox" name="EnableMinToTray"
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index c77d8034..f23a024a 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -6,6 +6,8 @@ import {
 import { ToasterService } from 'angular2-toaster';
 import { Angulartics2 } from 'angulartics2';
 
+import { DeviceType } from 'jslib/enums/deviceType';
+
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { LockService } from 'jslib/abstractions/lock.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
@@ -27,6 +29,7 @@ export class SettingsComponent implements OnInit {
     disableFavicons: boolean = false;
     enableMinToTray: boolean = false;
     enableTray: boolean = false;
+    showMinToTray: boolean = false;
     locale: string;
     lockOptions: any[];
     localeOptions: any[];
@@ -57,6 +60,7 @@ export class SettingsComponent implements OnInit {
     }
 
     async ngOnInit() {
+        this.showMinToTray = this.platformUtilsService.getDevice() === DeviceType.Windows;
         this.lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
         this.disableFavicons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
         this.enableMinToTray = await this.storageService.get<boolean>(ElectronConstants.enableMinimizeToTrayKey);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 7144ad43..0d40ef92 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1050,5 +1050,8 @@
   "showHide": {
     "message": "Show / Hide",
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
+  },
+  "hideToTray": {
+    "message": "Hide to Tray"
   }
 }
diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index 9162ee3b..fc14888c 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -38,7 +38,7 @@ export class MenuMain extends BaseMenu {
     unlockedRequiredMenuItems: MenuItem[] = [];
 
     constructor(private main: Main) {
-        super(main.i18nService, main.windowMain, 'Bitwarden', () => this.main.messagingService.send('logout'));
+        super(main.i18nService, main.windowMain);
     }
 
     init() {
@@ -135,7 +135,24 @@ export class MenuMain extends BaseMenu {
                 },
             },
             { type: 'separator' },
-            this.logOutMenuItemOptions,
+            {
+                label: this.i18nService.t('logOut'),
+                id: 'logOut',
+                click: () => {
+                    const result = dialog.showMessageBox(this.windowMain.win, {
+                        title: this.i18nService.t('logOut'),
+                        message: this.i18nService.t('logOut'),
+                        detail: this.i18nService.t('logOutConfirmation'),
+                        buttons: [this.i18nService.t('logOut'), this.i18nService.t('cancel')],
+                        cancelId: 1,
+                        defaultId: 0,
+                        noLink: true,
+                    });
+                    if (result === 0) {
+                        this.main.messagingService.send('logout');
+                    }
+                },
+            },
         ];
 
         if (!isMacAppStore() && !isWindowsStore()) {
@@ -369,7 +386,7 @@ export class MenuMain extends BaseMenu {
             }
 
             template.unshift({
-                label: this.appName,
+                label: 'Bitwarden',
                 submenu: firstMenuPart.concat(firstMenuOptions, [
                     { type: 'separator' },
                 ], this.macAppMenuItemOptions),
@@ -391,12 +408,38 @@ export class MenuMain extends BaseMenu {
                 aboutMenuAdditions.push(updateMenuItem);
             }
 
-            aboutMenuAdditions.push(this.aboutMenuItemOptions);
+            aboutMenuAdditions.push({
+                label: this.i18nService.t('aboutBitwarden'),
+                click: () => {
+                    const aboutInformation = this.i18nService.t('version', app.getVersion()) +
+                        '\nShell ' + process.versions.electron +
+                        '\nRenderer ' + process.versions.chrome +
+                        '\nNode ' + process.versions.node +
+                        '\nArchitecture ' + process.arch;
+                    const result = dialog.showMessageBox(this.windowMain.win, {
+                        title: 'Bitwarden',
+                        message: 'Bitwarden',
+                        detail: aboutInformation,
+                        type: 'info',
+                        noLink: true,
+                        buttons: [this.i18nService.t('ok'), this.i18nService.t('copy')],
+                    });
+                    if (result === 1) {
+                        clipboard.writeText(aboutInformation);
+                    }
+                },
+            });
 
             template[template.length - 1].submenu =
                 (template[template.length - 1].submenu as MenuItemConstructorOptions[]).concat(aboutMenuAdditions);
         }
 
+        (template[template.length - 2].submenu as MenuItemConstructorOptions[]).splice(1, 0, {
+            label: this.main.i18nService.t('hideToTray'),
+            click: () => this.main.messagingService.send('hideToTray'),
+            accelerator: 'CmdOrCtrl+Shift+M',
+        });
+
         this.menu = Menu.buildFromTemplate(template);
         Menu.setApplicationMenu(this.menu);
     }