diff --git a/src/vorta/tray_menu.py b/src/vorta/tray_menu.py
index 8f91a2fb..c524d87f 100644
--- a/src/vorta/tray_menu.py
+++ b/src/vorta/tray_menu.py
@@ -25,6 +25,11 @@ class TrayMenu(QSystemTrayIcon):
         menu = self.contextMenu()
         menu.clear()
 
+        open_action = menu.addAction(self.tr('Vorta for Borg Backup'))
+        open_action.triggered.connect(self.app.open_main_window_action)
+
+        menu.addSeparator()
+
         status = menu.addAction(self.app.scheduler.next_job)
         status.setEnabled(False)
 
@@ -45,10 +50,7 @@ class TrayMenu(QSystemTrayIcon):
                 profile_menu = menu.addAction(self.tr('Backup Now'))
                 profile_menu.triggered.connect(lambda state, i=profile.id: self.app.create_backup_action(i))
 
-        settings_action = menu.addAction(self.tr('Settings'))
-        settings_action.triggered.connect(self.app.open_main_window_action)
-
         menu.addSeparator()
 
-        exit_action = menu.addAction(self.tr('Exit'))
+        exit_action = menu.addAction(self.tr('Quit'))
         exit_action.triggered.connect(self.app.quit)
diff --git a/src/vorta/views/main_window.py b/src/vorta/views/main_window.py
index 84fb1925..7c959182 100644
--- a/src/vorta/views/main_window.py
+++ b/src/vorta/views/main_window.py
@@ -2,7 +2,6 @@ import sys
 from PyQt5.QtWidgets import QShortcut
 from PyQt5 import uic, QtCore
 from PyQt5.QtGui import QKeySequence
-from ..config import APP_NAME
 from .repo_tab import RepoTab
 from .source_tab import SourceTab
 from .archive_tab import ArchiveTab
@@ -22,7 +21,7 @@ class MainWindow(MainWindowBase, MainWindowUI):
     def __init__(self, parent=None):
         super().__init__()
         self.setupUi(self)
-        self.setWindowTitle(APP_NAME)
+        self.setWindowTitle('Vorta for Borg Backup')
         self.app = parent
         self.current_profile = BackupProfileModel.select().order_by('id').first()
         self.setWindowFlags(QtCore.Qt.WindowCloseButtonHint | QtCore.Qt.WindowMinimizeButtonHint)