From c875cb06d0badfb945a1784e90be2ee8fca0b7e1 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Wed, 8 Sep 2021 04:38:56 +0530
Subject: refactor: merge common i18n strings [skip ci]

---
 src/components/layout/Sidebar.js                   |   7 +-
 src/components/services/tabs/TabItem.js            |   6 +-
 .../settings/navigation/SettingsNavigation.js      |   7 +-
 .../settings/settings/EditSettingsForm.js          |   6 +-
 src/i18n/globalMessages.js                         |   8 +
 src/i18n/locales/af.json                           |   7 +-
 src/i18n/locales/ar.json                           |   7 +-
 src/i18n/locales/be.json                           |   7 +-
 src/i18n/locales/bg.json                           |   7 +-
 src/i18n/locales/bs.json                           |   7 +-
 src/i18n/locales/ca.json                           |   7 +-
 src/i18n/locales/cs.json                           |   7 +-
 src/i18n/locales/da.json                           |   7 +-
 src/i18n/locales/de.json                           |   7 +-
 src/i18n/locales/defaultMessages.json              | 415 ++++++++++-----------
 src/i18n/locales/el.json                           |   7 +-
 src/i18n/locales/en-US.json                        |   7 +-
 src/i18n/locales/es.json                           |   7 +-
 src/i18n/locales/et.json                           |   7 +-
 src/i18n/locales/fa.json                           |   7 +-
 src/i18n/locales/fi.json                           |   7 +-
 src/i18n/locales/fil.json                          |   7 +-
 src/i18n/locales/fr.json                           |   7 +-
 src/i18n/locales/ga.json                           |   7 +-
 src/i18n/locales/he.json                           |   7 +-
 src/i18n/locales/hi.json                           |   7 +-
 src/i18n/locales/hr.json                           |   7 +-
 src/i18n/locales/hu.json                           |   7 +-
 src/i18n/locales/id.json                           |   7 +-
 src/i18n/locales/it.json                           |   7 +-
 src/i18n/locales/ja.json                           |   7 +-
 src/i18n/locales/ka.json                           |   7 +-
 src/i18n/locales/kk.json                           |   7 +-
 src/i18n/locales/ko.json                           |   7 +-
 src/i18n/locales/ms.json                           |   7 +-
 src/i18n/locales/nb.json                           | 208 +++++------
 src/i18n/locales/nl-BE.json                        |   7 +-
 src/i18n/locales/nl.json                           |   7 +-
 src/i18n/locales/no.json                           |   7 +-
 src/i18n/locales/pl.json                           |   7 +-
 src/i18n/locales/pt-BR.json                        |   7 +-
 src/i18n/locales/pt.json                           |   7 +-
 src/i18n/locales/ro.json                           |   7 +-
 src/i18n/locales/ru.json                           |   7 +-
 src/i18n/locales/si.json                           |   7 +-
 src/i18n/locales/sk.json                           |   7 +-
 src/i18n/locales/sl.json                           |   7 +-
 src/i18n/locales/sq.json                           |   7 +-
 src/i18n/locales/sr.json                           |   7 +-
 src/i18n/locales/sv.json                           |   7 +-
 src/i18n/locales/te.json                           |   7 +-
 src/i18n/locales/tr.json                           |   7 +-
 src/i18n/locales/uk.json                           |   7 +-
 src/i18n/locales/vi.json                           |   7 +-
 src/i18n/locales/zh-CN.json                        |   9 +-
 src/i18n/locales/zh-HANS.json                      |   7 +-
 src/i18n/locales/zh-HANT.json                      |   7 +-
 src/i18n/locales/zh-TW.json                        |   9 +-
 src/i18n/locales/zh.json                           |   7 +-
 .../messages/src/components/layout/Sidebar.json    |  45 +--
 .../src/components/services/tabs/TabItem.json      |  61 ++-
 .../settings/navigation/SettingsNavigation.json    |  39 +-
 .../settings/settings/EditSettingsForm.json        | 149 ++++----
 src/i18n/messages/src/i18n/globalMessages.json     |  26 ++
 src/i18n/messages/src/lib/Menu.json                |  93 ++---
 src/lib/Menu.js                                    |   6 +-
 66 files changed, 599 insertions(+), 845 deletions(-)

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 935966764..1ee7733b9 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -12,12 +12,9 @@ import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
-  settings: {
-    id: 'sidebar.settings',
-    defaultMessage: '!!!Settings',
-  },
   addNewService: {
     id: 'sidebar.addNewService',
     defaultMessage: '!!!Add new service',
@@ -215,7 +212,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           type="button"
           onClick={() => openSettings({ path: 'app' })}
           className="sidebar__button sidebar__button--settings"
-          data-tip={`${intl.formatMessage(messages.settings)} (${settingsShortcutKey(false)})`}
+          data-tip={`${intl.formatMessage(globalMessages.settings)} (${settingsShortcutKey(false)})`}
         >
           <i className="mdi mdi-cog" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index d59cbe228..e5892be5d 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -22,10 +22,6 @@ const messages = defineMessages({
     id: 'tabs.item.reload',
     defaultMessage: '!!!Reload',
   },
-  edit: {
-    id: 'tabs.item.edit',
-    defaultMessage: '!!!Edit',
-  },
   disableNotifications: {
     id: 'tabs.item.disableNotifications',
     defaultMessage: '!!!Disable notifications',
@@ -205,7 +201,7 @@ class TabItem extends Component {
         accelerator: `${cmdOrCtrlShortcutKey()}+R`,
       },
       {
-        label: intl.formatMessage(messages.edit),
+        label: intl.formatMessage(globalMessages.edit),
         click: () =>
           openSettings({
             path: `services/edit/${service.id}`,
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 02cae6b69..0a5ace586 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -10,6 +10,7 @@ import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
   availableServices: {
@@ -32,10 +33,6 @@ const messages = defineMessages({
     id: 'settings.navigation.team',
     defaultMessage: '!!!Manage Team',
   },
-  settings: {
-    id: 'settings.navigation.settings',
-    defaultMessage: '!!!Settings',
-  },
   supportFerdi: {
     id: 'settings.navigation.supportFerdi',
     defaultMessage: '!!!About Ferdi',
@@ -159,7 +156,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           className="settings-navigation__link"
           activeClassName="is-active"
         >
-          {intl.formatMessage(messages.settings)}
+          {intl.formatMessage(globalMessages.settings)}
         </Link>
         <Link
           to="/settings/support"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 3d135a048..6a919b902 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,10 +18,6 @@ import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
-  headline: {
-    id: 'settings.app.headline',
-    defaultMessage: '!!!Settings',
-  },
   headlineGeneral: {
     id: 'settings.app.headlineGeneral',
     defaultMessage: '!!!General',
@@ -275,7 +271,7 @@ export default @observer class EditSettingsForm extends Component {
     return (
       <div className="settings__main">
         <div className="settings__header">
-          <h1>{intl.formatMessage(messages.headline)}</h1>
+          <h1>{intl.formatMessage(globalMessages.settings)}</h1>
         </div>
         <div className="settings__body">
           <form
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 1cebbddf0..66fce8d0f 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -66,4 +66,12 @@ export default defineMessages({
     defaultMessage:
       '!!!Do you really want to quit Ferdi?',
   },
+  settings: {
+    id: 'global.settings',
+    defaultMessage: '!!!Settings',
+  },
+  edit: {
+    id: 'global.edit',
+    defaultMessage: '!!!Edit',
+  },
 });
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 4cb145cb2..2c145d6f4 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 60be02ce0..ae2952f86 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "تبديل سريع",
   "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
   "global.cancel": "إلغاء",
+  "global.edit": "تعديل",
   "global.no": "No",
   "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
   "global.ok": "Ok",
   "global.quit": "خروج",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "الإعدادات",
   "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
   "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
   "global.spellchecking.autodetect.short": "تلقائي",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "التحقق من وجود تحديثات",
   "menu.app.hide": "إخفاء",
   "menu.app.hideOthers": "إخفاء الآخرين",
-  "menu.app.settings": "الإعدادات",
   "menu.app.unhide": "إظهار",
   "menu.edit": "تعديل",
   "menu.edit.copy": "نسخ",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي",
   "settings.app.form.useVerticalStyle": "استخدام النمط الأفقي",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "الإعدادات",
   "settings.app.headlineAdvanced": "متقدم",
   "settings.app.headlineAppearance": "المظهر",
   "settings.app.headlineGeneral": "عام",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "الحساب",
   "settings.navigation.availableServices": "الخدمات المتاحة",
   "settings.navigation.logout": "تسجيل خروج",
-  "settings.navigation.settings": "الإعدادات",
   "settings.navigation.supportFerdi": "حول فردي",
   "settings.navigation.team": "إدارة الفريق",
   "settings.navigation.yourServices": "خدماتك",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "تعطيل الإشعارات والصوت",
   "sidebar.openTodosDrawer": "فتح Todos فيردي",
   "sidebar.openWorkspaceDrawer": "فتحُ دُرجِ مساحة العمل",
-  "sidebar.settings": "الإعدادات",
   "sidebar.unmuteApp": "تمكين الإشعارات والصوت",
   "signup.email.label": "البريد الإلكتروني",
   "signup.emailDuplicate": "مستخدم بهذا البريد الإلكتروني موجود بالفعل",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "تعطيل الإشعارات",
   "tabs.item.disableService": "تعطيل الخدمة",
-  "tabs.item.edit": "تعديل",
   "tabs.item.enableAudio": "تمكين الصوت",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "تفعيل الإشعارات",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 0f0a02fe6..31a5111a9 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/bg.json b/src/i18n/locales/bg.json
index 14f2b1e7f..f62a5ffb9 100644
--- a/src/i18n/locales/bg.json
+++ b/src/i18n/locales/bg.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Няма връзка с онлайн услугите на Франц",
+  "global.edit": "Редакция",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Не сте свързани към интернет",
   "global.quit": "Изход",
+  "global.settings": "Настройки",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Проверка за обновления",
   "menu.app.hide": "Скрий",
   "menu.app.hideOthers": "Скрий другите",
-  "menu.app.settings": "Настройки",
   "menu.app.unhide": "Покажи",
   "menu.edit": "Редактиране",
   "menu.edit.copy": "Копирай",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Дръж Франж влючен в задния план когато прозореца е затворен",
   "settings.app.form.showDisabledServices": "Покажи панели на изключени услуги",
   "settings.app.form.showMessagesBadgesWhenMuted": "Покажи непрочетени съобщения когато известията са изключени",
-  "settings.app.headline": "Настройки",
   "settings.app.headlineAdvanced": "Допълнителни",
   "settings.app.headlineAppearance": "Изглед",
   "settings.app.headlineGeneral": "Общи",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Налични услуги",
   "settings.navigation.inviteFriends": "Поканете приятели",
   "settings.navigation.logout": "Изход",
-  "settings.navigation.settings": "Настройки",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Вашите услуги",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Дезактивирай известията и звуците",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Настройки",
   "sidebar.unmuteApp": "Активирай известията и звуците",
   "signup.email.label": "Адрес на ел. поща:",
   "signup.emailDuplicate": "Вече съществува потребител с този имейл адрес",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Изключване на звука",
   "tabs.item.disableNotifications": "Изключване на известията",
   "tabs.item.disableService": "Спиране на услугата",
-  "tabs.item.edit": "Редакция",
   "tabs.item.enableAudio": "Включване на звука",
   "tabs.item.enableNotification": "Включване на известяванията",
   "tabs.item.enableService": "Разрешаване на услугата",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 4cb145cb2..2c145d6f4 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 142a40f60..3cb52af9b 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
   "global.cancel": "Cancel·la",
+  "global.edit": "Edita",
   "global.no": "No",
   "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Configuració",
   "global.spellchecker.useDefault": "Utilitzar el predeterminat del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar l'idioma automàticament",
   "global.spellchecking.autodetect.short": "Automàtic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Comprova si hi ha actualitzacions",
   "menu.app.hide": "Amaga",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Configuració",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edita",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Configuració",
   "settings.app.headlineAdvanced": "Avançat",
   "settings.app.headlineAppearance": "Aparença",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Compte",
   "settings.navigation.availableServices": "Serveis disponibles",
   "settings.navigation.logout": "Sortir",
-  "settings.navigation.settings": "Configuració",
   "settings.navigation.supportFerdi": "Sobre Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Els vostres serveis",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Desactivar notificacions i àudio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
-  "sidebar.settings": "Configuració",
   "sidebar.unmuteApp": "Activar notificacions i àudio",
   "signup.email.label": "Correu electrònic",
   "signup.emailDuplicate": "Ja existeix un usuari amb aquesta adreça de correu electrònic",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactiva les notificacions",
   "tabs.item.disableService": "Desactiva el servei",
-  "tabs.item.edit": "Edita",
   "tabs.item.enableAudio": "Activa l'àudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activa les notificacions",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 81c2605da..1a82d3016 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nemůžeme připojit Ferdi k online službám",
   "global.cancel": "Zrušit",
+  "global.edit": "Upravit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Nastavení",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznat jazyk",
   "global.spellchecking.autodetect.short": "Automaticky",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Zkontrolovat aktualizace",
   "menu.app.hide": "Skrýt",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Nastavení",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Upravit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Nastavení",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhled",
   "settings.app.headlineGeneral": "Obecné",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Účet",
   "settings.navigation.availableServices": "Dostupné služby",
   "settings.navigation.logout": "Odhlásit",
-  "settings.navigation.settings": "Nastavení",
   "settings.navigation.supportFerdi": "O aplikaci",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše služby",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Vypnout upozornění a zvuky",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Nastavení",
   "sidebar.unmuteApp": "Zapnout upozornění a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Uživatel s touto emailovou adresou již existuje",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázat upozornění",
   "tabs.item.disableService": "Zakázat službu",
-  "tabs.item.edit": "Upravit",
   "tabs.item.enableAudio": "Zapnout zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povolit upozornění",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 11b3c7a45..992991c4b 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Hurtigskift",
   "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
   "global.cancel": "Annuller",
+  "global.edit": "Rediger",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Indstillinger",
   "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
   "global.spellchecking.autodetect": "Vælg sprog automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Søg efter opdateringer",
   "menu.app.hide": "Skjul",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Indstillinger",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Indstillinger",
   "settings.app.headlineAdvanced": "Avanceret",
   "settings.app.headlineAppearance": "Udseende",
   "settings.app.headlineGeneral": "Generelt",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tilgængelige tjenester",
   "settings.navigation.logout": "Log ud",
-  "settings.navigation.settings": "Indstillinger",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Administrer Team",
   "settings.navigation.yourServices": "Dine tjenester",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Deaktiver notifikationer og lyd",
   "sidebar.openTodosDrawer": "Åbn Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Åbn arbejdsrumspanel",
-  "sidebar.settings": "Indstillinger",
   "sidebar.unmuteApp": "Aktiver notifikationer og lyd",
   "signup.email.label": "Mailadresse",
   "signup.emailDuplicate": "Der findes allerede en bruger med den mailadresse",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver notifikationer",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver notifikationer",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 9226527b5..1deee8e54 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Schnellauswahl",
   "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
   "global.cancel": "Abbrechen",
+  "global.edit": "Bearbeiten",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Einstellungen",
   "global.spellchecker.useDefault": "Standard benutzen ({default})",
   "global.spellchecking.autodetect": "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Nach Updates suchen",
   "menu.app.hide": "Ausblenden",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Einstellungen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bearbeiten",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Einstellungen",
   "settings.app.headlineAdvanced": "Erweitert",
   "settings.app.headlineAppearance": "Darstellung",
   "settings.app.headlineGeneral": "Allgemeines",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Verfügbare Dienste",
   "settings.navigation.logout": "Abmelden",
-  "settings.navigation.settings": "Einstellungen",
   "settings.navigation.supportFerdi": "Über Ferdi",
   "settings.navigation.team": "Team verwalten",
   "settings.navigation.yourServices": "Deine Dienste",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Benachrichtigungen & Audio deaktivieren",
   "sidebar.openTodosDrawer": "Ferdi Todos öffnen",
   "sidebar.openWorkspaceDrawer": "Workspaces schließen",
-  "sidebar.settings": "Einstellungen",
   "sidebar.unmuteApp": "Benachrichtigungen & Audio aktivieren",
   "signup.email.label": "E-Mail-Adresse",
   "signup.emailDuplicate": "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
   "tabs.item.disableService": "Dienst deaktivieren",
-  "tabs.item.edit": "Bearbeiten",
   "tabs.item.enableAudio": "Audio aktivieren",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 0ad4517bd..7624168ba 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1062,121 +1062,108 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.settings",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
-      },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 21
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 21
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 25
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 25
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 29
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 33
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 33
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 37
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 37
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Open Ferdi Todos",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 41
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 41
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi Todos",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 45
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 45
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Lock Ferdi",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 49
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.lockFerdi",
         "start": {
           "column": 13,
-          "line": 49
+          "line": 46
         }
       }
     ],
@@ -1679,173 +1666,160 @@
           "line": 21
         }
       },
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.edit",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      },
       {
         "defaultMessage": "!!!Disable notifications",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 28
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableNotifications",
         "start": {
           "column": 24,
-          "line": 29
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Enable notifications",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 32
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableNotification",
         "start": {
           "column": 23,
-          "line": 33
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Disable audio",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 36
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableAudio",
         "start": {
           "column": 16,
-          "line": 37
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Enable audio",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 40
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableAudio",
         "start": {
           "column": 15,
-          "line": 41
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Enable Dark mode",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 44
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableDarkMode",
         "start": {
           "column": 18,
-          "line": 45
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Disable Dark mode",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 48
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableDarkMode",
         "start": {
           "column": 19,
-          "line": 49
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Disable Service",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 52
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.disableService",
         "start": {
           "column": 18,
-          "line": 53
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Enable Service",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 56
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.enableService",
         "start": {
           "column": 17,
-          "line": 57
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Hibernate Service",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 60
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.hibernateService",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Wake Up Service",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 64
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.wakeUpService",
         "start": {
           "column": 17,
-          "line": 65
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Delete Service",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 68
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.deleteService",
         "start": {
           "column": 17,
-          "line": 69
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 73
         },
         "file": "src/components/services/tabs/TabItem.js",
         "id": "tabs.item.confirmDeleteService",
         "start": {
           "column": 24,
-          "line": 73
+          "line": 69
         }
       }
     ],
@@ -2018,104 +1992,91 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 19
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 15
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 23
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 19
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 27
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourWorkspaces",
         "start": {
           "column": 18,
-          "line": 23
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 31
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 27
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Manage Team",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.team",
         "start": {
           "column": 8,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.settings",
-        "start": {
-          "column": 12,
-          "line": 35
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!About Ferdi",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 39
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.supportFerdi",
         "start": {
           "column": 16,
-          "line": 39
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 43
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 43
+          "line": 40
         }
       }
     ],
@@ -2863,459 +2824,446 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headline",
-        "start": {
-          "column": 12,
-          "line": 21
-        }
-      },
       {
         "defaultMessage": "!!!General",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 24
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineGeneral",
         "start": {
           "column": 19,
-          "line": 25
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 28
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.sentryInfo",
         "start": {
           "column": 14,
-          "line": 29
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
         "end": {
           "column": 3,
-          "line": 36
+          "line": 32
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.hibernateInfo",
         "start": {
           "column": 17,
-          "line": 33
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
         "end": {
           "column": 3,
-          "line": 40
+          "line": 36
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.inactivityLockInfo",
         "start": {
           "column": 22,
-          "line": 37
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 40
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.todoServerInfo",
         "start": {
           "column": 18,
-          "line": 41
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 44
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPassword",
         "start": {
           "column": 18,
-          "line": 45
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 48
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockedPasswordInfo",
         "start": {
           "column": 22,
-          "line": 49
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
         "end": {
           "column": 3,
-          "line": 56
+          "line": 52
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.lockInfo",
         "start": {
           "column": 12,
-          "line": 53
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
         "end": {
           "column": 3,
-          "line": 60
+          "line": 56
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDTimeInfo",
         "start": {
           "column": 24,
-          "line": 57
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
         "end": {
           "column": 3,
-          "line": 64
+          "line": 60
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.scheduledDNDInfo",
         "start": {
           "column": 20,
-          "line": 61
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 68
+          "line": 64
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineLanguage",
         "start": {
           "column": 20,
-          "line": 65
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Updates",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 68
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineUpdates",
         "start": {
           "column": 19,
-          "line": 69
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Appearance",
         "end": {
           "column": 3,
-          "line": 76
+          "line": 72
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAppearance",
         "start": {
           "column": 22,
-          "line": 73
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
         "end": {
           "column": 3,
-          "line": 80
+          "line": 76
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.universalDarkModeInfo",
         "start": {
           "column": 25,
-          "line": 77
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
         "end": {
           "column": 3,
-          "line": 84
+          "line": 80
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.accentColorInfo",
         "start": {
           "column": 19,
-          "line": 81
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Privacy",
         "end": {
           "column": 3,
-          "line": 88
+          "line": 84
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlinePrivacy",
         "start": {
           "column": 19,
-          "line": 85
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Advanced",
         "end": {
           "column": 3,
-          "line": 92
+          "line": 88
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.headlineAdvanced",
         "start": {
           "column": 20,
-          "line": 89
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Help us to translate Ferdi into your language.",
         "end": {
           "column": 3,
-          "line": 96
+          "line": 92
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.translationHelp",
         "start": {
           "column": 19,
-          "line": 93
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 96
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.spellCheckerLanguageInfo",
         "start": {
           "column": 28,
-          "line": 97
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Cache",
         "end": {
           "column": 3,
-          "line": 104
+          "line": 100
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineCache",
         "start": {
           "column": 20,
-          "line": 101
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
         "end": {
           "column": 3,
-          "line": 108
+          "line": 104
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheInfo",
         "start": {
           "column": 13,
-          "line": 105
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Couldn't clear all cache",
         "end": {
           "column": 3,
-          "line": 112
+          "line": 108
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.cacheNotCleared",
         "start": {
           "column": 19,
-          "line": 109
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Clear cache",
         "end": {
           "column": 3,
-          "line": 116
+          "line": 112
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonClearAllCache",
         "start": {
           "column": 23,
-          "line": 113
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!Ferdi Profile",
         "end": {
           "column": 3,
-          "line": 120
+          "line": 116
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.subheadlineFerdiProfile",
         "start": {
           "column": 27,
-          "line": 117
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Open Profile folder",
         "end": {
           "column": 3,
-          "line": 124
+          "line": 120
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonOpenFerdiProfileFolder",
         "start": {
           "column": 32,
-          "line": 121
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Open Service Recipes folder",
         "end": {
           "column": 3,
-          "line": 128
+          "line": 124
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
         "start": {
           "column": 39,
-          "line": 125
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 132
+          "line": 128
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonSearchForUpdate",
         "start": {
           "column": 25,
-          "line": 129
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 136
+          "line": 132
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 133
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Is searching for update",
         "end": {
           "column": 3,
-          "line": 140
+          "line": 136
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusSearching",
         "start": {
           "column": 25,
-          "line": 137
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!Update available, downloading...",
         "end": {
           "column": 3,
-          "line": 144
+          "line": 140
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusAvailable",
         "start": {
           "column": 25,
-          "line": 141
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!You are using the latest version of Ferdi",
         "end": {
           "column": 3,
-          "line": 148
+          "line": 144
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.updateStatusUpToDate",
         "start": {
           "column": 24,
-          "line": 145
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Current version:",
         "end": {
           "column": 3,
-          "line": 152
+          "line": 148
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.currentVersion",
         "start": {
           "column": 18,
-          "line": 149
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Changes require restart",
         "end": {
           "column": 3,
-          "line": 156
+          "line": 152
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.restartRequired",
         "start": {
           "column": 22,
-          "line": 153
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
         "end": {
           "column": 3,
-          "line": 160
+          "line": 156
         },
         "file": "src/components/settings/settings/EditSettingsForm.js",
         "id": "settings.app.languageDisclaimer",
         "start": {
           "column": 22,
-          "line": 157
+          "line": 153
         }
       }
     ],
@@ -5966,6 +5914,32 @@
           "column": 20,
           "line": 64
         }
+      },
+      {
+        "defaultMessage": "!!!Settings",
+        "end": {
+          "column": 3,
+          "line": 72
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.settings",
+        "start": {
+          "column": 12,
+          "line": 69
+        }
+      },
+      {
+        "defaultMessage": "!!!Edit",
+        "end": {
+          "column": 3,
+          "line": 76
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.edit",
+        "start": {
+          "column": 8,
+          "line": 73
+        }
       }
     ],
     "path": "src/i18n/globalMessages.json"
@@ -6622,277 +6596,264 @@
           "line": 230
         }
       },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 237
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.settings",
-        "start": {
-          "column": 12,
-          "line": 234
-        }
-      },
       {
         "defaultMessage": "!!!Check for updates",
         "end": {
           "column": 3,
-          "line": 241
+          "line": 237
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.checkForUpdates",
         "start": {
           "column": 19,
-          "line": 238
+          "line": 234
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 245
+          "line": 241
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 242
+          "line": 238
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 249
+          "line": 245
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 246
+          "line": 242
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 253
+          "line": 249
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 250
+          "line": 246
         }
       },
       {
         "defaultMessage": "!!!Auto-hide menu bar",
         "end": {
           "column": 3,
-          "line": 257
+          "line": 253
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.autohideMenuBar",
         "start": {
           "column": 19,
-          "line": 254
+          "line": 250
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 261
+          "line": 257
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 258
+          "line": 254
         }
       },
       {
         "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
-          "line": 265
+          "line": 261
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.addNewWorkspace",
         "start": {
           "column": 19,
-          "line": 262
+          "line": 258
         }
       },
       {
         "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
-          "line": 269
+          "line": 265
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
-          "line": 266
+          "line": 262
         }
       },
       {
         "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
-          "line": 273
+          "line": 269
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.closeWorkspaceDrawer",
         "start": {
           "column": 24,
-          "line": 270
+          "line": 266
         }
       },
       {
         "defaultMessage": "!!!Activate next service...",
         "end": {
           "column": 3,
-          "line": 277
+          "line": 273
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 274
+          "line": 270
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 281
+          "line": 277
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 278
+          "line": 274
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 285
+          "line": 281
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 282
+          "line": 278
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 289
+          "line": 285
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 286
+          "line": 282
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 293
+          "line": 289
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 290
+          "line": 286
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 297
+          "line": 293
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 294
+          "line": 290
         }
       },
       {
         "defaultMessage": "!!!Todos",
         "end": {
           "column": 3,
-          "line": 301
+          "line": 297
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos",
         "start": {
           "column": 9,
-          "line": 298
+          "line": 294
         }
       },
       {
         "defaultMessage": "!!!Open Todos drawer",
         "end": {
           "column": 3,
-          "line": 305
+          "line": 301
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.openTodosDrawer",
         "start": {
           "column": 19,
-          "line": 302
+          "line": 298
         }
       },
       {
         "defaultMessage": "!!!Close Todos drawer",
         "end": {
           "column": 3,
-          "line": 309
+          "line": 305
         },
         "file": "src/lib/Menu.js",
         "id": "menu.Todoss.closeTodosDrawer",
         "start": {
           "column": 20,
-          "line": 306
+          "line": 302
         }
       },
       {
         "defaultMessage": "!!!Enable Todos",
         "end": {
           "column": 3,
-          "line": 313
+          "line": 309
         },
         "file": "src/lib/Menu.js",
         "id": "menu.todos.enableTodos",
         "start": {
           "column": 15,
-          "line": 310
+          "line": 306
         }
       },
       {
         "defaultMessage": "!!!Home",
         "end": {
           "column": 3,
-          "line": 317
+          "line": 313
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.goHome",
         "start": {
           "column": 17,
-          "line": 314
+          "line": 310
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 73804c95d..6964a93f1 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Ferdi",
   "global.cancel": "Ακύρωση",
+  "global.edit": "Επεξεργασία",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Ρυθμίσεις",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Έλεγχος για ενημερώσεις",
   "menu.app.hide": "Απόκρυψη",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Ρυθμίσεις",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Επεξεργασία",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Ρυθμίσεις",
   "settings.app.headlineAdvanced": "Για προχωρημένους",
   "settings.app.headlineAppearance": "Εμφάνιση",
   "settings.app.headlineGeneral": "Γενικά",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Λογαριασμός",
   "settings.navigation.availableServices": "Διαθέσιμες υπηρεσίες",
   "settings.navigation.logout": "Αποσύνδεση",
-  "settings.navigation.settings": "Ρυθμίσεις",
   "settings.navigation.supportFerdi": "Σχετικά με το Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Οι υπηρεσίες σας",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Απενεργοποίηση ειδοποιήσεων & ήχου",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Ρυθμίσεις",
   "sidebar.unmuteApp": "Ενεργοποίηση ειδοποιήσεων & ήχου",
   "signup.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "signup.emailDuplicate": "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Απενεργοποίηση ειδοποιήσεων",
   "tabs.item.disableService": "Απενεργοποίηση υπηρεσίας",
-  "tabs.item.edit": "Επεξεργασία",
   "tabs.item.enableAudio": "Ενεργοποίηση ήχου",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 98f31f573..be9bbb961 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ae9efea05..9a5c248a2 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Cambiar rápidamente",
   "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi.",
   "global.cancel": "Cancelar",
+  "global.edit": "Editar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "No estás conectado a Internet",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Configuración",
   "global.spellchecker.useDefault": "Utilizar estándar del sistema ({default})",
   "global.spellchecking.autodetect": "Detectar el idioma automáticamente",
   "global.spellchecking.autodetect.short": "Automático",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Comprobar actualizaciones",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Configuración",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Configuración",
   "settings.app.headlineAdvanced": "Avanzado",
   "settings.app.headlineAppearance": "Apariencia",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Cuenta",
   "settings.navigation.availableServices": "Servicios disponibles",
   "settings.navigation.logout": "Cerrar sesión",
-  "settings.navigation.settings": "Configuración",
   "settings.navigation.supportFerdi": "Acerca de Ferdi",
   "settings.navigation.team": "Gestionar equipo",
   "settings.navigation.yourServices": "Tus servicios",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Desactivar notificaciones y sonido",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Abrir diseñador de espacios de trabajo",
-  "sidebar.settings": "Configuración",
   "sidebar.unmuteApp": "Activar notificaciones y sonido",
   "signup.email.label": "Dirección de correo electrónico",
   "signup.emailDuplicate": "Ya existe un usuario con esa dirección de correo electrónico",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desactivar notificaciones",
   "tabs.item.disableService": "Desactivar servicio",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Habilitar audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activar notificaciones",
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 64451b484..46c249768 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "Olen lisanud Ferdi'i {count} teenust! Hankige tasuta rakendus WhatsApp'ile, Messenger'ile, Slack'ile, Skype'ile ja muule veebiaadressilt www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Rääkige oma sõpradele ja kolleegidele, kui vinge Ferdi on, ja aidake meil seda sõna levitada.",
   "global.api.unhealthy": "Ups! Ferdi'i võrguteenustega ei saa ühendust luua",
+  "global.edit": "Muuda",
   "global.franzProRequired": "Vajalik Ferdi Professional tellimus",
   "global.notConnectedToTheInternet": "Teil pole Interneti-ühendust.",
   "global.quit": "Sulge",
+  "global.settings": "Sätted",
   "global.spellchecker.useDefault": "Kasuta süsteemi vaikeväärtust ({default})",
   "global.spellchecking.autodetect": "Tuvastage keel automaatselt",
   "global.spellchecking.autodetect.short": "Automaatne",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Kontrolli kas värskendused on saadaval",
   "menu.app.hide": "Peida",
   "menu.app.hideOthers": "Peida teised",
-  "menu.app.settings": "Sätted",
   "menu.app.unhide": "Näita",
   "menu.edit": "Muuda",
   "menu.edit.copy": "Kopeeri",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Hoia akna sulgemisel Ferdi taustal töös",
   "settings.app.form.showDisabledServices": "Kuva keelatud teenuste vahelehed",
   "settings.app.form.showMessagesBadgesWhenMuted": "Kuva lugemata sõnumimärk, kui teated on keelatud",
-  "settings.app.headline": "Sätted",
   "settings.app.headlineAdvanced": "Täpsemalt",
   "settings.app.headlineAppearance": "Välimus",
   "settings.app.headlineGeneral": "Üldine",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Saadaolevad teenused",
   "settings.navigation.inviteFriends": "Kutsu sõpru",
   "settings.navigation.logout": "Logi välja",
-  "settings.navigation.settings": "Sätted",
   "settings.navigation.team": "Halda meeskonda",
   "settings.navigation.yourServices": "Teie teenused",
   "settings.navigation.yourWorkspaces": "Teie tööruumid",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Keela teated ja heli",
   "sidebar.openTodosDrawer": "Ava Ferdi ülesanded",
   "sidebar.openWorkspaceDrawer": "Ava tööruumide sahtel",
-  "sidebar.settings": "Sätted",
   "sidebar.unmuteApp": "Luba teated ja heli",
   "signup.email.label": "E-posti aadress",
   "signup.emailDuplicate": "Selle e-posti aadressiga kasutaja on juba olemas",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Keela heli",
   "tabs.item.disableNotifications": "Keela teated",
   "tabs.item.disableService": "Keela teenus",
-  "tabs.item.edit": "Muuda",
   "tabs.item.enableAudio": "Luba heli",
   "tabs.item.enableNotification": "Luba teated",
   "tabs.item.enableService": "Luba teenus",
diff --git a/src/i18n/locales/fa.json b/src/i18n/locales/fa.json
index e8a92c0d9..be8b1be20 100644
--- a/src/i18n/locales/fa.json
+++ b/src/i18n/locales/fa.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "من {count} تا سرویس تو فرَنز اضافه کردم! برنامه رایگان برای واتسآپ، اسکایپ، مسنجر، اسلک رو از سایت www.getferdi.com دانلود کن /cc @FerdiMessenger",
   "feature.shareFranz.text": "به دوستات بگو فرَنز چقدر باحاله و بهمون کمک کن گسترش پیدا کنیم.",
   "global.api.unhealthy": "به سرویس های آنلاین فرَنز متصل نشدی",
+  "global.edit": "ویرایش",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "اینترنت وصل نیست",
   "global.quit": "خروج ",
+  "global.settings": "تنظیمات",
   "global.spellchecker.useDefault": "استفاده از پیشفرض سیستم ({default})",
   "global.spellchecking.autodetect": "تشخیص خودکار زبان",
   "global.spellchecking.autodetect.short": "خودکار",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "بررسی وجود نسخه جدید ",
   "menu.app.hide": "مخفی‌کردن ",
   "menu.app.hideOthers": "مخفی کردن بقیه ",
-  "menu.app.settings": "تنظیمات ",
   "menu.app.unhide": "آشکارسازی",
   "menu.edit": "ویرایش ",
   "menu.edit.copy": "کپی",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "فرانز را در پشت زمینه نگه دار زمانی که پنجره آن بسته میشود",
   "settings.app.form.showDisabledServices": "سرویس های غیرفعال را نشان بده ",
   "settings.app.form.showMessagesBadgesWhenMuted": "نماد پیام خوانده نشده را زمانی که نوتیفیکیشن ها غیرفعالند نشان بده",
-  "settings.app.headline": "تنظیمات ",
   "settings.app.headlineAdvanced": "پیشرفته ",
   "settings.app.headlineAppearance": "ظاهر ",
   "settings.app.headlineGeneral": "عمومی ",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "سرویس های موجود",
   "settings.navigation.inviteFriends": "دعوت دوستان",
   "settings.navigation.logout": "خروج از سیستم ",
-  "settings.navigation.settings": "تنظیمات ",
   "settings.navigation.team": "مدیریت گروه",
   "settings.navigation.yourServices": "سرویس های شما",
   "settings.navigation.yourWorkspaces": "فضای کاری شما",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "غیرفعال کردن اعلان ها و صدا",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "بازکردن کشوی فضای کاری",
-  "sidebar.settings": "تنظیمات",
   "sidebar.unmuteApp": "فعال سازی اعلان ها  و صدا",
   "signup.email.label": "نشانی ایمیل",
   "signup.emailDuplicate": "یک کاربر با این ایمیل هم اکنون موجود است.",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "غیرفعال کردن صدا",
   "tabs.item.disableNotifications": "غیر فعال کردن اعلان ها",
   "tabs.item.disableService": "غیر فعال کردن سرویس",
-  "tabs.item.edit": "ویرایش",
   "tabs.item.enableAudio": "فعال‌سازی صدا",
   "tabs.item.enableNotification": "فعال سازی اعلان‌ها",
   "tabs.item.enableService": "فعال سازی سرویس",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index c3a90b000..5ccea37e5 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Pikavalitsin",
   "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
   "global.cancel": "Peruuta",
+  "global.edit": "Muokkaa",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Asetukset",
   "global.spellchecker.useDefault": "Käytä järjestelmän oletusasetusta ({default})",
   "global.spellchecking.autodetect": "Tunnista kieli automaattisesti",
   "global.spellchecking.autodetect.short": "Automaattinen",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Tarkista päivitykset",
   "menu.app.hide": "Piilota",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Asetukset",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Muokkaa",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Asetukset",
   "settings.app.headlineAdvanced": "Lisäasetukset",
   "settings.app.headlineAppearance": "Ulkoasu",
   "settings.app.headlineGeneral": "Yleinen",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Tili",
   "settings.navigation.availableServices": "Käytettävissä olevat palvelut",
   "settings.navigation.logout": "Kirjaudu ulos",
-  "settings.navigation.settings": "Asetukset",
   "settings.navigation.supportFerdi": "Tietoja Ferdistä",
   "settings.navigation.team": "Hallinnoi tiimiä",
   "settings.navigation.yourServices": "Sinun palvelusi",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Poista ilmoitukset ja äänet käytöstä",
   "sidebar.openTodosDrawer": "Avaa Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Avaa työtilan valikko",
-  "sidebar.settings": "Asetukset",
   "sidebar.unmuteApp": "Käytä ilmoituksia ja ääniä",
   "signup.email.label": "Sähköpostiosoite",
   "signup.emailDuplicate": "Käyttäjä, jolla on tämä sähköpostiosoite, on jo olemassa",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Poista ilmoitukset käytöstä",
   "tabs.item.disableService": "Poista palvelu",
-  "tabs.item.edit": "Muokkaa",
   "tabs.item.enableAudio": "Ota ääni käyttöön",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ota ilmoitukset käyttöön",
diff --git a/src/i18n/locales/fil.json b/src/i18n/locales/fil.json
index bea3df34d..54326b84b 100644
--- a/src/i18n/locales/fil.json
+++ b/src/i18n/locales/fil.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Hindi maka connect sa 'Ferdi online services'",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Hindi ka naka connect sa internet.",
   "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email Address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 5e9004d37..d81d23d79 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Changement rapide",
   "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
   "global.cancel": "Annuler",
+  "global.edit": "Éditer",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Paramètres",
   "global.spellchecker.useDefault": "Par défaut ({default})",
   "global.spellchecking.autodetect": "Détecter automatiquement la langue",
   "global.spellchecking.autodetect.short": "Automatiquement",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Vérifier les mises à jour",
   "menu.app.hide": "Masquer",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Paramètres",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Éditer",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Paramètres",
   "settings.app.headlineAdvanced": "Paramètres avancés",
   "settings.app.headlineAppearance": "Apparence",
   "settings.app.headlineGeneral": "Général",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Compte",
   "settings.navigation.availableServices": "Services disponibles",
   "settings.navigation.logout": "Se déconnecter",
-  "settings.navigation.settings": "Paramètres",
   "settings.navigation.supportFerdi": "À propos de Ferdi",
   "settings.navigation.team": "Gérer l'équipe",
   "settings.navigation.yourServices": "Vos services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Désactiver les notifications et les sons",
   "sidebar.openTodosDrawer": "Ouvrir Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Ouvrir l'espace de travail",
-  "sidebar.settings": "Paramètres",
   "sidebar.unmuteApp": "Activer les notifications et les sons",
   "signup.email.label": "Adresse Email",
   "signup.emailDuplicate": "Cette adresse email est déjà utilisée",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Désactiver les notifications",
   "tabs.item.disableService": "Désactiver le service",
-  "tabs.item.edit": "Éditer",
   "tabs.item.enableAudio": "Activer l'audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Activer les notifications",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 693657094..a78c90771 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
   "global.cancel": "Cealaigh",
+  "global.edit": "Cuir in eagar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Socruithe",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Cuardaigh le nuashonruithe",
   "menu.app.hide": "Cuir Ferdi i bhfolach",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Socruithe",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Cuir in eagar",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Socruithe",
   "settings.app.headlineAdvanced": "Casta",
   "settings.app.headlineAppearance": "Dealramh",
   "settings.app.headlineGeneral": "Ginearálta",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Cuntas",
   "settings.navigation.availableServices": "Seirbhísí le fáil",
   "settings.navigation.logout": "Logáil amach",
-  "settings.navigation.settings": "Socruithe",
   "settings.navigation.supportFerdi": "Faoi Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Do sheirbhísí",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Díchumasaigh fógraí ⁊ fuaim",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Socruithe",
   "sidebar.unmuteApp": "Cumasaigh fógraí ⁊ fuaim",
   "signup.email.label": "Seoladh ríomhphoist",
   "signup.emailDuplicate": "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Díchumasaigh fógraí",
   "tabs.item.disableService": "Díchumasaigh seirbhís",
-  "tabs.item.edit": "Cuir in eagar",
   "tabs.item.enableAudio": "Cumasaigh fuaim",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Cumasaigh fógraí",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 1e74c3465..79e1532b5 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "החלפה מהירה",
   "global.api.unhealthy": "לא ניתן להתחבר לשרותי האינטרנת של Ferdi",
   "global.cancel": "בטל",
+  "global.edit": "ערוך",
   "global.no": "No",
   "global.notConnectedToTheInternet": "נראה שאתה לא מחובר לאינטרנט.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "הגדרות",
   "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
   "global.spellchecking.autodetect": "זהה שפה באופן אוטומטי",
   "global.spellchecking.autodetect.short": "אוטומטי",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "חפש עדכונים",
   "menu.app.hide": "הסתר",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "הגדרות",
   "menu.app.unhide": "Unhide",
   "menu.edit": "ערוך",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "הגדרות",
   "settings.app.headlineAdvanced": "מתקדם",
   "settings.app.headlineAppearance": "תצוגה",
   "settings.app.headlineGeneral": "כללי",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "חשבון",
   "settings.navigation.availableServices": "שירותים זמינים",
   "settings.navigation.logout": "התנתק",
-  "settings.navigation.settings": "הגדרות",
   "settings.navigation.supportFerdi": "אודות פרדי",
   "settings.navigation.team": "נהל צוות",
   "settings.navigation.yourServices": "השירותים שלך",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "כבה התראות ואודיו",
   "sidebar.openTodosDrawer": "פתח את המשימות של פרדי",
   "sidebar.openWorkspaceDrawer": "פתח את סרגל סביבות העבודה",
-  "sidebar.settings": "הגדרות",
   "sidebar.unmuteApp": "אפשר התראות ואודיו",
   "signup.email.label": "כתובת דוא\"ל",
   "signup.emailDuplicate": "כבר קיים חשבון עם כתובת דוא\"ל זו",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "כבה התראות",
   "tabs.item.disableService": "כבה שירות",
-  "tabs.item.edit": "ערוך",
   "tabs.item.enableAudio": "אפשר אודיו",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "אפשר התראות",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index 98f31f573..be9bbb961 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index a3b385add..f7e046ed9 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije se moguće povezati na Francove on-line servise. ",
   "global.cancel": "Odustani",
+  "global.edit": "Uredi",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Postavke",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Potraži ažuriranja",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Postavke",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Uredi",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
   "settings.app.headlineGeneral": "Općenito",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Korisnički račun",
   "settings.navigation.availableServices": "Dostupne usluge",
   "settings.navigation.logout": "Odjava",
-  "settings.navigation.settings": "Postavke",
   "settings.navigation.supportFerdi": "O aplikaciji",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše usluge",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Ugasi obavijesti i zvuk",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Postavke",
   "sidebar.unmuteApp": "Omogući obavijesti i zvuk",
   "signup.email.label": "Vaša e-adresa:",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
-  "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 4e6084ec7..84c8496b8 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Gyorsváltó",
   "global.api.unhealthy": "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
   "global.cancel": "Mégsem",
+  "global.edit": "Szerkesztés",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
   "global.ok": "Ok",
   "global.quit": "Kilépés",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Beállítások",
   "global.spellchecker.useDefault": "Rendszer alapbeállítás használata ({default})",
   "global.spellchecking.autodetect": "Automatikus nyelvdetektálás",
   "global.spellchecking.autodetect.short": "Automatikus",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Frissítések keresése",
   "menu.app.hide": "Elrejt",
   "menu.app.hideOthers": "Többi elrejtése",
-  "menu.app.settings": "Beállítások",
   "menu.app.unhide": "Megjelenít",
   "menu.edit": "Szerkesztés",
   "menu.edit.copy": "Másolás",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Beállítások",
   "settings.app.headlineAdvanced": "Haladó",
   "settings.app.headlineAppearance": "Megjelenés",
   "settings.app.headlineGeneral": "Általános",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Fiók",
   "settings.navigation.availableServices": "Elérhető szolgáltatások",
   "settings.navigation.logout": "Kijelentkezés",
-  "settings.navigation.settings": "Beállítások",
   "settings.navigation.supportFerdi": "Névjegy",
   "settings.navigation.team": "Csapat kezelése",
   "settings.navigation.yourServices": "Szolgáltatásaid",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Értesítések és hangok letiltása",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Munkaterület panel kinyitása",
-  "sidebar.settings": "Beállítások",
   "sidebar.unmuteApp": "Értesítések és hangok engedélyezése",
   "signup.email.label": "Email cím",
   "signup.emailDuplicate": "Ezzel az e-mail címmel már létezik felhasználó",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Sötét mód kikapcsolása",
   "tabs.item.disableNotifications": "Értesítések letiltása",
   "tabs.item.disableService": "Szolgáltatás letiltása",
-  "tabs.item.edit": "Szerkesztés",
   "tabs.item.enableAudio": "Hang engedélyezése",
   "tabs.item.enableDarkMode": "Sötét mód bekapcsolása",
   "tabs.item.enableNotification": "Értesítések engedélyezése",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 7220262b2..7a716a00c 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Tidak dapat tersambung ke layanan Ferdi",
   "global.cancel": "Batalkan",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Pengaturan",
   "global.spellchecker.useDefault": "Gunakan Bawaan Sistem ({default})",
   "global.spellchecking.autodetect": "Deteksi bahasa secara otomatis",
   "global.spellchecking.autodetect.short": "Otomatis",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Periksa versi baru",
   "menu.app.hide": "Sembunyikan",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Pengaturan",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Pengaturan",
   "settings.app.headlineAdvanced": "Tingkat Lanjut",
   "settings.app.headlineAppearance": "Tampilan",
   "settings.app.headlineGeneral": "Umum",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Akun",
   "settings.navigation.availableServices": "Layanan tersedia",
   "settings.navigation.logout": "Keluar",
-  "settings.navigation.settings": "Pengaturan",
   "settings.navigation.supportFerdi": "Tentang Ferdi",
   "settings.navigation.team": "Kelola Tim",
   "settings.navigation.yourServices": "Layanan Anda",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Nonaktifkan pemberitahuan & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Buka laci ruang kerja",
-  "sidebar.settings": "Pengaturan",
   "sidebar.unmuteApp": "Aktifkan pemberitahuan",
   "signup.email.label": "Alamat email",
   "signup.emailDuplicate": "Pengguna dengan alamat email ini sudah ada",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Nonaktifkan pemberitahuan",
   "tabs.item.disableService": "Nonaktifkan layanan",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Aktifkan audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktifkan pemberitahuan",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 523fc3de5..d5539aa30 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Cambio Veloce",
   "global.api.unhealthy": "Impossibile connettersi ai servizi online di Ferdi",
   "global.cancel": "Annulla",
+  "global.edit": "Modifica",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Impostazioni",
   "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
   "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
   "global.spellchecking.autodetect.short": "Automatico",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Controlla aggiornamenti",
   "menu.app.hide": "Nascondi",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Impostazioni",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Modifica",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Impostazioni",
   "settings.app.headlineAdvanced": "Avanzate",
   "settings.app.headlineAppearance": "Aspetto",
   "settings.app.headlineGeneral": "Generale",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Servizi disponibili",
   "settings.navigation.logout": "Esci",
-  "settings.navigation.settings": "Impostazioni",
   "settings.navigation.supportFerdi": "Info su Ferdi",
   "settings.navigation.team": "Gestisci il Team",
   "settings.navigation.yourServices": "I tuoi servizi",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disattiva notifiche e audio",
   "sidebar.openTodosDrawer": "Apri le Attività Ferdi",
   "sidebar.openWorkspaceDrawer": "Apri il menu dei workspace",
-  "sidebar.settings": "Impostazioni",
   "sidebar.unmuteApp": "Attiva notifiche e audio",
   "signup.email.label": "Indirizzo email",
   "signup.emailDuplicate": "Esiste già un utente con lo stesso indirizzo email",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disattiva notifiche",
   "tabs.item.disableService": "Disattiva servizio",
-  "tabs.item.edit": "Modifica",
   "tabs.item.enableAudio": "Attiva audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Attiva le notifiche",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 74dc1e601..118a2fb8e 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "クイックスイッチ",
   "global.api.unhealthy": "Ferdiのオンラインサービスに接続できません。",
   "global.cancel": "キャンセル",
+  "global.edit": "編集",
   "global.no": "No",
   "global.notConnectedToTheInternet": "インターネットに接続されていません。",
   "global.ok": "Ok",
   "global.quit": "終了",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "設定",
   "global.spellchecker.useDefault": "システムデフォルトを使用する({default})",
   "global.spellchecking.autodetect": "言語を自動的に検出する",
   "global.spellchecking.autodetect.short": "自動",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "更新の確認",
   "menu.app.hide": "隠す",
   "menu.app.hideOthers": "他を非表示",
-  "menu.app.settings": "設定",
   "menu.app.unhide": "再表示",
   "menu.edit": "編集",
   "menu.edit.copy": "コピー",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Touch IDを使用してFerdiのロックを解除する",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "起動方法",
-  "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "詳細",
   "settings.app.headlineAppearance": "表示スタイル",
   "settings.app.headlineGeneral": "一般",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "アカウント",
   "settings.navigation.availableServices": "利用可能なサービス",
   "settings.navigation.logout": "ログアウト",
-  "settings.navigation.settings": "設定",
   "settings.navigation.supportFerdi": "バージョン情報",
   "settings.navigation.team": "チームを管理",
   "settings.navigation.yourServices": "利用中のサービス",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "通知とオーディオを無効化",
   "sidebar.openTodosDrawer": "Ferdi ToDoを開く",
   "sidebar.openWorkspaceDrawer": "ワークスペースドロワーを開く",
-  "sidebar.settings": "設定",
   "sidebar.unmuteApp": "通知とオーディオを有効化",
   "signup.email.label": "メールアドレス",
   "signup.emailDuplicate": "このメールアドレスは既に登録されています",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "ダークモードを無効にする",
   "tabs.item.disableNotifications": "通知を無効にする",
   "tabs.item.disableService": "サービスを無効にする",
-  "tabs.item.edit": "編集",
   "tabs.item.enableAudio": "オーディオを有効にする",
   "tabs.item.enableDarkMode": "ダークモードを有効にする",
   "tabs.item.enableNotification": "通知を有効にする",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index e7668fd01..cc5a04aff 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
   "global.cancel": "გაუქმება",
+  "global.edit": "რედაქტირება",
   "global.no": "No",
   "global.notConnectedToTheInternet": "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "პარამეტრები",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "განახლებების შემოწმება",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "პარამეტრები",
   "menu.app.unhide": "Unhide",
   "menu.edit": "რედაქტირება",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "პარამეტრები",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "მთავარი",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "ანგარიში",
   "settings.navigation.availableServices": "ხელმისაწვდომი სერვისები",
   "settings.navigation.logout": "გასვლა",
-  "settings.navigation.settings": "პარამეტრები",
   "settings.navigation.supportFerdi": "Ferdi-ის შესახებ",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "თქვენი სერვისები",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "პარამეტრები",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "მეილი",
   "signup.emailDuplicate": "მომხმარებელი ამ მეილით უკვე არსებობს",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "შეტყობინებების გამორთვა",
   "tabs.item.disableService": "სერვისის გაუქმება",
-  "tabs.item.edit": "რედაქტირება",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "შეტყობინებების ჩართვა",
diff --git a/src/i18n/locales/kk.json b/src/i18n/locales/kk.json
index 5df9f8b05..9bb874e43 100644
--- a/src/i18n/locales/kk.json
+++ b/src/i18n/locales/kk.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 8f6f81b1f..dfbfd63a3 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "빠른 검색",
   "global.api.unhealthy": "Ferdi 온라인 서비스에 연결할 수 없습니다.",
   "global.cancel": "취소",
+  "global.edit": "편집",
   "global.no": "No",
   "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "설정",
   "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
   "global.spellchecking.autodetect": "언어 자동 탐색",
   "global.spellchecking.autodetect.short": "자동",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "업데이트 확인",
   "menu.app.hide": "숨기기",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "설정",
   "menu.app.unhide": "Unhide",
   "menu.edit": "편집",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "설정",
   "settings.app.headlineAdvanced": "고급",
   "settings.app.headlineAppearance": "모양",
   "settings.app.headlineGeneral": "일반",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "계정",
   "settings.navigation.availableServices": "사용가능 한 서비스",
   "settings.navigation.logout": "로그아웃",
-  "settings.navigation.settings": "설정",
   "settings.navigation.supportFerdi": "Ferdi에 대해",
   "settings.navigation.team": "팀 관리",
   "settings.navigation.yourServices": "서비스",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "알림 및 알림 소리 비활성화",
   "sidebar.openTodosDrawer": "Ferdi Todos 열기",
   "sidebar.openWorkspaceDrawer": "작업영역 서랍 열기",
-  "sidebar.settings": "설정",
   "sidebar.unmuteApp": "알림과 오디오 활성화",
   "signup.email.label": "이메일 주소",
   "signup.emailDuplicate": "해당 이메일을 가진 사용자가 이미 존재합니다",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "알림 비활성화",
   "tabs.item.disableService": "서비스 비활성화",
-  "tabs.item.edit": "편집",
   "tabs.item.enableAudio": "오디오 활성화",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "알림 허용",
diff --git a/src/i18n/locales/ms.json b/src/i18n/locales/ms.json
index 7ecd9af97..86e2aa9c5 100644
--- a/src/i18n/locales/ms.json
+++ b/src/i18n/locales/ms.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Beritahu rakan anda betapa hebatnya Ferdi dan bantu kami menyebarkan maklumat ini",
   "global.api.unhealthy": "Tidak dapat bersambung ke perkhidmatan dalam talian Ferdi",
+  "global.edit": "Ubahsuai",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "Anda tidak disambungkan ke internet.",
   "global.quit": "Keluar",
+  "global.settings": "Tetapan",
   "global.spellchecker.useDefault": "Gunakan System Default ({default})",
   "global.spellchecking.autodetect": "Kesan bahasa secara automatik",
   "global.spellchecking.autodetect.short": "Automatik",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Semak untuk kemaskini",
   "menu.app.hide": "Sorokkan",
   "menu.app.hideOthers": "Sorokkan yang lain-lain",
-  "menu.app.settings": "Tetapan",
   "menu.app.unhide": "Nyahsorok",
   "menu.edit": "Ubahsuai",
   "menu.edit.copy": "Salin",
@@ -178,7 +179,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Tetapan",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -196,7 +196,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Tetapan",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -302,7 +301,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Tetapan",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -319,7 +317,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Ubahsuai",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index 25d4c19d6..38bba58b2 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -1,144 +1,142 @@
 {
   "global.api.unhealthy": "Kan ikke koble til Ferdi' tjenester",
+  "global.edit": "Rediger",
   "global.notConnectedToTheInternet": "Du er ikke koblet til internett.",
+  "global.settings": "Innstillinger",
   "global.submit": "Send inn",
-  "welcome.signupButton": "Opprett en gratis konto",
-  "welcome.loginButton": "Logg inn til din konto",
-  "welcome.slogan": "Teksting som funker for deg",
-  "login.headline": "Logg inn",
+  "import.headline": "Importer dine Ferdi 4 tjenester",
+  "import.notSupportedHeadline": "Tjenester ikke enda støttet i Ferdi 5",
+  "import.skip.label": "Jeg vil legge til en tjeneste manuelt",
+  "import.submit.label": "Importer tjenester",
+  "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
+  "infobar.buttonReloadServices": "Oppdater tjenester",
+  "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
+  "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
+  "infobar.updateAvailable": "En ny oppdatering for Ferdi er tilgjengelig.",
+  "invite.email.label": "Email adresse",
+  "invite.headline.friends": "Inviter 3 av dine venner eller kolleger",
+  "invite.name.label": "Navn",
+  "invite.skip.label": "Jeg vil gjøre dette senere",
+  "invite.submit.label": "Send invitasjoner",
   "login.email.label": "Email adresse",
+  "login.headline": "Logg inn",
+  "login.invalidCredentials": "Ugyldig email eller passord",
+  "login.link.password": "Reset passord",
+  "login.link.signup": "Opprett en gratis konto",
   "login.password.label": "Passord",
+  "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.",
   "login.submit.label": "Logg inn",
-  "login.invalidCredentials": "Ugyldig email eller passord",
   "login.tokenExpired": "Din økt utløpte, vennligst logg inn igjen.",
-  "login.serverLogout": "Din økt utløpte, vennligst logg inn igjen.",
-  "login.link.signup": "Opprett en gratis konto",
-  "login.link.password": "Reset passord",
-  "password.headline": "Reset passord",
   "password.email.label": "Email adresse",
+  "password.headline": "Reset passord",
+  "password.link.login": "Logg inn til din konto",
+  "password.link.signup": "Opprett en gratis konto",
   "password.noUser": "Ingen bruker med den emailen finnes",
   "password.successInfo": "Vennligst sjekk din email",
-  "password.link.signup": "Opprett en gratis konto",
-  "password.link.login": "Logg inn til din konto",
-  "signup.headline": "Registrer deg",
-  "signup.firstname.label": "Fornavn",
-  "signup.lastname.label": "Etternavn",
-  "signup.email.label": "Email adresse",
-  "signup.company.label": "Firma",
-  "signup.password.label": "Passord",
-  "signup.submit.label": "Opprett konto",
-  "signup.link.login": "Har du allerede en konto? Logg inn",
-  "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede",
-  "signup.legal.info": "Ved å opprette en Ferdi konto aksepterer du",
-  "signup.legal.terms": "Vilkår for bruk",
-  "signup.legal.privacy": "Personvern",
   "pricing.headline": "Støtt Ferdi",
-  "pricing.support.label": "Velg din støtteplan",
-  "pricing.submit.label": "Jeg vil støtte utviklingen av Ferdi",
   "pricing.link.skipPayment": "Jeg vil ikke støtte utviklingen av Ferdi.",
-  "import.headline": "Importer dine Ferdi 4 tjenester",
-  "import.notSupportedHeadline": "Tjenester ikke enda støttet i Ferdi 5",
-  "import.submit.label": "Importer tjenester",
-  "import.skip.label": "Jeg vil legge til en tjeneste manuelt",
-  "invite.submit.label": "Send invitasjoner",
-  "invite.headline.friends": "Inviter 3 av dine venner eller kolleger",
-  "invite.name.label": "Navn",
-  "invite.email.label": "Email adresse",
-  "invite.skip.label": "Jeg vil gjøre dette senere",
-  "infobar.servicesUpdated": "Dine tjenester er oppdatert.",
-  "infobar.updateAvailable": "En ny oppdatering for Ferdi er tilgjengelig.",
-  "infobar.buttonReloadServices": "Oppdater tjenester",
-  "infobar.buttonInstallUpdate": "Restart & installer oppdatering",
-  "infobar.requiredRequestsFailed": "Kunne ikke laste tjenester og brukerinformasjon",
-  "sidebar.settings": "Innstillinger",
-  "sidebar.addNewService": "Legg til ny tjeneste",
-  "services.welcome": "Velkommen til Ferdi",
+  "pricing.submit.label": "Jeg vil støtte utviklingen av Ferdi",
+  "pricing.support.label": "Velg din støtteplan",
   "services.getStarted": "Kom i gang",
-  "settings.account.headline": "Konto",
-  "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Ferdi",
+  "services.welcome": "Velkommen til Ferdi",
+  "settings.account.account.editButton": "Rediger konto",
   "settings.account.accountType.basic": "Enkel Konto",
   "settings.account.accountType.premium": "Premium Konto",
-  "settings.account.account.editButton": "Rediger konto",
-  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
-  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
-  "settings.account.headlineProfile": "Oppdater profil",
+  "settings.account.buttonSave": "Oppdater profil",
+  "settings.account.headline": "Konto",
   "settings.account.headlineAccount": "Kontoinformasjon",
   "settings.account.headlinePassword": "Endre passord",
-  "settings.account.successInfo": "Dine endringer er lagret",
-  "settings.account.buttonSave": "Oppdater profil",
-  "settings.account.mining.thankyou": "Takk for at du støtter Ferdi med din prosessorkraft.",
+  "settings.account.headlineProfile": "Oppdater profil",
+  "settings.account.headlineUpgrade": "Oppgrader din konto og støtt Ferdi",
   "settings.account.mining.active": "Du utfører nå {hashes} beregninger per sekund.",
-  "settings.account.mining.moreInformation": "Få mer informasjon",
   "settings.account.mining.cancel": "Avbryt mining",
-  "settings.navigation.availableServices": "Tilgjengelige tjenester",
-  "settings.navigation.yourServices": "Dine tjenester",
+  "settings.account.mining.moreInformation": "Få mer informasjon",
+  "settings.account.mining.thankyou": "Takk for at du støtter Ferdi med din prosessorkraft.",
+  "settings.account.successInfo": "Dine endringer er lagret",
+  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
+  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjon",
+  "settings.app.buttonInstallUpdate": "Restart & installer oppdatering",
+  "settings.app.buttonSearchForUpdate": "Se etter oppdateringer",
+  "settings.app.currentVersion": "Gjeldende versjon:",
+  "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
+  "settings.app.form.autoLaunchOnStart": "Start Ferdi ved oppstart",
+  "settings.app.form.beta": "Inkluder beta versjoner",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.enableSystemTray": "Vis Ferdi i systemfeltet",
+  "settings.app.form.language": "Språk",
+  "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemfeltet",
+  "settings.app.form.runInBackground": "Behold Ferdi i bakgrunnen når du lukker vinduet",
+  "settings.app.headlineGeneral": "Genelert",
+  "settings.app.headlineLanguage": "Språk",
+  "settings.app.headlineUpdates": "Oppdateringer",
+  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
+  "settings.app.updateStatusSearching": "Søker etter en oppdatering",
+  "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Ferdi",
   "settings.navigation.account": "Konto",
-  "settings.navigation.settings": "Innstillinger",
+  "settings.navigation.availableServices": "Tilgjengelige tjenester",
   "settings.navigation.logout": "Logg ut",
-  "settings.recipes.headline": "Tilgjengelige tjenester",
+  "settings.navigation.yourServices": "Dine tjenester",
   "settings.recipes.all": "Alle tjenester",
   "settings.recipes.dev": "Utvikling",
+  "settings.recipes.headline": "Tilgjengelige tjenester",
   "settings.recipes.nothingFound": "Beklager, men ingen tjeneste samsvarer med søkeordet ditt.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjenesten ble lagt til",
-  "settings.service.form.saveButton": "Lagre tjeneste",
-  "settings.service.form.deleteButton": "Slett tjeneste",
-  "settings.service.form.availableServices": "Tilgjengelige tjenester",
-  "settings.service.form.yourServices": "Dine tjenester",
+  "settings.service.error.goBack": "Tilbake til tjenester",
+  "settings.service.error.headline": "Error",
+  "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.",
   "settings.service.form.addServiceHeadline": "Legg til {name}",
-  "settings.service.form.editServiceHeadline": "Rediger {name}",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Selv hosted ⭐️",
-  "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.",
+  "settings.service.form.availableServices": "Tilgjengelige tjenester",
+  "settings.service.form.customUrl": "Egendefinert server",
   "settings.service.form.customUrlPremiumInfo": "For å legge til selvhost-baserte tjenester trenger du en Ferdi Premium konto.",
   "settings.service.form.customUrlUpgradeAccount": "Oppgrader din konto",
+  "settings.service.form.customUrlValidationError": "Kunne ikke validere egendefinert {name} server.",
+  "settings.service.form.deleteButton": "Slett tjeneste",
+  "settings.service.form.editServiceHeadline": "Rediger {name}",
+  "settings.service.form.enableNotification": "Slå på varsler",
+  "settings.service.form.enableService": "Slå på tjeneste",
   "settings.service.form.indirectMessageInfo": "Du vil bli varslet om alle nye meldinger i en kanal, ikke bare @brukernavn, @kanal, @here, ...",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.goBack": "Tilbake til tjenester",
-  "settings.service.error.message": "Kunne ikke laste tjeneste oppskrift.",
-  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
-  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
+  "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger",
+  "settings.service.form.name": "Navn",
+  "settings.service.form.saveButton": "Lagre tjeneste",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Selv hosted ⭐️",
+  "settings.service.form.team": "Lag",
+  "settings.service.form.yourServices": "Dine tjenester",
+  "settings.services.deletedInfo": "Tjenester har blitt slettet",
+  "settings.services.discoverServices": "Oppdag tjenester",
   "settings.services.headline": "Dine tjenester",
   "settings.services.noServicesAdded": "Du har ikke lagt til noen tjenester enda.",
-  "settings.services.discoverServices": "Oppdag tjenester",
+  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
+  "settings.services.tooltip.notificationsDisabled": "Varsler er deaktivert",
   "settings.services.updatedInfo": "Dine endringer er lagret",
-  "settings.services.deletedInfo": "Tjenester har blitt slettet",
-  "settings.app.headline": "Innstillinger",
-  "settings.app.headlineGeneral": "Genelert",
-  "settings.app.headlineLanguage": "Språk",
-  "settings.app.headlineUpdates": "Oppdateringer",
-  "settings.app.buttonSearchForUpdate": "Se etter oppdateringer",
-  "settings.app.buttonInstallUpdate": "Restart & installer oppdatering",
-  "settings.app.updateStatusSearching": "Søker etter en oppdatering",
-  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
-  "settings.app.updateStatusUpToDate": "Du bruker siste versjon av Ferdi",
-  "settings.app.form.autoLaunchOnStart": "Start Ferdi ved oppstart",
-  "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systemfeltet",
-  "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemfeltet",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
-  "settings.app.form.runInBackground": "Behold Ferdi i bakgrunnen når du lukker vinduet",
-  "settings.app.form.language": "Språk",
-  "settings.app.form.beta": "Inkluder beta versjoner",
-  "settings.app.currentVersion": "Gjeldende versjon:",
-  "settings.service.form.name": "Navn",
-  "settings.service.form.enableService": "Slå på tjeneste",
-  "settings.service.form.enableNotification": "Slå på varsler",
-  "settings.service.form.team": "Lag",
-  "settings.service.form.customUrl": "Egendefinert server",
-  "settings.service.form.indirectMessages": "Vis merke for alle nye meldinger",
+  "settings.user.form.accountType.company": "Firma",
+  "settings.user.form.accountType.individual": "Individuell",
+  "settings.user.form.accountType.label": "Konto type",
+  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.currentPassword": "Gjeldende passord",
+  "settings.user.form.email": "Email",
   "settings.user.form.firstname": "Fornavn",
   "settings.user.form.lastname": "Etternavn",
-  "settings.user.form.email": "Email",
-  "settings.user.form.currentPassword": "Gjeldende passord",
   "settings.user.form.newPassword": "Nytt passord",
-  "settings.user.form.accountType.label": "Konto type",
-  "settings.user.form.accountType.individual": "Individuell",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.accountType.company": "Firma",
-  "tabs.item.reload": "Reload",
-  "tabs.item.edit": "Rediger",
+  "sidebar.addNewService": "Legg til ny tjeneste",
+  "signup.company.label": "Firma",
+  "signup.email.label": "Email adresse",
+  "signup.emailDuplicate": "En konto med den epost adresse eksiterer allerede",
+  "signup.firstname.label": "Fornavn",
+  "signup.headline": "Registrer deg",
+  "signup.lastname.label": "Etternavn",
+  "signup.legal.info": "Ved å opprette en Ferdi konto aksepterer du",
+  "signup.legal.privacy": "Personvern",
+  "signup.legal.terms": "Vilkår for bruk",
+  "signup.link.login": "Har du allerede en konto? Logg inn",
+  "signup.password.label": "Passord",
+  "signup.submit.label": "Opprett konto",
+  "tabs.item.deleteService": "Slett tjeneste",
   "tabs.item.disableNotifications": "Deaktiver varsler",
-  "tabs.item.enableNotification": "Aktiver varsler",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.deleteService": "Slett tjeneste"
+  "tabs.item.enableNotification": "Aktiver varsler",
+  "tabs.item.reload": "Reload",
+  "welcome.loginButton": "Logg inn til din konto",
+  "welcome.signupButton": "Opprett en gratis konto",
+  "welcome.slogan": "Teksting som funker for deg"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index f80973940..b9ca228ba 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi services",
   "global.cancel": "Annuleren",
+  "global.edit": "Bewerken",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Instellingen",
   "global.spellchecker.useDefault": "Gebruik Systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Instellingen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerken",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
   "settings.app.headlineGeneral": "Algemeen",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Beschikbare services",
   "settings.navigation.logout": "Uitloggen",
-  "settings.navigation.settings": "Instellingen",
   "settings.navigation.supportFerdi": "Over Ferdi",
   "settings.navigation.team": "Beheer Team",
   "settings.navigation.yourServices": "Jouw services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Werkruimtepagina openen",
-  "sidebar.settings": "Instellingen",
   "sidebar.unmuteApp": "Berichten & geluid inschakelen",
   "signup.email.label": "E-mailadres",
   "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Notificaties uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
-  "tabs.item.edit": "Bewerken",
   "tabs.item.enableAudio": "Audio inschakelen",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Notificaties aanzetten",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 0feddd6a4..eac72627f 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
   "global.cancel": "Annuleer",
+  "global.edit": "Bewerk",
   "global.no": "No",
   "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Instellingen",
   "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
   "global.spellchecking.autodetect": "Taal automatisch herkennen",
   "global.spellchecking.autodetect.short": "Automatisch",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Controleer op updates",
   "menu.app.hide": "Verbergen",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Instellingen",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Bewerk",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Instellingen",
   "settings.app.headlineAdvanced": "Geavanceerd",
   "settings.app.headlineAppearance": "Weergave",
   "settings.app.headlineGeneral": "Algemeen",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Beschikbare services",
   "settings.navigation.logout": "Uitloggen",
-  "settings.navigation.settings": "Instellingen",
   "settings.navigation.supportFerdi": "Over Ferdi",
   "settings.navigation.team": "Beheer Team",
   "settings.navigation.yourServices": "Jouw services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Werkruimtepagina openen",
-  "sidebar.settings": "Instellingen",
   "sidebar.unmuteApp": "Berichten & geluid inschakelen",
   "signup.email.label": "E-mailadres",
   "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Meldingen uitschakelen",
   "tabs.item.disableService": "Service uitschakelen",
-  "tabs.item.edit": "Bewerk",
   "tabs.item.enableAudio": "Audio inschakelen",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Meldingen inschakelen",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 2f67933d9..548cba3ce 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Hurtigbytte",
   "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
   "global.cancel": "Avbryt",
+  "global.edit": "Rediger",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Innstillinger",
   "global.spellchecker.useDefault": "Bruk systemstandarden ({default})",
   "global.spellchecking.autodetect": "Oppdag språk automatisk",
   "global.spellchecking.autodetect.short": "Automatisk",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Se etter oppdateringer",
   "menu.app.hide": "Skjul",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Innstillinger",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Rediger",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Innstillinger",
   "settings.app.headlineAdvanced": "Avansert",
   "settings.app.headlineAppearance": "Utseende",
   "settings.app.headlineGeneral": "Generelt",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tilgjengelige tjenester",
   "settings.navigation.logout": "Logg ut",
-  "settings.navigation.settings": "Innstillinger",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Administrere Team",
   "settings.navigation.yourServices": "Dine tjenester",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Deaktiver varsler og lyd",
   "sidebar.openTodosDrawer": "Åpne Ferdi gjøremål",
   "sidebar.openWorkspaceDrawer": "Åpne skuff for arbeidsområder",
-  "sidebar.settings": "Innstillinger",
   "sidebar.unmuteApp": "Aktiver varsler og lyd",
   "signup.email.label": "E-postadresse",
   "signup.emailDuplicate": "Det finnes allerede en bruker med den e-postadressen",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Deaktiver varslinger",
   "tabs.item.disableService": "Deaktiver tjeneste",
-  "tabs.item.edit": "Rediger",
   "tabs.item.enableAudio": "Aktiver lyd",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktiver varsler",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 11159af33..39b72e367 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
   "global.cancel": "Anuluj",
+  "global.edit": "Edytuj",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Ustawienia",
   "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
   "global.spellchecking.autodetect": "Automatycznie wykryj język",
   "global.spellchecking.autodetect.short": "Automatycznie",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Sprawdź aktualizacje",
   "menu.app.hide": "Ukryj",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Ustawienia",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edytuj",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Ustawienia",
   "settings.app.headlineAdvanced": "Zaawansowane",
   "settings.app.headlineAppearance": "Wygląd",
   "settings.app.headlineGeneral": "Ogólne",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Dostępne usługi",
   "settings.navigation.logout": "Wyloguj",
-  "settings.navigation.settings": "Ustawienia",
   "settings.navigation.supportFerdi": "O Ferdi",
   "settings.navigation.team": "Zarządzaj Zespołem",
   "settings.navigation.yourServices": "Twoje usługi",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Wyłącz powiadomienia i dźwięki",
   "sidebar.openTodosDrawer": "Otwórz Listę zadań Ferdi",
   "sidebar.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego",
-  "sidebar.settings": "Ustawienia",
   "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki",
   "signup.email.label": "Adres email",
   "signup.emailDuplicate": "Użytkownik z takim adresem email już istnieje",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Wyłącz powiadomienia",
   "tabs.item.disableService": "Wyłącz usługę",
-  "tabs.item.edit": "Edytuj",
   "tabs.item.enableAudio": "Włącz dźwięk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktywuj powiadomienia",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 99f9385c8..2a5ee303e 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não foi possível estabelecer ligação aos serviços do Ferdi",
   "global.cancel": "Cancelar",
+  "global.edit": "Editar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Você não está conectado à internet.",
   "global.ok": "Ok",
   "global.quit": "Sair",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Configurações",
   "global.spellchecker.useDefault": "Utilizar o Padrão do Sistema ({default})",
   "global.spellchecking.autodetect": "Detectar a idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Ocultar outros",
-  "menu.app.settings": "Configurações",
   "menu.app.unhide": "Reexibir",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copiar",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Estratégia de despertar",
-  "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
   "settings.app.headlineGeneral": "Geral",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Conta",
   "settings.navigation.availableServices": "Serviços disponíveis",
   "settings.navigation.logout": "Terminar sessão",
-  "settings.navigation.settings": "Configurações",
   "settings.navigation.supportFerdi": "Sobre o Ferdi",
   "settings.navigation.team": "Gerenciar equipes",
   "settings.navigation.yourServices": "Seus serviços",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Desativar notificações e áudio",
   "sidebar.openTodosDrawer": "Abrir as Tarefas",
   "sidebar.openWorkspaceDrawer": "Abrir a janela da Área de trabalho",
-  "sidebar.settings": "Configurações",
   "sidebar.unmuteApp": "Ativar notificações e áudio",
   "signup.email.label": "Endereço de e-mail",
   "signup.emailDuplicate": "Já existe uma conta associada a este endereço de email",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Desativar o modo escuro",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableDarkMode": "Ativar o modo escuro",
   "tabs.item.enableNotification": "Ativar notificações",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index f24942056..da431f4e3 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Troca Rápida",
   "global.api.unhealthy": "Não é possível ligar aos serviços online de Ferdi",
   "global.cancel": "Cancelar",
+  "global.edit": "Editar",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Não está ligado à internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Configurações",
   "global.spellchecker.useDefault": "Use o padrão de sistema ({default})",
   "global.spellchecking.autodetect": "Detectar idioma automaticamente",
   "global.spellchecking.autodetect.short": "Automático",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Procurar atualizações",
   "menu.app.hide": "Ocultar",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Configurações",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Editar",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Configurações",
   "settings.app.headlineAdvanced": "Avançado",
   "settings.app.headlineAppearance": "Aparência",
   "settings.app.headlineGeneral": "Geral",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Conta",
   "settings.navigation.availableServices": "Serviços disponíveis",
   "settings.navigation.logout": "Sair",
-  "settings.navigation.settings": "Configurações",
   "settings.navigation.supportFerdi": "Acerca de Ferdi",
   "settings.navigation.team": "Gerir Equipa",
   "settings.navigation.yourServices": "Os seus serviços",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Desativar notificações e áudio",
   "sidebar.openTodosDrawer": "Abrir Tarefas Ferdi",
   "sidebar.openWorkspaceDrawer": "Abrir a barra lateral da área de trabalho",
-  "sidebar.settings": "Configurações",
   "sidebar.unmuteApp": "Ativar notificações e áudio",
   "signup.email.label": "Endereço de E-mail",
   "signup.emailDuplicate": "Já existe um utilizador com este endereço de e-mail",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Desativar notificações",
   "tabs.item.disableService": "Desativar serviço",
-  "tabs.item.edit": "Editar",
   "tabs.item.enableAudio": "Ativar áudio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Ativar notificações",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 39e37f51c..6e2ee4c19 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nu ești conectat la internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Folosește sistemul implicit ({default})",
   "global.spellchecking.autodetect": "Detectează limba automat",
   "global.spellchecking.autodetect.short": "Automat",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 8a781e65b..4a7222914 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Быстрое переключение",
   "global.api.unhealthy": "Невозможно подключиться к онлайн-сервисам Ferdi",
   "global.cancel": "Отмена",
+  "global.edit": "Правка",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Настройки",
   "global.spellchecker.useDefault": "Использовать системные параметры по умолчанию ({default})",
   "global.spellchecking.autodetect": "Найти язык автоматически",
   "global.spellchecking.autodetect.short": "Авто",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Проверить обновления",
   "menu.app.hide": "Скрыть",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Настройки",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Правка",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Настройки",
   "settings.app.headlineAdvanced": "Дополнительно",
   "settings.app.headlineAppearance": "Внешний вид",
   "settings.app.headlineGeneral": "Общие",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Аккаунт",
   "settings.navigation.availableServices": "Доступные сервисы",
   "settings.navigation.logout": "Выход",
-  "settings.navigation.settings": "Настройки",
   "settings.navigation.supportFerdi": "О Ferdi",
   "settings.navigation.team": "Управление Командой",
   "settings.navigation.yourServices": "Ваши сервисы",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Отключить уведомления и звук",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Открыть меню окружений",
-  "sidebar.settings": "Настройки",
   "sidebar.unmuteApp": "Включить уведомления и звук",
   "signup.email.label": "Адрес электронной почты",
   "signup.emailDuplicate": "Пользователь с таким адресом электронной почты уже существует",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Отключить уведомления",
   "tabs.item.disableService": "Отключить сервис",
-  "tabs.item.edit": "Правка",
   "tabs.item.enableAudio": "Включить звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Включить уведомления",
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 204886a77..9ebf7f9e5 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "ෆ්රාන්ස් මාර්ගගත සේවාවන් වෙත සම්බන්ධ වීමට නොහැක.",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "ඔබ අන්තර්ජාලයට සම්බන්ධ වී නැත.",
   "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index f6d6882b5..7e84088d1 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
   "global.cancel": "Zrušiť",
+  "global.edit": "Upraviť",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Nastavenia",
   "global.spellchecker.useDefault": "Použiť predvolené nastavenie systému ({default})",
   "global.spellchecking.autodetect": "Automaticky rozpoznať jazyk",
   "global.spellchecking.autodetect.short": "Automatický",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Skontrolovať aktualizácie",
   "menu.app.hide": "Skryť",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Nastavenia",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Upraviť",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Nastavenia",
   "settings.app.headlineAdvanced": "Pokročilé",
   "settings.app.headlineAppearance": "Vzhľad",
   "settings.app.headlineGeneral": "Všeobecné",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Účet",
   "settings.navigation.availableServices": "Dostupné služby",
   "settings.navigation.logout": "Odhlásiť sa",
-  "settings.navigation.settings": "Nastavenia",
   "settings.navigation.supportFerdi": "O aplikácii",
   "settings.navigation.team": "Spravovať tím",
   "settings.navigation.yourServices": "Vaše služby",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Vypnúť upozornenia a zvuky",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Otvoriť workspace záložku",
-  "sidebar.settings": "Nastavenia",
   "sidebar.unmuteApp": "Povoliť oznámenia a zvuky",
   "signup.email.label": "E-mailová adresa",
   "signup.emailDuplicate": "Používateľ s touto e-mailovou adresou už jestvuje",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Zakázať oznámenia",
   "tabs.item.disableService": "Vypnúť službu",
-  "tabs.item.edit": "Upraviť",
   "tabs.item.enableAudio": "Zapnúť zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Povoliť oznámenia",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 4cb145cb2..2c145d6f4 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/sq.json b/src/i18n/locales/sq.json
index 13a0907f6..59f77fbb1 100644
--- a/src/i18n/locales/sq.json
+++ b/src/i18n/locales/sq.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.inviteFriends": "Invite Friends",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.yourWorkspaces": "Your workspaces",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 627e964fa..8ee9417f6 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
   "global.cancel": "Odustani",
+  "global.edit": "Uredi",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Postavke",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Аутоматски",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Potraži ažuriranja",
   "menu.app.hide": "Sakrij",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Postavke",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Uredi",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Postavke",
   "settings.app.headlineAdvanced": "Napredne alatke",
   "settings.app.headlineAppearance": "Izgled",
   "settings.app.headlineGeneral": "Općenito",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Korisnički nalog",
   "settings.navigation.availableServices": "Dostupne usluge",
   "settings.navigation.logout": "Odjava",
-  "settings.navigation.settings": "Postavke",
   "settings.navigation.supportFerdi": "O Francu",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Vaše usluge",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Онемогући обавештења и звукове",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Postavke",
   "sidebar.unmuteApp": "Искључи обавештења и звукове",
   "signup.email.label": "Vaša e-adresa",
   "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Onemogući obavijesti",
   "tabs.item.disableService": "Onemogući servis",
-  "tabs.item.edit": "Uredi",
   "tabs.item.enableAudio": "Omogućite zvuk",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Omogućite obavijesti",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 7cd4239d4..87b92e398 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Snabbväxling",
   "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
   "global.cancel": "Avbryt",
+  "global.edit": "Redigera",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Inställningar",
   "global.spellchecker.useDefault": "Använd systemstandard ({default})",
   "global.spellchecking.autodetect": "Identifiera språk automatiskt",
   "global.spellchecking.autodetect.short": "Automatisk",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Sök efter uppdateringar",
   "menu.app.hide": "Dölj",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Inställningar",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Redigera",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Inställningar",
   "settings.app.headlineAdvanced": "Avancerat",
   "settings.app.headlineAppearance": "Utseende",
   "settings.app.headlineGeneral": "Allmänt",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Konto",
   "settings.navigation.availableServices": "Tillgängliga tjänster",
   "settings.navigation.logout": "Logga ut",
-  "settings.navigation.settings": "Inställningar",
   "settings.navigation.supportFerdi": "Om Ferdi",
   "settings.navigation.team": "Hantera grupp",
   "settings.navigation.yourServices": "Dina tjänster",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Inaktivera notifikationer och ljud",
   "sidebar.openTodosDrawer": "Öppna Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Öppna arbetsytan",
-  "sidebar.settings": "Inställningar",
   "sidebar.unmuteApp": "Aktivera aviseringar och ljud",
   "signup.email.label": "E-postadress",
   "signup.emailDuplicate": "En användare med den e-postadressen finns redan",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Inaktivera aviseringar",
   "tabs.item.disableService": "Inaktivera tjänst",
-  "tabs.item.edit": "Redigera",
   "tabs.item.enableAudio": "Aktivera ljud",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Aktivera aviseringar",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index 98f31f573..be9bbb961 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
+  "global.edit": "Edit",
   "global.no": "No",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 6c94df1f3..3b91dfad0 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "Ferdi hizmetlerine şu anda erişilemiyor",
   "global.cancel": "İptal",
+  "global.edit": "Düzenle",
   "global.no": "No",
   "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
   "global.ok": "Ok",
   "global.quit": "Çık",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Ayarlar",
   "global.spellchecker.useDefault": "Sistem Dilini Kullan ({default})",
   "global.spellchecking.autodetect": "Dili otomatik tespit et",
   "global.spellchecking.autodetect.short": "Otomatik",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Güncellemeleri kontrol et",
   "menu.app.hide": "Gizle",
   "menu.app.hideOthers": "Diğerlerini Gizle",
-  "menu.app.settings": "Ayarlar",
   "menu.app.unhide": "Göster",
   "menu.edit": "Düzenle",
   "menu.edit.copy": "Kopyala",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Ayarlar",
   "settings.app.headlineAdvanced": "Gelişmiş",
   "settings.app.headlineAppearance": "Görünüm",
   "settings.app.headlineGeneral": "Genel",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Hesap",
   "settings.navigation.availableServices": "Mevcut servisler",
   "settings.navigation.logout": "Çıkış",
-  "settings.navigation.settings": "Ayarlar",
   "settings.navigation.supportFerdi": "Ferdi Hakkında",
   "settings.navigation.team": "Ekibini Yönet",
   "settings.navigation.yourServices": "Servislerin",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Bildirimleri ve sesli uyarıları kapat",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Çalışma alanı çekmecesini aç",
-  "sidebar.settings": "Ayarlar",
   "sidebar.unmuteApp": "Bildirimleri ve sesli uyarıları etkinleştir",
   "signup.email.label": "E-posta adresi",
   "signup.emailDuplicate": "Bu email adresine sahip bir kullanıcı zaten mevcut",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Bildirimleri devre dışı bırak",
   "tabs.item.disableService": "Servisi devre dışı bırak",
-  "tabs.item.edit": "Düzenle",
   "tabs.item.enableAudio": "Sesi etkinleştirin",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Bildirimleri etkinleştir",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index ad02fc54b..b4f1fb66c 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Швидке перемикання",
   "global.api.unhealthy": "Не можливо підключитись до онлайн сервісів Ferdi",
   "global.cancel": "Відмінити",
+  "global.edit": "Редагувати",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
   "global.ok": "Ok",
   "global.quit": "Вийти",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Налаштування",
   "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
   "global.spellchecking.autodetect": "Автоматично визначати мову",
   "global.spellchecking.autodetect.short": "Автоматично",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Перевірити наявність оновлень",
   "menu.app.hide": "Приховати",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Налаштування",
   "menu.app.unhide": "Показати",
   "menu.edit": "Редагувати",
   "menu.edit.copy": "Копіювати",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "Налаштування",
   "settings.app.headlineAdvanced": "Додаткові налаштування",
   "settings.app.headlineAppearance": "Вигляд",
   "settings.app.headlineGeneral": "Загальні",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Акаунт",
   "settings.navigation.availableServices": "Доступні сервіси",
   "settings.navigation.logout": "Вийти",
-  "settings.navigation.settings": "Налаштування",
   "settings.navigation.supportFerdi": "Про Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Ваші сервіси",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Вимкнути сповіщення та звуки",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Налаштування",
   "sidebar.unmuteApp": "Увімкнути сповіщення та звуки",
   "signup.email.label": "Email адреса",
   "signup.emailDuplicate": "Користувач із цією email адресою вже існує",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Вимкнути сповіщення",
   "tabs.item.disableService": "Вимкнути сервіс",
-  "tabs.item.edit": "Редагувати",
   "tabs.item.enableAudio": "Увімкнути звук",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Увімкнути сповіщення",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 54905db79..0bf52bf1d 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "Chuyển đổi nhanh",
   "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi",
   "global.cancel": "Hủy",
+  "global.edit": "Chỉnh sửa",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Bạn không kết nối với Internet.",
   "global.ok": "Ok",
   "global.quit": "Thoát",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "Các thiết lập",
   "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})",
   "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ",
   "global.spellchecking.autodetect.short": "Tự động",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Kiểm tra cập nhật",
   "menu.app.hide": "Ẩn",
   "menu.app.hideOthers": "Ẩn các mục khác",
-  "menu.app.settings": "Các thiết lập",
   "menu.app.unhide": "Bỏ ẩn",
   "menu.edit": "Chỉnh sửa",
   "menu.edit.copy": "Sao chép",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi",
   "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang",
   "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức",
-  "settings.app.headline": "Các thiết lập",
   "settings.app.headlineAdvanced": "Nâng cao",
   "settings.app.headlineAppearance": "Giao diện",
   "settings.app.headlineGeneral": "Chung",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Tài khoản",
   "settings.navigation.availableServices": "Các dịch vụ có sẵn",
   "settings.navigation.logout": "Đăng xuất",
-  "settings.navigation.settings": "Các thiết lập",
   "settings.navigation.supportFerdi": "Giới thiệu về phần mềm Ferdi",
   "settings.navigation.team": "Quản lý Nhóm",
   "settings.navigation.yourServices": "Dịch vụ của bạn",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Tắt thông báo và âm thanh",
   "sidebar.openTodosDrawer": "Mở Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Mở không gian làm việc",
-  "sidebar.settings": "Các thiết lập",
   "sidebar.unmuteApp": "Bật thông báo và âm thanh",
   "signup.email.label": "Địa chỉ E-mail",
   "signup.emailDuplicate": "Một người dùng với địa chỉ email đó đã tồn tại",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Vô hiệu hóa chế độ tối",
   "tabs.item.disableNotifications": "Vô hiệu hóa thông báo",
   "tabs.item.disableService": "Vô hiệu hóa dịch vụ",
-  "tabs.item.edit": "Chỉnh sửa",
   "tabs.item.enableAudio": "Cho phép âm thanh",
   "tabs.item.enableDarkMode": "Kích hoạt chế độ tối",
   "tabs.item.enableNotification": "Kích hoạt thông báo",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 9daa34208..632127f4d 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -21,9 +21,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Ferdi online services",
+  "global.edit": "Edit",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
   "global.quit": "Quit",
+  "global.settings": "Settings",
   "global.spellchecker.useDefault": "Use System Default ({default})",
   "global.spellchecking.autodetect": "Detect language automatically",
   "global.spellchecking.autodetect.short": "Automatic",
@@ -71,7 +73,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "Hide",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "Settings",
   "menu.app.unhide": "Unhide",
   "menu.edit": "Edit",
   "menu.edit.copy": "Copy",
@@ -197,6 +198,7 @@
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
   "settings.app.form.beta": "Include beta versions",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.darkMode": "Enable dark mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -210,7 +212,6 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
@@ -226,7 +227,6 @@
   "settings.app.form.startMinimized": "Start minimized in tray",
   "settings.app.form.todoServer": "Todo Server",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -255,7 +255,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "Settings",
   "settings.navigation.supportFerdi": "Support Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -369,7 +368,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -386,7 +384,6 @@
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "Edit",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableNotification": "Enable notifications",
   "tabs.item.enableService": "Enable service",
diff --git a/src/i18n/locales/zh-HANS.json b/src/i18n/locales/zh-HANS.json
index 0b0652ad6..a214e551c 100644
--- a/src/i18n/locales/zh-HANS.json
+++ b/src/i18n/locales/zh-HANS.json
@@ -13,9 +13,11 @@
   "feature.shareFranz.shareText.twitter": "我已经为Ferdi添加了{count}个服务！在www.getferdi.com/cc @FerdiMessenger上获得适用于WhatsApp，Messenger，Slack，Skype和co的免费应用程序",
   "feature.shareFranz.text": "告诉你的朋友和同事Ferdi有多棒并且帮助我们传播Ferdi。",
   "global.api.unhealthy": "无法连接Ferdi在线服务",
+  "global.edit": "编辑",
   "global.franzProRequired": "需要 Ferdi 专业版。",
   "global.notConnectedToTheInternet": "没有网络服务",
   "global.quit": "退出",
+  "global.settings": "设置",
   "global.spellchecker.useDefault": "使用系统默认设置({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
@@ -53,7 +55,6 @@
   "menu.app.checkForUpdates": "检查更新",
   "menu.app.hide": "隐藏",
   "menu.app.hideOthers": "隐藏其它",
-  "menu.app.settings": "设置",
   "menu.app.unhide": "显示",
   "menu.edit": "编辑",
   "menu.edit.copy": "复制",
@@ -179,7 +180,6 @@
   "settings.app.form.runInBackground": "关闭窗口时保持 Ferdi 在后台运行",
   "settings.app.form.showDisabledServices": "显示已禁用的服务标签页",
   "settings.app.form.showMessagesBadgesWhenMuted": "在通知被禁用时显示未读消息提示。",
-  "settings.app.headline": "设置",
   "settings.app.headlineAdvanced": "高级",
   "settings.app.headlineAppearance": "外观",
   "settings.app.headlineGeneral": "通用",
@@ -197,7 +197,6 @@
   "settings.navigation.availableServices": "可用的服务",
   "settings.navigation.inviteFriends": "邀请朋友",
   "settings.navigation.logout": "退出账户",
-  "settings.navigation.settings": "设置",
   "settings.navigation.team": "管理团队",
   "settings.navigation.yourServices": "您的服务",
   "settings.navigation.yourWorkspaces": "你的工作组",
@@ -304,7 +303,6 @@
   "sidebar.muteApp": "关闭通知和声音提醒",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打开工作组列表",
-  "sidebar.settings": "设置",
   "sidebar.unmuteApp": "开启通知和声音提醒",
   "signup.email.label": "电子邮件",
   "signup.emailDuplicate": "此邮箱已被注册",
@@ -321,7 +319,6 @@
   "tabs.item.disableAudio": "禁止声音",
   "tabs.item.disableNotifications": "停止通知",
   "tabs.item.disableService": "停用服务",
-  "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "启用声音",
   "tabs.item.enableNotification": "启用通知",
   "tabs.item.enableService": "启用服务",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 06eeb30cb..22a0b6771 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "QuickSwitch",
   "global.api.unhealthy": "無法連接到Ferdi網路服務",
   "global.cancel": "取消",
+  "global.edit": "編輯",
   "global.no": "No",
   "global.notConnectedToTheInternet": "您未連上網際網路",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "設置",
   "global.spellchecker.useDefault": "使用系統預設值({default})",
   "global.spellchecking.autodetect": "自動檢測語言",
   "global.spellchecking.autodetect.short": "自動",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "檢查更新",
   "menu.app.hide": "隱藏",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "設置",
   "menu.app.unhide": "Unhide",
   "menu.edit": "編輯",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "設置",
   "settings.app.headlineAdvanced": "高級設置",
   "settings.app.headlineAppearance": "外觀",
   "settings.app.headlineGeneral": "一般",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "帳戶",
   "settings.navigation.availableServices": "可用服務",
   "settings.navigation.logout": "登出",
-  "settings.navigation.settings": "設置",
   "settings.navigation.supportFerdi": "關於 Ferdi",
   "settings.navigation.team": "管理團隊",
   "settings.navigation.yourServices": "您的服務",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "停用通知",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打開工作區",
-  "sidebar.settings": "設置",
   "sidebar.unmuteApp": "啟用通知",
   "signup.email.label": "電子郵件信箱",
   "signup.emailDuplicate": "此電子郵件信箱已被註冊",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "停用通知",
   "tabs.item.disableService": "停用服務",
-  "tabs.item.edit": "編輯",
   "tabs.item.enableAudio": "啟用音效",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "啟用通知",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 0fcd6891d..c8e0e698a 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -10,9 +10,11 @@
   "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
   "feature.shareFranz.text": "告訴所有朋友和同事Ferdi有多棒！",
   "global.api.unhealthy": "無法連線至 Ferdi 的伺服器",
+  "global.edit": "編輯",
   "global.franzProRequired": "Ferdi Professional Required",
   "global.notConnectedToTheInternet": "你沒有連上網路。",
   "global.quit": "結束",
+  "global.settings": "設定",
   "global.spellchecker.useDefault": "使用系統預設 ({default})",
   "global.spellchecking.autodetect": "自動偵測語言",
   "global.spellchecking.autodetect.short": "自動的",
@@ -50,7 +52,6 @@
   "menu.app.checkForUpdates": "檢查更新",
   "menu.app.hide": "隱藏",
   "menu.app.hideOthers": "隱藏其他",
-  "menu.app.settings": "設定",
   "menu.app.unhide": "顯示",
   "menu.edit": "編輯",
   "menu.edit.copy": "拷貝",
@@ -157,6 +158,7 @@
   "settings.app.form.autoLaunchInBackground": "在背景開啟",
   "settings.app.form.autoLaunchOnStart": "開機時啟動 Ferdi",
   "settings.app.form.beta": "包含測試版",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.darkMode": "加入黑暗面",
   "settings.app.form.enableGPUAcceleration": "啟用 GPU 加速",
   "settings.app.form.enableSpellchecking": "啟用拼字檢查",
@@ -165,11 +167,9 @@
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "語言",
   "settings.app.form.minimizeToSystemTray": "最小化 Ferdi 到系統列",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.runInBackground": "當關閉視窗時，保持 Ferdi 在背景運作",
   "settings.app.form.showDisabledServices": "顯示停用的服務標籤",
   "settings.app.form.showMessagesBadgesWhenMuted": "當通知關閉時，標記未讀的訊息",
-  "settings.app.headline": "設定",
   "settings.app.headlineAdvanced": "進階",
   "settings.app.headlineAppearance": "外觀",
   "settings.app.headlineGeneral": "一般",
@@ -187,7 +187,6 @@
   "settings.navigation.availableServices": "可使用的服務",
   "settings.navigation.inviteFriends": "邀請朋友",
   "settings.navigation.logout": "登出",
-  "settings.navigation.settings": "設定",
   "settings.navigation.team": "管理團隊",
   "settings.navigation.yourServices": "您的服務",
   "settings.navigation.yourWorkspaces": "所有工作區",
@@ -289,7 +288,6 @@
   "sidebar.muteApp": "關閉通知和通知音效",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "打開工作空間",
-  "sidebar.settings": "設定",
   "sidebar.unmuteApp": "開啟通知和通知音效",
   "signup.email.label": "電子郵件地址",
   "signup.emailDuplicate": "該使用者的電子郵件位址已存在",
@@ -306,7 +304,6 @@
   "tabs.item.disableAudio": "停用音訊",
   "tabs.item.disableNotifications": "停用通知",
   "tabs.item.disableService": "關閉服務",
-  "tabs.item.edit": "編輯",
   "tabs.item.enableAudio": "啟用音訊",
   "tabs.item.enableNotification": "啟用通知",
   "tabs.item.enableService": "啟用服務",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 97335524a..fa30d636a 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -26,12 +26,14 @@
   "feature.quickSwitch.title": "快速切换",
   "global.api.unhealthy": "无法链接到 Ferdi 在线服务",
   "global.cancel": "取消",
+  "global.edit": "编辑",
   "global.no": "No",
   "global.notConnectedToTheInternet": "您没有连接到互联网。",
   "global.ok": "Ok",
   "global.quit": "Quit",
   "global.quitConfirmation": "Do you really want to quit Ferdi?",
   "global.save": "Save",
+  "global.settings": "设置",
   "global.spellchecker.useDefault": "使用系统默认值 ({default})",
   "global.spellchecking.autodetect": "自动检测语言",
   "global.spellchecking.autodetect.short": "自动",
@@ -86,7 +88,6 @@
   "menu.app.checkForUpdates": "Check for updates",
   "menu.app.hide": "隐藏",
   "menu.app.hideOthers": "Hide Others",
-  "menu.app.settings": "设置",
   "menu.app.unhide": "Unhide",
   "menu.edit": "编辑",
   "menu.edit.copy": "Copy",
@@ -255,7 +256,6 @@
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
-  "settings.app.headline": "设置",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
@@ -285,7 +285,6 @@
   "settings.navigation.account": "Account",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.logout": "Logout",
-  "settings.navigation.settings": "设置",
   "settings.navigation.supportFerdi": "About Ferdi",
   "settings.navigation.team": "Manage Team",
   "settings.navigation.yourServices": "Your services",
@@ -418,7 +417,6 @@
   "sidebar.muteApp": "Disable notifications & audio",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.settings": "设置",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "电子邮箱地址",
   "signup.emailDuplicate": "A user with that email address already exists",
@@ -437,7 +435,6 @@
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
   "tabs.item.disableService": "Disable service",
-  "tabs.item.edit": "编辑",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 1c40118e5..9bc435f12 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -1,27 +1,14 @@
 [
-  {
-    "id": "sidebar.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 17,
-      "column": 12
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
   {
     "id": "sidebar.addNewService",
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 21,
+      "line": 18,
       "column": 17
     },
     "end": {
-      "line": 24,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +17,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 25,
+      "line": 22,
       "column": 8
     },
     "end": {
-      "line": 28,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 29,
+      "line": 26,
       "column": 10
     },
     "end": {
-      "line": 32,
+      "line": 29,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 33,
+      "line": 30,
       "column": 23
     },
     "end": {
-      "line": 36,
+      "line": 33,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 37,
+      "line": 34,
       "column": 24
     },
     "end": {
-      "line": 40,
+      "line": 37,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Open Ferdi Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 41,
+      "line": 38,
       "column": 19
     },
     "end": {
-      "line": 44,
+      "line": 41,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Close Ferdi Todos",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 45,
+      "line": 42,
       "column": 20
     },
     "end": {
-      "line": 48,
+      "line": 45,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Lock Ferdi",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 49,
+      "line": 46,
       "column": 13
     },
     "end": {
-      "line": 52,
+      "line": 49,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
index 377808db3..de854f1e1 100644
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -12,29 +12,16 @@
       "column": 3
     }
   },
-  {
-    "id": "tabs.item.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
   {
     "id": "tabs.item.disableNotifications",
     "defaultMessage": "!!!Disable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 29,
+      "line": 25,
       "column": 24
     },
     "end": {
-      "line": 32,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Enable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 33,
+      "line": 29,
       "column": 23
     },
     "end": {
-      "line": 36,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Disable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 37,
+      "line": 33,
       "column": 16
     },
     "end": {
-      "line": 40,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 41,
+      "line": 37,
       "column": 15
     },
     "end": {
-      "line": 44,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Enable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 45,
+      "line": 41,
       "column": 18
     },
     "end": {
-      "line": 48,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Disable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 49,
+      "line": 45,
       "column": 19
     },
     "end": {
-      "line": 52,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Disable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 53,
+      "line": 49,
       "column": 18
     },
     "end": {
-      "line": 56,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Enable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 57,
+      "line": 53,
       "column": 17
     },
     "end": {
-      "line": 60,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Hibernate Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 61,
+      "line": 57,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Wake Up Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 65,
+      "line": 61,
       "column": 17
     },
     "end": {
-      "line": 68,
+      "line": 64,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 69,
+      "line": 65,
       "column": 17
     },
     "end": {
-      "line": 72,
+      "line": 68,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 73,
+      "line": 69,
       "column": 24
     },
     "end": {
-      "line": 77,
+      "line": 73,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 705b7cee3..2029ad7af 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 15,
+      "line": 16,
       "column": 21
     },
     "end": {
-      "line": 18,
+      "line": 19,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 16
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 18
     },
     "end": {
-      "line": 26,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 27,
+      "line": 28,
       "column": 11
     },
     "end": {
-      "line": 30,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Manage Team",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 8
     },
     "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
       "line": 35,
-      "column": 12
-    },
-    "end": {
-      "line": 38,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!About Ferdi",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 39,
+      "line": 36,
       "column": 16
     },
     "end": {
-      "line": 42,
+      "line": 39,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 43,
+      "line": 40,
       "column": 10
     },
     "end": {
-      "line": 46,
+      "line": 43,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index da1581864..c281ebff3 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -1,27 +1,14 @@
 [
-  {
-    "id": "settings.app.headline",
-    "defaultMessage": "!!!Settings",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 21,
-      "column": 12
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
   {
     "id": "settings.app.headlineGeneral",
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 25,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 28,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +17,11 @@
     "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 29,
+      "line": 25,
       "column": 14
     },
     "end": {
-      "line": 32,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 33,
+      "line": 29,
       "column": 17
     },
     "end": {
-      "line": 36,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 37,
+      "line": 33,
       "column": 22
     },
     "end": {
-      "line": 40,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 41,
+      "line": 37,
       "column": 18
     },
     "end": {
-      "line": 44,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 45,
+      "line": 41,
       "column": 18
     },
     "end": {
-      "line": 48,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 49,
+      "line": 45,
       "column": 22
     },
     "end": {
-      "line": 52,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 53,
+      "line": 49,
       "column": 12
     },
     "end": {
-      "line": 56,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 57,
+      "line": 53,
       "column": 24
     },
     "end": {
-      "line": 60,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 61,
+      "line": 57,
       "column": 20
     },
     "end": {
-      "line": 64,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 65,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 68,
+      "line": 64,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 69,
+      "line": 65,
       "column": 19
     },
     "end": {
-      "line": 72,
+      "line": 68,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 73,
+      "line": 69,
       "column": 22
     },
     "end": {
-      "line": 76,
+      "line": 72,
       "column": 3
     }
   },
@@ -186,11 +173,11 @@
     "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 77,
+      "line": 73,
       "column": 25
     },
     "end": {
-      "line": 80,
+      "line": 76,
       "column": 3
     }
   },
@@ -199,11 +186,11 @@
     "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 81,
+      "line": 77,
       "column": 19
     },
     "end": {
-      "line": 84,
+      "line": 80,
       "column": 3
     }
   },
@@ -212,11 +199,11 @@
     "defaultMessage": "!!!Privacy",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 85,
+      "line": 81,
       "column": 19
     },
     "end": {
-      "line": 88,
+      "line": 84,
       "column": 3
     }
   },
@@ -225,11 +212,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 89,
+      "line": 85,
       "column": 20
     },
     "end": {
-      "line": 92,
+      "line": 88,
       "column": 3
     }
   },
@@ -238,11 +225,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 93,
+      "line": 89,
       "column": 19
     },
     "end": {
-      "line": 96,
+      "line": 92,
       "column": 3
     }
   },
@@ -251,11 +238,11 @@
     "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 97,
+      "line": 93,
       "column": 28
     },
     "end": {
-      "line": 100,
+      "line": 96,
       "column": 3
     }
   },
@@ -264,11 +251,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 101,
+      "line": 97,
       "column": 20
     },
     "end": {
-      "line": 104,
+      "line": 100,
       "column": 3
     }
   },
@@ -277,11 +264,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 105,
+      "line": 101,
       "column": 13
     },
     "end": {
-      "line": 108,
+      "line": 104,
       "column": 3
     }
   },
@@ -290,11 +277,11 @@
     "defaultMessage": "!!!Couldn't clear all cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 109,
+      "line": 105,
       "column": 19
     },
     "end": {
-      "line": 112,
+      "line": 108,
       "column": 3
     }
   },
@@ -303,11 +290,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 113,
+      "line": 109,
       "column": 23
     },
     "end": {
-      "line": 116,
+      "line": 112,
       "column": 3
     }
   },
@@ -316,11 +303,11 @@
     "defaultMessage": "!!!Ferdi Profile",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 117,
+      "line": 113,
       "column": 27
     },
     "end": {
-      "line": 120,
+      "line": 116,
       "column": 3
     }
   },
@@ -329,11 +316,11 @@
     "defaultMessage": "!!!Open Profile folder",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 121,
+      "line": 117,
       "column": 32
     },
     "end": {
-      "line": 124,
+      "line": 120,
       "column": 3
     }
   },
@@ -342,11 +329,11 @@
     "defaultMessage": "!!!Open Service Recipes folder",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 125,
+      "line": 121,
       "column": 39
     },
     "end": {
-      "line": 128,
+      "line": 124,
       "column": 3
     }
   },
@@ -355,11 +342,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 129,
+      "line": 125,
       "column": 25
     },
     "end": {
-      "line": 132,
+      "line": 128,
       "column": 3
     }
   },
@@ -368,11 +355,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 133,
+      "line": 129,
       "column": 23
     },
     "end": {
-      "line": 136,
+      "line": 132,
       "column": 3
     }
   },
@@ -381,11 +368,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 137,
+      "line": 133,
       "column": 25
     },
     "end": {
-      "line": 140,
+      "line": 136,
       "column": 3
     }
   },
@@ -394,11 +381,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 141,
+      "line": 137,
       "column": 25
     },
     "end": {
-      "line": 144,
+      "line": 140,
       "column": 3
     }
   },
@@ -407,11 +394,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 145,
+      "line": 141,
       "column": 24
     },
     "end": {
-      "line": 148,
+      "line": 144,
       "column": 3
     }
   },
@@ -420,11 +407,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 149,
+      "line": 145,
       "column": 18
     },
     "end": {
-      "line": 152,
+      "line": 148,
       "column": 3
     }
   },
@@ -433,11 +420,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 153,
+      "line": 149,
       "column": 22
     },
     "end": {
-      "line": 156,
+      "line": 152,
       "column": 3
     }
   },
@@ -446,11 +433,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 157,
+      "line": 153,
       "column": 22
     },
     "end": {
-      "line": 160,
+      "line": 156,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index 08ce743b5..bc1ec7397 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -206,5 +206,31 @@
       "line": 68,
       "column": 3
     }
+  },
+  {
+    "id": "global.settings",
+    "defaultMessage": "!!!Settings",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 69,
+      "column": 12
+    },
+    "end": {
+      "line": 72,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.edit",
+    "defaultMessage": "!!!Edit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 73,
+      "column": 8
+    },
+    "end": {
+      "line": 76,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index ae1a1b448..947ce8b6a 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -649,29 +649,16 @@
       "column": 3
     }
   },
-  {
-    "id": "menu.app.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 234,
-      "column": 12
-    },
-    "end": {
-      "line": 237,
-      "column": 3
-    }
-  },
   {
     "id": "menu.app.checkForUpdates",
     "defaultMessage": "!!!Check for updates",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 238,
+      "line": 234,
       "column": 19
     },
     "end": {
-      "line": 241,
+      "line": 237,
       "column": 3
     }
   },
@@ -680,11 +667,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 242,
+      "line": 238,
       "column": 8
     },
     "end": {
-      "line": 245,
+      "line": 241,
       "column": 3
     }
   },
@@ -693,11 +680,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 246,
+      "line": 242,
       "column": 14
     },
     "end": {
-      "line": 249,
+      "line": 245,
       "column": 3
     }
   },
@@ -706,11 +693,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 250,
+      "line": 246,
       "column": 10
     },
     "end": {
-      "line": 253,
+      "line": 249,
       "column": 3
     }
   },
@@ -719,11 +706,11 @@
     "defaultMessage": "!!!Auto-hide menu bar",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 254,
+      "line": 250,
       "column": 19
     },
     "end": {
-      "line": 257,
+      "line": 253,
       "column": 3
     }
   },
@@ -732,11 +719,11 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 258,
+      "line": 254,
       "column": 17
     },
     "end": {
-      "line": 261,
+      "line": 257,
       "column": 3
     }
   },
@@ -745,11 +732,11 @@
     "defaultMessage": "!!!Add New Workspace...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 262,
+      "line": 258,
       "column": 19
     },
     "end": {
-      "line": 265,
+      "line": 261,
       "column": 3
     }
   },
@@ -758,11 +745,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 266,
+      "line": 262,
       "column": 23
     },
     "end": {
-      "line": 269,
+      "line": 265,
       "column": 3
     }
   },
@@ -771,11 +758,11 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 270,
+      "line": 266,
       "column": 24
     },
     "end": {
-      "line": 273,
+      "line": 269,
       "column": 3
     }
   },
@@ -784,11 +771,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 274,
+      "line": 270,
       "column": 23
     },
     "end": {
-      "line": 277,
+      "line": 273,
       "column": 3
     }
   },
@@ -797,11 +784,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 278,
+      "line": 274,
       "column": 27
     },
     "end": {
-      "line": 281,
+      "line": 277,
       "column": 3
     }
   },
@@ -810,11 +797,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 282,
+      "line": 278,
       "column": 11
     },
     "end": {
-      "line": 285,
+      "line": 281,
       "column": 3
     }
   },
@@ -823,11 +810,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 286,
+      "line": 282,
       "column": 13
     },
     "end": {
-      "line": 289,
+      "line": 285,
       "column": 3
     }
   },
@@ -836,11 +823,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 290,
+      "line": 286,
       "column": 14
     },
     "end": {
-      "line": 293,
+      "line": 289,
       "column": 3
     }
   },
@@ -849,11 +836,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 294,
+      "line": 290,
       "column": 20
     },
     "end": {
-      "line": 297,
+      "line": 293,
       "column": 3
     }
   },
@@ -862,11 +849,11 @@
     "defaultMessage": "!!!Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 298,
+      "line": 294,
       "column": 9
     },
     "end": {
-      "line": 301,
+      "line": 297,
       "column": 3
     }
   },
