4 files changed, 6 insertions, 20 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