@@ -875,11 +862,11 @@
     "defaultMessage": "!!!Open Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 302,
+      "line": 298,
       "column": 19
     },
     "end": {
-      "line": 305,
+      "line": 301,
       "column": 3
     }
   },
@@ -888,11 +875,11 @@
     "defaultMessage": "!!!Close Todos drawer",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 306,
+      "line": 302,
       "column": 20
     },
     "end": {
-      "line": 309,
+      "line": 305,
       "column": 3
     }
   },
@@ -901,11 +888,11 @@
     "defaultMessage": "!!!Enable Todos",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 310,
+      "line": 306,
       "column": 15
     },
     "end": {
-      "line": 313,
+      "line": 309,
       "column": 3
     }
   },
@@ -914,11 +901,11 @@
     "defaultMessage": "!!!Home",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 314,
+      "line": 310,
       "column": 17
     },
     "end": {
-      "line": 317,
+      "line": 313,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 3ae9fffbc..2c24b696b 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -231,10 +231,6 @@ const menuItems = defineMessages({
     id: 'menu.app.about',
     defaultMessage: '!!!About Ferdi',
   },
-  settings: {
-    id: 'menu.app.settings',
-    defaultMessage: '!!!Settings',
-  },
   checkForUpdates: {
     id: 'menu.app.checkForUpdates',
     defaultMessage: '!!!Check for updates',
@@ -772,7 +768,7 @@ export default class FranzMenu {
           type: 'separator',
         },
         {
-          label: intl.formatMessage(menuItems.settings),
+          label: intl.formatMessage(globalMessages.settings),
           accelerator: `${settingsShortcutKey()}`,
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
-- 
cgit v1.2.3-70-g09d2