merge-in workspace feature

91 files changed, 3508 insertions, 581 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index dc1d3b6b2..fc525afeb 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -12,6 +12,7 @@ import news from './news';
 import settings from './settings';
 import requests from './requests';
 import announcements from '../features/announcements/actions';
+import workspaces from '../features/workspaces/actions';
 
 const actions = Object.assign({}, {
   service,
@@ -29,4 +30,5 @@ const actions = Object.assign({}, {
 export default Object.assign(
   defineActions(actions, PropTypes.checkPropTypes),
   { announcements },
+  { workspaces },
 );
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
index 6571e9441..2bc7d2711 100644
--- a/src/actions/lib/actions.js
+++ b/src/actions/lib/actions.js
@@ -9,6 +9,10 @@ export const createActionsFromDefinitions = (actionDefinitions, validate) => {
     actions[actionName] = action;
     action.listeners = [];
     action.listen = listener => action.listeners.push(listener);
+    action.off = (listener) => {
+      const { listeners } = action;
+      listeners.splice(listeners.indexOf(listener), 1);
+    };
     action.notify = params => action.listeners.forEach(listener => listener(params));
   });
   return actions;
diff --git a/src/app.js b/src/app.js
index 6660feb46..fb9f1c6ab 100644
--- a/src/app.js
+++ b/src/app.js
@@ -39,6 +39,9 @@ import PricingScreen from './containers/auth/PricingScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
 import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
+import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
+import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
+import { WORKSPACES_ROUTES } from './features/workspaces';
 
 // Add Polyfills
 smoothScroll.polyfill();
@@ -75,6 +78,8 @@ window.addEventListener('load', () => {
                   <Route path="/settings/recipes/:filter" component={RecipesScreen} />
                   <Route path="/settings/services" component={ServicesScreen} />
                   <Route path="/settings/services/:action/:id" component={EditServiceScreen} />
+                  <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} />
+                  <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
                   <Route path="/settings/user" component={AccountScreen} />
                   <Route path="/settings/user/edit" component={EditUserScreen} />
                   <Route path="/settings/app" component={EditSettingsScreen} />
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 2bda91f73..985475c8d 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
+import injectSheet from 'react-jss';
 
 import InfoBar from '../ui/InfoBar';
 import { Component as DelayApp } from '../../features/delayApp';
@@ -14,6 +15,8 @@ import ErrorBoundary from '../util/ErrorBoundary';
 
 import { isWindows } from '../../environment';
 import AnnouncementScreen from '../../features/announcements/Component';
+import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
+import { workspaceStore } from '../../features/workspaces';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -46,10 +49,23 @@ const messages = defineMessages({
   },
 });
 
-export default @observer class AppLayout extends Component {
+const styles = theme => ({
+  appContent: {
+    width: `calc(100% + ${theme.workspaces.drawer.width}px)`,
+    transition: 'transform 0.5s ease',
+    transform() {
+      return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`;
+    },
+  },
+});
+
+@injectSheet(styles) @observer
+class AppLayout extends Component {
   static propTypes = {
+    classes: PropTypes.object.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
+    workspacesDrawer: PropTypes.element.isRequired,
     services: PropTypes.element.isRequired,
     children: PropTypes.element,
     news: MobxPropTypes.arrayOrObservableArray.isRequired,
@@ -78,7 +94,9 @@ export default @observer class AppLayout extends Component {
 
   render() {
     const {
+      classes,
       isFullScreen,
+      workspacesDrawer,
       sidebar,
       services,
       children,
@@ -105,9 +123,11 @@ export default @observer class AppLayout extends Component {
         <div className={(darkMode ? 'theme__dark' : '')}>
           <div className="app">
             {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
-            <div className="app__content">
+            <div className={`app__content ${classes.appContent}`}>
+              {workspacesDrawer}
               {sidebar}
               <div className="app__service">
+                <WorkspaceSwitchingIndicator />
                 {news.length > 0 && news.map(item => (
                   <InfoBar
                     key={item.id}
@@ -180,3 +200,5 @@ export default @observer class AppLayout extends Component {
     );
   }
 }
+
+export default AppLayout;
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 609a3b604..36c1f2e39 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,6 +6,8 @@ import { observer } from 'mobx-react';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces';
+import { gaEvent } from '../../lib/analytics';
 
 const messages = defineMessages({
   settings: {
@@ -24,6 +26,14 @@ const messages = defineMessages({
     id: 'sidebar.unmuteApp',
     defaultMessage: '!!!Enable notifications & audio',
   },
+  openWorkspaceDrawer: {
+    id: 'sidebar.openWorkspaceDrawer',
+    defaultMessage: '!!!Open workspace drawer',
+  },
+  closeWorkspaceDrawer: {
+    id: 'sidebar.closeWorkspaceDrawer',
+    defaultMessage: '!!!Close workspace drawer',
+  },
 });
 
 export default @observer class Sidebar extends Component {
@@ -31,7 +41,9 @@ export default @observer class Sidebar extends Component {
     openSettings: PropTypes.func.isRequired,
     toggleMuteApp: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
-  }
+    isWorkspaceDrawerOpen: PropTypes.bool.isRequired,
+    toggleWorkspaceDrawer: PropTypes.func.isRequired,
+  };
 
   static contextTypes = {
     intl: intlShape,
@@ -53,9 +65,23 @@ export default @observer class Sidebar extends Component {
     this.setState({ tooltipEnabled: false });
   }
 
+  updateToolTip() {
+    this.disableToolTip();
+    setTimeout(this.enableToolTip.bind(this));
+  }
+
   render() {
-    const { openSettings, toggleMuteApp, isAppMuted } = this.props;
+    const {
+      openSettings,
+      toggleMuteApp,
+      isAppMuted,
+      isWorkspaceDrawerOpen,
+      toggleWorkspaceDrawer,
+    } = this.props;
     const { intl } = this.context;
+    const workspaceToggleMessage = (
+      isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer
+    );
 
     return (
       <div className="sidebar">
@@ -64,9 +90,26 @@ export default @observer class Sidebar extends Component {
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
         />
+        {workspaceStore.isFeatureEnabled ? (
+          <button
+            type="button"
+            onClick={() => {
+              toggleWorkspaceDrawer();
+              this.updateToolTip();
+              gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'sidebar');
+            }}
+            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+D)`}
+          >
+            <i className="mdi mdi-view-grid" />
+          </button>
+        ) : null}
         <button
           type="button"
-          onClick={toggleMuteApp}
+          onClick={() => {
+            toggleMuteApp();
+            this.updateToolTip();
+          }}
           className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
           data-tip={`${intl.formatMessage(isAppMuted ? messages.unmute : messages.mute)} (${ctrlKey}+Shift+M)`}
         >
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 5afc54f9d..13148b9b3 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -35,11 +35,13 @@ export default @observer class ServiceView extends Component {
 
   autorunDisposer = null;
 
+  forceRepaintTimeout = null;
+
   componentDidMount() {
     this.autorunDisposer = autorun(() => {
       if (this.props.service.isActive) {
         this.setState({ forceRepaint: true });
-        setTimeout(() => {
+        this.forceRepaintTimeout = setTimeout(() => {
           this.setState({ forceRepaint: false });
         }, 100);
       }
@@ -48,6 +50,7 @@ export default @observer class ServiceView extends Component {
 
   componentWillUnmount() {
     this.autorunDisposer();
+    clearTimeout(this.forceRepaintTimeout);
   }
 
   updateTargetUrl = (event) => {
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index dd5c2140f..5e8260ad0 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -19,7 +19,7 @@ export default @observer class TabBar extends Component {
     updateService: PropTypes.func.isRequired,
     showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
     showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
-  }
+  };
 
   onSortEnd = ({ oldIndex, newIndex }) => {
     const {
@@ -45,7 +45,7 @@ export default @observer class TabBar extends Component {
         redirect: false,
       });
     }
-  }
+  };
 
   disableService({ serviceId }) {
     this.toggleService({ serviceId, isEnabled: false });
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 953f702f8..993b0a44a 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -2,8 +2,11 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 import { inject, observer } from 'mobx-react';
+import { ProBadge } from '@meetfranz/ui';
 
 import Link from '../../ui/Link';
+import { workspaceStore } from '../../../features/workspaces';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   availableServices: {
@@ -14,6 +17,10 @@ const messages = defineMessages({
     id: 'settings.navigation.yourServices',
     defaultMessage: '!!!Your services',
   },
+  yourWorkspaces: {
+    id: 'settings.navigation.yourWorkspaces',
+    defaultMessage: '!!!Your workspaces',
+  },
   account: {
     id: 'settings.navigation.account',
     defaultMessage: '!!!Account',
@@ -34,7 +41,11 @@ const messages = defineMessages({
 
 export default @inject('stores') @observer class SettingsNavigation extends Component {
   static propTypes = {
+    stores: PropTypes.shape({
+      ui: PropTypes.instanceOf(UIStore).isRequired,
+    }).isRequired,
     serviceCount: PropTypes.number.isRequired,
+    workspaceCount: PropTypes.number.isRequired,
   };
 
   static contextTypes = {
@@ -42,7 +53,8 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
   };
 
   render() {
-    const { serviceCount } = this.props;
+    const { serviceCount, workspaceCount, stores } = this.props;
+    const { isDarkThemeActive } = stores.ui;
     const { intl } = this.context;
 
     return (
@@ -63,6 +75,21 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           {' '}
           <span className="badge">{serviceCount}</span>
         </Link>
+        {workspaceStore.isFeatureEnabled ? (
+          <Link
+            to="/settings/workspaces"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+          >
+            {intl.formatMessage(messages.yourWorkspaces)}
+            {' '}
+            {workspaceStore.isPremiumUpgradeRequired ? (
+              <ProBadge inverted={!isDarkThemeActive && workspaceStore.isSettingsRouteActive} />
+            ) : (
+              <span className="badge">{workspaceCount}</span>
+            )}
+          </Link>
+        ) : null}
         <Link
           to="/settings/user"
           className="settings-navigation__link"
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 21616b5de..4ba2eb844 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -341,14 +341,20 @@ export default @observer class EditServiceForm extends Component {
               </div>
             </div>
 
-            <PremiumFeatureContainer condition={isSpellcheckerPremiumFeature}>
+            <PremiumFeatureContainer
+              condition={isSpellcheckerPremiumFeature}
+              gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
+            >
               <div className="settings__settings-group">
                 <Select field={form.$('spellcheckerLanguage')} />
               </div>
             </PremiumFeatureContainer>
 
             {isProxyFeatureEnabled && (
-              <PremiumFeatureContainer condition={isProxyPremiumFeature}>
+              <PremiumFeatureContainer
+                condition={isProxyPremiumFeature}
+                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }}
+              >
                 <div className="settings__settings-group">
                   <h3>
                     {intl.formatMessage(messages.headlineProxy)}
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index a12df7372..53bae12df 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -65,7 +65,7 @@ export default @observer class ServicesDashboard extends Component {
 
   static defaultProps = {
     searchNeedle: '',
-  }
+  };
 
   static contextTypes = {
     intl: intlShape,
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index a92e559f3..8429d0ecb 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -170,6 +170,7 @@ export default @observer class EditSettingsForm extends Component {
             <Select field={form.$('locale')} showLabel={false} />
             <PremiumFeatureContainer
               condition={isSpellcheckerPremiumFeature}
+              gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
             >
               <Fragment>
                 <Toggle
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index 61053f6d1..b0c7fed7b 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -23,11 +23,11 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
   static propTypes = {
     classes: PropTypes.object.isRequired,
     theme: PropTypes.object.isRequired,
-  }
+  };
 
   state = {
     step: 0,
-  }
+  };
 
   interval = null;
 
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index 6ecf4d395..06dab1eb6 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -16,13 +16,13 @@ export default @observer @withTheme @injectSheet(styles) class FullscreenLoader
     theme: PropTypes.object.isRequired,
     spinnerColor: PropTypes.string,
     children: PropTypes.node,
-  }
+  };
 
   static defaultProps = {
     className: null,
     spinnerColor: null,
     children: null,
-  }
+  };
 
   render() {
     const {
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index a33c6474a..0917ee9f0 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -13,6 +13,8 @@ export default @observer class Infobox extends Component {
     ctaLabel: PropTypes.string,
     ctaLoading: PropTypes.bool,
     dismissable: PropTypes.bool,
+    onDismiss: PropTypes.func,
+    onSeen: PropTypes.func,
   };
 
   static defaultProps = {
@@ -22,12 +24,19 @@ export default @observer class Infobox extends Component {
     ctaOnClick: () => null,
     ctaLabel: '',
     ctaLoading: false,
+    onDismiss: () => null,
+    onSeen: () => null,
   };
 
   state = {
     dismissed: false,
   };
 
+  componentDidMount() {
+    const { onSeen } = this.props;
+    if (onSeen) onSeen();
+  }
+
   render() {
     const {
       children,
@@ -37,6 +46,7 @@ export default @observer class Infobox extends Component {
       ctaLoading,
       ctaOnClick,
       dismissable,
+      onDismiss,
     } = this.props;
 
     if (this.state.dismissed) {
@@ -76,9 +86,10 @@ export default @observer class Infobox extends Component {
         {dismissable && (
           <button
             type="button"
-            onClick={() => this.setState({
-              dismissed: true,
-            })}
+            onClick={() => {
+              this.setState({ dismissed: true });
+              if (onDismiss) onDismiss();
+            }}
             className="infobox__delete mdi mdi-close"
           />
         )}
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 67cd6af0b..3c1e0fac3 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -9,6 +9,7 @@ import { oneOrManyChildElements } from '../../../prop-types';
 import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
+import { gaEvent } from '../../../lib/analytics';
 
 const messages = defineMessages({
   action: {
@@ -17,14 +18,21 @@ const messages = defineMessages({
   },
 });
 
-export default @inject('stores', 'actions') @injectSheet(styles) @observer class PremiumFeatureContainer extends Component {
+@inject('stores', 'actions') @injectSheet(styles) @observer
+class PremiumFeatureContainer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     condition: PropTypes.bool,
+    gaEventInfo: PropTypes.shape({
+      category: PropTypes.string.isRequired,
+      event: PropTypes.string.isRequired,
+      label: PropTypes.string,
+    }),
   };
 
   static defaultProps = {
     condition: true,
+    gaEventInfo: null,
   };
 
   static contextTypes = {
@@ -38,6 +46,7 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
       actions,
       condition,
       stores,
+      gaEventInfo,
     } = this.props;
 
     const { intl } = this.context;
@@ -49,7 +58,13 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
           <button
             className={classes.actionButton}
             type="button"
-            onClick={() => actions.ui.openSettings({ path: 'user' })}
+            onClick={() => {
+              actions.ui.openSettings({ path: 'user' });
+              if (gaEventInfo) {
+                const { category, event, label } = gaEventInfo;
+                gaEvent(category, event, label);
+              }
+            }}
           >
             {intl.formatMessage(messages.action)}
           </button>
@@ -73,3 +88,5 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
     }).isRequired,
   }).isRequired,
 };
+
+export default PremiumFeatureContainer;
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
index 81d6666c6..41881e044 100644
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ b/src/components/ui/PremiumFeatureContainer/styles.js
@@ -6,6 +6,7 @@ export default theme => ({
     padding: 20,
     'border-radius': theme.borderRadius,
     pointerEvents: 'none',
+    height: 'auto',
   },
   titleContainer: {
     display: 'flex',
@@ -19,14 +20,14 @@ export default theme => ({
     color: theme.colorSubscriptionContainerActionButtonColor,
     'margin-left': 'auto',
     'border-radius': theme.borderRadiusSmall,
-    padding: [2, 4],
+    padding: [4, 8],
     'font-size': 12,
     pointerEvents: 'initial',
   },
   content: {
     opacity: 0.5,
     'margin-top': 20,
-    '& :last-child': {
+    '& > :last-child': {
       'margin-bottom': 0,
     },
   },
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
new file mode 100644
index 000000000..0b9155a4e
--- /dev/null
+++ b/src/components/ui/ServiceIcon.js
@@ -0,0 +1,67 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+
+import ServiceModel from '../../models/Service';
+
+const styles = theme => ({
+  root: {
+    height: 'auto',
+  },
+  icon: {
+    width: theme.serviceIcon.width,
+  },
+  isCustomIcon: {
+    width: theme.serviceIcon.isCustom.width,
+    border: theme.serviceIcon.isCustom.border,
+    borderRadius: theme.serviceIcon.isCustom.borderRadius,
+  },
+  isDisabled: {
+    filter: 'grayscale(100%)',
+    opacity: '.5',
+  },
+});
+
+@injectSheet(styles) @observer
+class ServiceIcon extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    service: PropTypes.instanceOf(ServiceModel).isRequired,
+    className: PropTypes.string,
+  };
+
+  static defaultProps = {
+    className: '',
+  };
+
+  render() {
+    const {
+      classes,
+      className,
+      service,
+    } = this.props;
+
+    return (
+      <div
+        className={classnames([
+          classes.root,
+          className,
+        ])}
+      >
+        <img
+          src={service.icon}
+          className={classnames([
+            classes.icon,
+            service.isEnabled ? null : classes.isDisabled,
+            service.hasCustomIcon ? classes.isCustomIcon : null,
+          ])}
+          alt=""
+        />
+      </div>
+    );
+  }
+}
+
+export default ServiceIcon;
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 3a3dbbe49..58b6b6f1b 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -2,23 +2,35 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
+import { defineMessages, intlShape } from 'react-intl';
 
 import FullscreenLoader from '../FullscreenLoader';
-
 import styles from './styles';
 
+const messages = defineMessages({
+  loading: {
+    id: 'service.webviewLoader.loading',
+    defaultMessage: '!!!Loading',
+  },
+});
+
 export default @observer @injectSheet(styles) class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
-  }
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
 
   render() {
     const { classes, name } = this.props;
+    const { intl } = this.context;
     return (
       <FullscreenLoader
         className={classes.component}
-        title={`Loading ${name}`}
+        title={`${intl.formatMessage(messages.loading)} ${name}`}
       />
     );
   }
diff --git a/src/config.js b/src/config.js
index 47d22ca7d..e7745b61d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -42,6 +42,8 @@ export const DEFAULT_FEATURES_CONFIG = {
   isServiceProxyEnabled: false,
   isServiceProxyPremiumFeature: true,
   isAnnouncementsEnabled: true,
+  isWorkspacePremiumFeature: true,
+  isWorkspaceEnabled: false,
 };
 
 export const DEFAULT_WINDOW_OPTIONS = {
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index f26e51517..0357f63bd 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -21,6 +21,9 @@ import AppLoader from '../../components/ui/AppLoader';
 
 import { state as delayAppState } from '../../features/delayApp';
 import { announcementsState } from '../../features/announcements/state';
+import { workspaceActions } from '../../features/workspaces/actions';
+import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
+import { workspaceStore } from '../../features/workspaces';
 
 export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component {
   static defaultProps = {
@@ -83,6 +86,15 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
       );
     }
 
+    const workspacesDrawer = (
+      <WorkspaceDrawer
+        getServicesForWorkspace={workspace => (
+          workspace ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) : services.all.map(s => s.name)
+        )}
+        onUpgradeAccountClick={() => openSettings({ path: 'user' })}
+      />
+    );
+
     const sidebar = (
       <Sidebar
         services={services.allDisplayed}
@@ -97,6 +109,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
+        toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer}
+        isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
         showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
@@ -123,6 +137,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
           appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
           sidebar={sidebar}
+          workspacesDrawer={workspacesDrawer}
           services={servicesContainer}
           news={news.latest}
           removeNewsItem={hide}
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 6d9e0ee77..663b9e2e4 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -7,6 +7,7 @@ import ServicesStore from '../../stores/ServicesStore';
 import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { workspaceStore } from '../../features/workspaces';
 
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   render() {
@@ -16,6 +17,7 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
     const navigation = (
       <Navigation
         serviceCount={stores.services.all.length}
+        workspaceCount={workspaceStore.workspaces.length}
       />
     );
 
diff --git a/src/environment.js b/src/environment.js
index 73b1c7ab2..d67fd6adb 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -28,3 +28,4 @@ if (!isDevMode || (isDevMode && useLiveAPI)) {
 }
 
 export const API = api;
+export const API_VERSION = 'v1';
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index ff84510e8..ff0f1f2f8 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -38,7 +38,7 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
 
   state = {
     countdown: config.delayDuration,
-  }
+  };
 
   countdownInterval = null;
 
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index abc8274cf..67f0fc5e6 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -55,7 +55,7 @@ export default function init(stores) {
 
             setVisibility(true);
             gaPage('/delayApp');
-            gaEvent('delayApp', 'show', 'Delay App Feature');
+            gaEvent('DelayApp', 'show', 'Delay App Feature');
 
             timeLastDelay = moment();
             shownAfterLaunch = true;
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index ef43a54fa..8d1d595c5 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -38,7 +38,7 @@ const messages = defineMessages({
   },
   shareTextTwitter: {
     id: 'feature.shareFranz.shareText.twitter',
-    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz',
+    defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger',
   },
 });
 
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 94883ad17..79a2172b4 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -14,8 +14,6 @@ export default function init(stores) {
   autorun(() => {
     const { isSpellcheckerPremiumFeature } = stores.features.features;
 
-    console.log('isSpellcheckerPremiumFeature', isSpellcheckerPremiumFeature);
-
     config.isPremium = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
 
     if (!stores.user.data.isPremium && config.isPremium && stores.settings.app.enableSpellchecking) {
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
new file mode 100644
index 000000000..66b66a104
--- /dev/null
+++ b/src/features/utils/FeatureStore.js
@@ -0,0 +1,21 @@
+import Reaction from '../../stores/lib/Reaction';
+
+export class FeatureStore {
+  _actions = null;
+
+  _reactions = null;
+
+  _listenToActions(actions) {
+    if (this._actions) this._actions.forEach(a => a[0].off(a[1]));
+    this._actions = [];
+    actions.forEach(a => this._actions.push(a));
+    this._actions.forEach(a => a[0].listen(a[1]));
+  }
+
+  _startReactions(reactions) {
+    if (this._reactions) this._reactions.forEach(r => r.stop());
+    this._reactions = [];
+    reactions.forEach(r => this._reactions.push(new Reaction(r)));
+    this._reactions.forEach(r => r.start());
+  }
+}
diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
new file mode 100644
index 000000000..a85f8f57f
--- /dev/null
+++ b/src/features/workspaces/actions.js
@@ -0,0 +1,26 @@
+import PropTypes from 'prop-types';
+import Workspace from './models/Workspace';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+
+export const workspaceActions = createActionsFromDefinitions({
+  edit: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  create: {
+    name: PropTypes.string.isRequired,
+  },
+  delete: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  update: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  activate: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  deactivate: {},
+  toggleWorkspaceDrawer: {},
+  openWorkspaceSettings: {},
+}, PropTypes.checkPropTypes);
+
+export default workspaceActions;
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
new file mode 100644
index 000000000..0ec20c9ea
--- /dev/null
+++ b/src/features/workspaces/api.js
@@ -0,0 +1,66 @@
+import { pick } from 'lodash';
+import { sendAuthRequest } from '../../api/utils/auth';
+import { API, API_VERSION } from '../../environment';
+import Request from '../../stores/lib/Request';
+import Workspace from './models/Workspace';
+
+const debug = require('debug')('Franz:feature:workspaces:api');
+
+export const workspaceApi = {
+  getUserWorkspaces: async () => {
+    const url = `${API}/${API_VERSION}/workspace`;
+    debug('getUserWorkspaces GET', url);
+    const result = await sendAuthRequest(url, { method: 'GET' });
+    debug('getUserWorkspaces RESULT', result);
+    if (!result.ok) throw result;
+    const workspaces = await result.json();
+    return workspaces.map(data => new Workspace(data));
+  },
+
+  createWorkspace: async (name) => {
+    const url = `${API}/${API_VERSION}/workspace`;
+    const options = {
+      method: 'POST',
+      body: JSON.stringify({ name }),
+    };
+    debug('createWorkspace POST', url, options);
+    const result = await sendAuthRequest(url, options);
+    debug('createWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return new Workspace(await result.json());
+  },
+
+  deleteWorkspace: async (workspace) => {
+    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    debug('deleteWorkspace DELETE', url);
+    const result = await sendAuthRequest(url, { method: 'DELETE' });
+    debug('deleteWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return true;
+  },
+
+  updateWorkspace: async (workspace) => {
+    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const options = {
+      method: 'PUT',
+      body: JSON.stringify(pick(workspace, ['name', 'services'])),
+    };
+    debug('updateWorkspace UPDATE', url, options);
+    const result = await sendAuthRequest(url, options);
+    debug('updateWorkspace RESULT', result);
+    if (!result.ok) throw result;
+    return new Workspace(await result.json());
+  },
+};
+
+export const getUserWorkspacesRequest = new Request(workspaceApi, 'getUserWorkspaces');
+export const createWorkspaceRequest = new Request(workspaceApi, 'createWorkspace');
+export const deleteWorkspaceRequest = new Request(workspaceApi, 'deleteWorkspace');
+export const updateWorkspaceRequest = new Request(workspaceApi, 'updateWorkspace');
+
+export const resetApiRequests = () => {
+  getUserWorkspacesRequest.reset();
+  createWorkspaceRequest.reset();
+  deleteWorkspaceRequest.reset();
+  updateWorkspaceRequest.reset();
+};
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
new file mode 100644
index 000000000..2c00ea63c
--- /dev/null
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -0,0 +1,100 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { Input, Button } from '@meetfranz/forms';
+import injectSheet from 'react-jss';
+import Form from '../../../lib/Form';
+import { required } from '../../../helpers/validation-helpers';
+import { gaEvent } from '../../../lib/analytics';
+import { GA_CATEGORY_WORKSPACES } from '../index';
+
+const messages = defineMessages({
+  submitButton: {
+    id: 'settings.workspace.add.form.submitButton',
+    defaultMessage: '!!!Create workspace',
+  },
+  name: {
+    id: 'settings.workspace.add.form.name',
+    defaultMessage: '!!!Name',
+  },
+});
+
+const styles = () => ({
+  form: {
+    display: 'flex',
+  },
+  input: {
+    flexGrow: 1,
+    marginRight: '10px',
+  },
+  submitButton: {
+    height: 'inherit',
+  },
+});
+
+@injectSheet(styles) @observer
+class CreateWorkspaceForm extends Component {
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isSubmitting: PropTypes.bool.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  form = (() => {
+    const { intl } = this.context;
+    return new Form({
+      fields: {
+        name: {
+          label: intl.formatMessage(messages.name),
+          placeholder: intl.formatMessage(messages.name),
+          value: '',
+          validators: [required],
+        },
+      },
+    });
+  })();
+
+  submitForm() {
+    const { form } = this;
+    form.submit({
+      onSuccess: async (f) => {
+        const { onSubmit } = this.props;
+        const values = f.values();
+        onSubmit(values);
+        gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name);
+      },
+    });
+  }
+
+  render() {
+    const { intl } = this.context;
+    const { classes, isSubmitting } = this.props;
+    const { form } = this;
+    return (
+      <div className={classes.form}>
+        <Input
+          className={classes.input}
+          {...form.$('name').bind()}
+          showLabel={false}
+          onEnterKey={this.submitForm.bind(this, form)}
+          focus
+        />
+        <Button
+          className={classes.submitButton}
+          type="submit"
+          label={intl.formatMessage(messages.submitButton)}
+          onClick={this.submitForm.bind(this, form)}
+          busy={isSubmitting}
+          buttonType={isSubmitting ? 'secondary' : 'primary'}
+        />
+      </div>
+    );
+  }
+}
+
+export default CreateWorkspaceForm;
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
new file mode 100644
index 000000000..bba4485ff
--- /dev/null
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -0,0 +1,189 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { Link } from 'react-router';
+import { Input, Button } from '@meetfranz/forms';
+import injectSheet from 'react-jss';
+
+import Workspace from '../models/Workspace';
+import Service from '../../../models/Service';
+import Form from '../../../lib/Form';
+import { required } from '../../../helpers/validation-helpers';
+import WorkspaceServiceListItem from './WorkspaceServiceListItem';
+import Request from '../../../stores/lib/Request';
+import { gaEvent } from '../../../lib/analytics';
+import { GA_CATEGORY_WORKSPACES } from '../index';
+
+const messages = defineMessages({
+  buttonDelete: {
+    id: 'settings.workspace.form.buttonDelete',
+    defaultMessage: '!!!Delete workspace',
+  },
+  buttonSave: {
+    id: 'settings.workspace.form.buttonSave',
+    defaultMessage: '!!!Save workspace',
+  },
+  name: {
+    id: 'settings.workspace.form.name',
+    defaultMessage: '!!!Name',
+  },
+  yourWorkspaces: {
+    id: 'settings.workspace.form.yourWorkspaces',
+    defaultMessage: '!!!Your workspaces',
+  },
+  servicesInWorkspaceHeadline: {
+    id: 'settings.workspace.form.servicesInWorkspaceHeadline',
+    defaultMessage: '!!!Services in this Workspace',
+  },
+});
+
+const styles = () => ({
+  nameInput: {
+    height: 'auto',
+  },
+  serviceList: {
+    height: 'auto',
+  },
+});
+
+@injectSheet(styles) @observer
+class EditWorkspaceForm extends Component {
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    onDelete: PropTypes.func.isRequired,
+    onSave: PropTypes.func.isRequired,
+    services: PropTypes.arrayOf(PropTypes.instanceOf(Service)).isRequired,
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+    updateWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    deleteWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+  };
+
+  form = this.prepareWorkspaceForm(this.props.workspace);
+
+  componentWillReceiveProps(nextProps) {
+    const { workspace } = this.props;
+    if (workspace.id !== nextProps.workspace.id) {
+      this.form = this.prepareWorkspaceForm(nextProps.workspace);
+    }
+  }
+
+  prepareWorkspaceForm(workspace) {
+    const { intl } = this.context;
+    return new Form({
+      fields: {
+        name: {
+          label: intl.formatMessage(messages.name),
+          placeholder: intl.formatMessage(messages.name),
+          value: workspace.name,
+          validators: [required],
+        },
+        services: {
+          value: workspace.services.slice(),
+        },
+      },
+    });
+  }
+
+  save(form) {
+    form.submit({
+      onSuccess: async (f) => {
+        const { onSave } = this.props;
+        const values = f.values();
+        onSave(values);
+        gaEvent(GA_CATEGORY_WORKSPACES, 'save');
+      },
+      onError: async () => {},
+    });
+  }
+
+  delete() {
+    const { onDelete } = this.props;
+    onDelete();
+    gaEvent(GA_CATEGORY_WORKSPACES, 'delete');
+  }
+
+  toggleService(service) {
+    const servicesField = this.form.$('services');
+    const serviceIds = servicesField.value;
+    if (serviceIds.includes(service.id)) {
+      serviceIds.splice(serviceIds.indexOf(service.id), 1);
+    } else {
+      serviceIds.push(service.id);
+    }
+    servicesField.set(serviceIds);
+  }
+
+  render() {
+    const { intl } = this.context;
+    const {
+      classes,
+      workspace,
+      services,
+      deleteWorkspaceRequest,
+      updateWorkspaceRequest,
+    } = this.props;
+    const { form } = this;
+    const workspaceServices = form.$('services').value;
+    const isDeleting = deleteWorkspaceRequest.isExecuting;
+    const isSaving = updateWorkspaceRequest.isExecuting;
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <span className="settings__header-item">
+            <Link to="/settings/workspaces">
+              {intl.formatMessage(messages.yourWorkspaces)}
+            </Link>
+          </span>
+          <span className="separator" />
+          <span className="settings__header-item">
+            {workspace.name}
+          </span>
+        </div>
+        <div className="settings__body">
+          <div className={classes.nameInput}>
+            <Input {...form.$('name').bind()} />
+          </div>
+          <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
+          <div className={classes.serviceList}>
+            {services.map(s => (
+              <WorkspaceServiceListItem
+                key={s.id}
+                service={s}
+                isInWorkspace={workspaceServices.includes(s.id)}
+                onToggle={() => this.toggleService(s)}
+              />
+            ))}
+          </div>
+        </div>
+        <div className="settings__controls">
+          {/* ===== Delete Button ===== */}
+          <Button
+            label={intl.formatMessage(messages.buttonDelete)}
+            loaded={false}
+            busy={isDeleting}
+            buttonType={isDeleting ? 'secondary' : 'danger'}
+            className="settings__delete-button"
+            disabled={isDeleting}
+            onClick={this.delete.bind(this)}
+          />
+          {/* ===== Save Button ===== */}
+          <Button
+            type="submit"
+            label={intl.formatMessage(messages.buttonSave)}
+            busy={isSaving}
+            buttonType={isSaving ? 'secondary' : 'primary'}
+            onClick={this.save.bind(this, form)}
+            disabled={isSaving}
+          />
+        </div>
+      </div>
+    );
+  }
+}
+
+export default EditWorkspaceForm;
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
new file mode 100644
index 000000000..684e50dd0
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -0,0 +1,246 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
+import { H1, Icon, ProBadge } from '@meetfranz/ui';
+import { Button } from '@meetfranz/forms/lib';
+import ReactTooltip from 'react-tooltip';
+
+import WorkspaceDrawerItem from './WorkspaceDrawerItem';
+import { workspaceActions } from '../actions';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { gaEvent } from '../../../lib/analytics';
+
+const messages = defineMessages({
+  headline: {
+    id: 'workspaceDrawer.headline',
+    defaultMessage: '!!!Workspaces',
+  },
+  allServices: {
+    id: 'workspaceDrawer.allServices',
+    defaultMessage: '!!!All services',
+  },
+  workspacesSettingsTooltip: {
+    id: 'workspaceDrawer.workspacesSettingsTooltip',
+    defaultMessage: '!!!Workspaces settings',
+  },
+  workspaceFeatureInfo: {
+    id: 'workspaceDrawer.workspaceFeatureInfo',
+    defaultMessage: '!!!Info about workspace feature',
+  },
+  premiumCtaButtonLabel: {
+    id: 'workspaceDrawer.premiumCtaButtonLabel',
+    defaultMessage: '!!!Create your first workspace',
+  },
+  reactivatePremiumAccount: {
+    id: 'workspaceDrawer.reactivatePremiumAccountLabel',
+    defaultMessage: '!!!Reactivate premium account',
+  },
+  addNewWorkspaceLabel: {
+    id: 'workspaceDrawer.addNewWorkspaceLabel',
+    defaultMessage: '!!!add new workspace',
+  },
+  premiumFeatureBadge: {
+    id: 'workspaceDrawer.proFeatureBadge',
+    defaultMessage: '!!!Premium feature',
+  },
+});
+
+const styles = theme => ({
+  drawer: {
+    background: theme.workspaces.drawer.background,
+    width: `${theme.workspaces.drawer.width}px`,
+  },
+  headline: {
+    fontSize: '24px',
+    marginTop: '38px',
+    marginBottom: '25px',
+    marginLeft: theme.workspaces.drawer.padding,
+  },
+  headlineProBadge: {
+    marginRight: 15,
+  },
+  workspacesSettingsButton: {
+    float: 'right',
+    marginRight: theme.workspaces.drawer.padding,
+    marginTop: '2px',
+  },
+  workspacesSettingsButtonIcon: {
+    fill: theme.workspaces.drawer.buttons.color,
+    '&:hover': {
+      fill: theme.workspaces.drawer.buttons.hoverColor,
+    },
+  },
+  workspaces: {
+    height: 'auto',
+  },
+  premiumAnnouncement: {
+    padding: '20px',
+    paddingTop: '0',
+    height: 'auto',
+  },
+  premiumCtaButton: {
+    marginTop: '20px',
+    width: '100%',
+    color: 'white !important',
+  },
+  addNewWorkspaceLabel: {
+    height: 'auto',
+    color: theme.workspaces.drawer.buttons.color,
+    marginTop: 40,
+    textAlign: 'center',
+    '& > svg': {
+      fill: theme.workspaces.drawer.buttons.color,
+    },
+    '& > span': {
+      fontSize: '13px',
+      marginLeft: 10,
+      position: 'relative',
+      top: -3,
+    },
+    '&:hover': {
+      color: theme.workspaces.drawer.buttons.hoverColor,
+      '& > svg': {
+        fill: theme.workspaces.drawer.buttons.hoverColor,
+      },
+    },
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceDrawer extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    getServicesForWorkspace: PropTypes.func.isRequired,
+    onUpgradeAccountClick: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  componentDidMount() {
+    ReactTooltip.rebuild();
+  }
+
+  render() {
+    const {
+      classes,
+      getServicesForWorkspace,
+      onUpgradeAccountClick,
+    } = this.props;
+    const { intl } = this.context;
+    const {
+      activeWorkspace,
+      isSwitchingWorkspace,
+      nextWorkspace,
+      workspaces,
+    } = workspaceStore;
+    const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace;
+    return (
+      <div className={classes.drawer}>
+        <H1 className={classes.headline}>
+          {workspaceStore.isPremiumUpgradeRequired && (
+            <span
+              className={classes.headlineProBadge}
+              data-tip={`${intl.formatMessage(messages.premiumFeatureBadge)}`}
+            >
+              <ProBadge />
+            </span>
+          )}
+          {intl.formatMessage(messages.headline)}
+          <span
+            className={classes.workspacesSettingsButton}
+            onClick={() => {
+              workspaceActions.openWorkspaceSettings();
+              gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline');
+            }}
+            data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
+          >
+            <Icon
+              icon="mdiSettings"
+              size={1.5}
+              className={classes.workspacesSettingsButtonIcon}
+            />
+          </span>
+        </H1>
+        {workspaceStore.isPremiumUpgradeRequired ? (
+          <div className={classes.premiumAnnouncement}>
+            <FormattedHTMLMessage {...messages.workspaceFeatureInfo} />
+            {workspaceStore.userHasWorkspaces ? (
+              <Button
+                className={classes.premiumCtaButton}
+                buttonType="primary"
+                label={intl.formatMessage(messages.reactivatePremiumAccount)}
+                icon="mdiStar"
+                onClick={() => {
+                  onUpgradeAccountClick();
+                  gaEvent('User', 'upgrade', 'workspaceDrawer');
+                }}
+              />
+            ) : (
+              <Button
+                className={classes.premiumCtaButton}
+                buttonType="primary"
+                label={intl.formatMessage(messages.premiumCtaButtonLabel)}
+                icon="mdiPlusBox"
+                onClick={() => {
+                  workspaceActions.openWorkspaceSettings();
+                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
+                }}
+              />
+            )}
+          </div>
+        ) : (
+          <div className={classes.workspaces}>
+            <WorkspaceDrawerItem
+              name={intl.formatMessage(messages.allServices)}
+              onClick={() => {
+                workspaceActions.deactivate();
+                workspaceActions.toggleWorkspaceDrawer();
+                gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
+              }}
+              services={getServicesForWorkspace(null)}
+              isActive={actualWorkspace == null}
+            />
+            {workspaces.map(workspace => (
+              <WorkspaceDrawerItem
+                key={workspace.id}
+                name={workspace.name}
+                isActive={actualWorkspace === workspace}
+                onClick={() => {
+                  if (actualWorkspace === workspace) return;
+                  workspaceActions.activate({ workspace });
+                  workspaceActions.toggleWorkspaceDrawer();
+                  gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
+                }}
+                onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
+                services={getServicesForWorkspace(workspace)}
+              />
+            ))}
+            <div
+              className={classes.addNewWorkspaceLabel}
+              onClick={() => {
+                workspaceActions.openWorkspaceSettings();
+                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel');
+              }}
+            >
+              <Icon
+                icon="mdiPlusBox"
+                size={1}
+                className={classes.workspacesSettingsButtonIcon}
+              />
+              <span>
+                {intl.formatMessage(messages.addNewWorkspaceLabel)}
+              </span>
+            </div>
+          </div>
+        )}
+        <ReactTooltip place="right" type="dark" effect="solid" />
+      </div>
+    );
+  }
+}
+
+export default WorkspaceDrawer;
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js
new file mode 100644
index 000000000..59a2144d3
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.js
@@ -0,0 +1,137 @@
+import { remote } from 'electron';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { defineMessages, intlShape } from 'react-intl';
+
+const { Menu } = remote;
+
+const messages = defineMessages({
+  noServicesAddedYet: {
+    id: 'workspaceDrawer.item.noServicesAddedYet',
+    defaultMessage: '!!!No services added yet',
+  },
+  contextMenuEdit: {
+    id: 'workspaceDrawer.item.contextMenuEdit',
+    defaultMessage: '!!!edit',
+  },
+});
+
+const styles = theme => ({
+  item: {
+    height: '67px',
+    padding: `15px ${theme.workspaces.drawer.padding}px`,
+    borderBottom: `1px solid ${theme.workspaces.drawer.listItem.border}`,
+    transition: 'background-color 300ms ease-out',
+    '&:first-child': {
+      borderTop: `1px solid ${theme.workspaces.drawer.listItem.border}`,
+    },
+    '&:hover': {
+      backgroundColor: theme.workspaces.drawer.listItem.hoverBackground,
+    },
+  },
+  isActiveItem: {
+    backgroundColor: theme.workspaces.drawer.listItem.activeBackground,
+    '&:hover': {
+      backgroundColor: theme.workspaces.drawer.listItem.activeBackground,
+    },
+  },
+  name: {
+    marginTop: '4px',
+    color: theme.workspaces.drawer.listItem.name.color,
+  },
+  activeName: {
+    color: theme.workspaces.drawer.listItem.name.activeColor,
+  },
+  services: {
+    display: 'block',
+    fontSize: '11px',
+    marginTop: '5px',
+    color: theme.workspaces.drawer.listItem.services.color,
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis',
+    overflow: 'hidden',
+    lineHeight: '15px',
+  },
+  activeServices: {
+    color: theme.workspaces.drawer.listItem.services.active,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceDrawerItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isActive: PropTypes.bool.isRequired,
+    name: PropTypes.string.isRequired,
+    onClick: PropTypes.func.isRequired,
+    services: PropTypes.arrayOf(PropTypes.string).isRequired,
+    onContextMenuEditClick: PropTypes.func,
+  };
+
+  static defaultProps = {
+    onContextMenuEditClick: null,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      classes,
+      isActive,
+      name,
+      onClick,
+      onContextMenuEditClick,
+      services,
+    } = this.props;
+    const { intl } = this.context;
+
+    const contextMenuTemplate = [{
+      label: name,
+      enabled: false,
+    }, {
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(messages.contextMenuEdit),
+      click: onContextMenuEditClick,
+    }];
+
+    const contextMenu = Menu.buildFromTemplate(contextMenuTemplate);
+
+    return (
+      <div
+        className={classnames([
+          classes.item,
+          isActive ? classes.isActiveItem : null,
+        ])}
+        onClick={onClick}
+        onContextMenu={() => (
+          onContextMenuEditClick && contextMenu.popup(remote.getCurrentWindow())
+        )}
+      >
+        <span
+          className={classnames([
+            classes.name,
+            isActive ? classes.activeName : null,
+          ])}
+        >
+          {name}
+        </span>
+        <span
+          className={classnames([
+            classes.services,
+            isActive ? classes.activeServices : null,
+          ])}
+        >
+          {services.length ? services.join(', ') : intl.formatMessage(messages.noServicesAddedYet)}
+        </span>
+      </div>
+    );
+  }
+}
+
+export default WorkspaceDrawerItem;
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
new file mode 100644
index 000000000..cc4b1a3ba
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -0,0 +1,45 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { intlShape } from 'react-intl';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+
+import Workspace from '../models/Workspace';
+
+const styles = theme => ({
+  row: {
+    height: theme.workspaces.settings.listItems.height,
+    borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
+    '&:hover': {
+      background: theme.workspaces.settings.listItems.hoverBgColor,
+    },
+  },
+  columnName: {},
+});
+
+@injectSheet(styles) @observer
+class WorkspaceItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+    onItemClick: PropTypes.func.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, workspace, onItemClick } = this.props;
+
+    return (
+      <tr className={classes.row}>
+        <td onClick={() => onItemClick(workspace)}>
+          {workspace.name}
+        </td>
+      </tr>
+    );
+  }
+}
+
+export default WorkspaceItem;
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.js b/src/features/workspaces/components/WorkspaceServiceListItem.js
new file mode 100644
index 000000000..e05b21440
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.js
@@ -0,0 +1,75 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { Toggle } from '@meetfranz/forms';
+
+import Service from '../../../models/Service';
+import ServiceIcon from '../../../components/ui/ServiceIcon';
+
+const styles = theme => ({
+  listItem: {
+    height: theme.workspaces.settings.listItems.height,
+    borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
+    display: 'flex',
+    alignItems: 'center',
+  },
+  serviceIcon: {
+    padding: theme.workspaces.settings.listItems.padding,
+  },
+  toggle: {
+    height: 'auto',
+    margin: 0,
+  },
+  label: {
+    padding: theme.workspaces.settings.listItems.padding,
+    flexGrow: 1,
+  },
+  disabledLabel: {
+    color: theme.workspaces.settings.listItems.disabled.color,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceServiceListItem extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    isInWorkspace: PropTypes.bool.isRequired,
+    onToggle: PropTypes.func.isRequired,
+    service: PropTypes.instanceOf(Service).isRequired,
+  };
+
+  render() {
+    const {
+      classes,
+      isInWorkspace,
+      onToggle,
+      service,
+    } = this.props;
+
+    return (
+      <div className={classes.listItem}>
+        <ServiceIcon
+          className={classes.serviceIcon}
+          service={service}
+        />
+        <span
+          className={classnames([
+            classes.label,
+            service.isEnabled ? null : classes.disabledLabel,
+          ])}
+        >
+          {service.name}
+        </span>
+        <Toggle
+          className={classes.toggle}
+          checked={isInWorkspace}
+          onChange={onToggle}
+        />
+      </div>
+    );
+  }
+}
+
+export default WorkspaceServiceListItem;
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
new file mode 100644
index 000000000..c4a800a7b
--- /dev/null
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -0,0 +1,91 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+import { Loader } from '@meetfranz/ui';
+import { defineMessages, intlShape } from 'react-intl';
+
+import { workspaceStore } from '../index';
+
+const messages = defineMessages({
+  switchingTo: {
+    id: 'workspaces.switchingIndicator.switchingTo',
+    defaultMessage: '!!!Switching to',
+  },
+});
+
+const styles = theme => ({
+  wrapper: {
+    display: 'flex',
+    alignItems: 'flex-start',
+    position: 'absolute',
+    transition: 'width 0.5s ease',
+    width: '100%',
+    marginTop: '20px',
+  },
+  wrapperWhenDrawerIsOpen: {
+    width: `calc(100% - ${theme.workspaces.drawer.width}px)`,
+  },
+  component: {
+    background: 'rgba(20, 20, 20, 0.4)',
+    padding: '10px 20px',
+    display: 'flex',
+    width: 'auto',
+    height: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+    alignItems: 'center',
+    zIndex: 200,
+  },
+  spinner: {
+    width: 40,
+    height: 40,
+    marginRight: 10,
+  },
+  message: {
+    fontSize: 16,
+    whiteSpace: 'nowrap',
+    color: theme.colorAppLoaderSpinner,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspaceSwitchingIndicator extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, theme } = this.props;
+    const { intl } = this.context;
+    const { isSwitchingWorkspace, isWorkspaceDrawerOpen, nextWorkspace } = workspaceStore;
+    if (!isSwitchingWorkspace) return null;
+    const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services';
+    return (
+      <div
+        className={classnames([
+          classes.wrapper,
+          isWorkspaceDrawerOpen ? classes.wrapperWhenDrawerIsOpen : null,
+        ])}
+      >
+        <div className={classes.component}>
+          <Loader
+            className={classes.spinner}
+            color={theme.workspaces.switchingIndicator.spinnerColor}
+          />
+          <p className={classes.message}>
+            {`${intl.formatMessage(messages.switchingTo)} ${nextWorkspaceName}`}
+          </p>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default WorkspaceSwitchingIndicator;
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
new file mode 100644
index 000000000..dd4381a15
--- /dev/null
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -0,0 +1,195 @@
+import React, { Component, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+import { Infobox } from '@meetfranz/ui';
+
+import Loader from '../../../components/ui/Loader';
+import WorkspaceItem from './WorkspaceItem';
+import CreateWorkspaceForm from './CreateWorkspaceForm';
+import Request from '../../../stores/lib/Request';
+import Appear from '../../../components/ui/effects/Appear';
+import { workspaceStore } from '../index';
+import PremiumFeatureContainer from '../../../components/ui/PremiumFeatureContainer';
+
+const messages = defineMessages({
+  headline: {
+    id: 'settings.workspaces.headline',
+    defaultMessage: '!!!Your workspaces',
+  },
+  noServicesAdded: {
+    id: 'settings.workspaces.noWorkspacesAdded',
+    defaultMessage: '!!!You haven\'t added any workspaces yet.',
+  },
+  workspacesRequestFailed: {
+    id: 'settings.workspaces.workspacesRequestFailed',
+    defaultMessage: '!!!Could not load your workspaces',
+  },
+  tryReloadWorkspaces: {
+    id: 'settings.workspaces.tryReloadWorkspaces',
+    defaultMessage: '!!!Try again',
+  },
+  updatedInfo: {
+    id: 'settings.workspaces.updatedInfo',
+    defaultMessage: '!!!Your changes have been saved',
+  },
+  deletedInfo: {
+    id: 'settings.workspaces.deletedInfo',
+    defaultMessage: '!!!Workspace has been deleted',
+  },
+  workspaceFeatureInfo: {
+    id: 'settings.workspaces.workspaceFeatureInfo',
+    defaultMessage: '!!!Info about workspace feature',
+  },
+  workspaceFeatureHeadline: {
+    id: 'settings.workspaces.workspaceFeatureHeadline',
+    defaultMessage: '!!!Less is More: Introducing Franz Workspaces',
+  },
+});
+
+const styles = theme => ({
+  table: {
+    width: '100%',
+    '& td': {
+      padding: '10px',
+    },
+  },
+  createForm: {
+    height: 'auto',
+  },
+  appear: {
+    height: 'auto',
+  },
+  premiumAnnouncement: {
+    padding: '20px',
+    backgroundColor: '#3498db',
+    marginLeft: '-20px',
+    marginBottom: '20px',
+    height: 'auto',
+    color: 'white',
+    borderRadius: theme.borderRadius,
+  },
+});
+
+@injectSheet(styles) @observer
+class WorkspacesDashboard extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    getUserWorkspacesRequest: PropTypes.instanceOf(Request).isRequired,
+    createWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    deleteWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    updateWorkspaceRequest: PropTypes.instanceOf(Request).isRequired,
+    onCreateWorkspaceSubmit: PropTypes.func.isRequired,
+    onWorkspaceClick: PropTypes.func.isRequired,
+    workspaces: MobxPropTypes.arrayOrObservableArray.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      classes,
+      getUserWorkspacesRequest,
+      createWorkspaceRequest,
+      deleteWorkspaceRequest,
+      updateWorkspaceRequest,
+      onCreateWorkspaceSubmit,
+      onWorkspaceClick,
+      workspaces,
+    } = this.props;
+    const { intl } = this.context;
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <h1>{intl.formatMessage(messages.headline)}</h1>
+        </div>
+        <div className="settings__body">
+
+          {/* ===== Workspace updated info ===== */}
+          {updateWorkspaceRequest.wasExecuted && updateWorkspaceRequest.result && (
+            <Appear className={classes.appear}>
+              <Infobox
+                type="success"
+                icon="mdiCheckboxMarkedCircleOutline"
+                dismissable
+                onUnmount={updateWorkspaceRequest.reset}
+              >
+                {intl.formatMessage(messages.updatedInfo)}
+              </Infobox>
+            </Appear>
+          )}
+
+          {/* ===== Workspace deleted info ===== */}
+          {deleteWorkspaceRequest.wasExecuted && deleteWorkspaceRequest.result && (
+            <Appear className={classes.appear}>
+              <Infobox
+                type="success"
+                icon="mdiCheckboxMarkedCircleOutline"
+                dismissable
+                onUnmount={deleteWorkspaceRequest.reset}
+              >
+                {intl.formatMessage(messages.deletedInfo)}
+              </Infobox>
+            </Appear>
+          )}
+
+          {workspaceStore.isPremiumUpgradeRequired && (
+            <div className={classes.premiumAnnouncement}>
+              <h2>{intl.formatMessage(messages.workspaceFeatureHeadline)}</h2>
+              <p>{intl.formatMessage(messages.workspaceFeatureInfo)}</p>
+            </div>
+          )}
+
+          <PremiumFeatureContainer
+            condition={workspaceStore.isPremiumFeature}
+            gaEventInfo={{ category: 'User', event: 'upgrade', label: 'workspaces' }}
+          >
+            {/* ===== Create workspace form ===== */}
+            <div className={classes.createForm}>
+              <CreateWorkspaceForm
+                isSubmitting={createWorkspaceRequest.isExecuting}
+                onSubmit={onCreateWorkspaceSubmit}
+              />
+            </div>
+            {getUserWorkspacesRequest.isExecuting ? (
+              <Loader />
+            ) : (
+              <Fragment>
+                {/* ===== Workspace could not be loaded error ===== */}
+                {getUserWorkspacesRequest.error ? (
+                  <Infobox
+                    icon="alert"
+                    type="danger"
+                    ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
+                    ctaLoading={getUserWorkspacesRequest.isExecuting}
+                    ctaOnClick={getUserWorkspacesRequest.retry}
+                  >
+                    {intl.formatMessage(messages.workspacesRequestFailed)}
+                  </Infobox>
+                ) : (
+                  <table className={classes.table}>
+                    {/* ===== Workspaces list ===== */}
+                    <tbody>
+                      {workspaces.map(workspace => (
+                        <WorkspaceItem
+                          key={workspace.id}
+                          workspace={workspace}
+                          onItemClick={w => onWorkspaceClick(w)}
+                        />
+                      ))}
+                    </tbody>
+                  </table>
+                )}
+              </Fragment>
+            )}
+          </PremiumFeatureContainer>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default WorkspacesDashboard;
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
new file mode 100644
index 000000000..248b40131
--- /dev/null
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -0,0 +1,60 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import EditWorkspaceForm from '../components/EditWorkspaceForm';
+import ServicesStore from '../../../stores/ServicesStore';
+import Workspace from '../models/Workspace';
+import { workspaceStore } from '../index';
+import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
+
+@inject('stores', 'actions') @observer
+class EditWorkspaceScreen extends Component {
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        delete: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+    stores: PropTypes.shape({
+      services: PropTypes.instanceOf(ServicesStore).isRequired,
+    }).isRequired,
+  };
+
+  onDelete = () => {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { actions } = this.props;
+    if (!workspaceBeingEdited) return null;
+    actions.workspaces.delete({ workspace: workspaceBeingEdited });
+  };
+
+  onSave = (values) => {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { actions } = this.props;
+    const workspace = new Workspace(
+      Object.assign({}, workspaceBeingEdited, values),
+    );
+    actions.workspaces.update({ workspace });
+  };
+
+  render() {
+    const { workspaceBeingEdited } = workspaceStore;
+    const { stores } = this.props;
+    if (!workspaceBeingEdited) return null;
+    return (
+      <ErrorBoundary>
+        <EditWorkspaceForm
+          workspace={workspaceBeingEdited}
+          services={stores.services.all}
+          onDelete={this.onDelete}
+          onSave={this.onSave}
+          updateWorkspaceRequest={updateWorkspaceRequest}
+          deleteWorkspaceRequest={deleteWorkspaceRequest}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default EditWorkspaceScreen;
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
new file mode 100644
index 000000000..2ab565fa1
--- /dev/null
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+import PropTypes from 'prop-types';
+import WorkspacesDashboard from '../components/WorkspacesDashboard';
+import ErrorBoundary from '../../../components/util/ErrorBoundary';
+import { workspaceStore } from '../index';
+import {
+  createWorkspaceRequest,
+  deleteWorkspaceRequest,
+  getUserWorkspacesRequest,
+  updateWorkspaceRequest,
+} from '../api';
+
+@inject('actions') @observer
+class WorkspacesScreen extends Component {
+  static propTypes = {
+    actions: PropTypes.shape({
+      workspace: PropTypes.shape({
+        edit: PropTypes.func.isRequired,
+      }),
+    }).isRequired,
+  };
+
+  render() {
+    const { actions } = this.props;
+    return (
+      <ErrorBoundary>
+        <WorkspacesDashboard
+          workspaces={workspaceStore.workspaces}
+          getUserWorkspacesRequest={getUserWorkspacesRequest}
+          createWorkspaceRequest={createWorkspaceRequest}
+          deleteWorkspaceRequest={deleteWorkspaceRequest}
+          updateWorkspaceRequest={updateWorkspaceRequest}
+          onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
+          onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+export default WorkspacesScreen;
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
new file mode 100644
index 000000000..ad9023b8b
--- /dev/null
+++ b/src/features/workspaces/index.js
@@ -0,0 +1,37 @@
+import { reaction } from 'mobx';
+import WorkspacesStore from './store';
+import { resetApiRequests } from './api';
+
+const debug = require('debug')('Franz:feature:workspaces');
+
+export const GA_CATEGORY_WORKSPACES = 'Workspaces';
+
+export const workspaceStore = new WorkspacesStore();
+
+export default function initWorkspaces(stores, actions) {
+  stores.workspaces = workspaceStore;
+  const { features } = stores;
+
+  // Toggle workspace feature
+  reaction(
+    () => features.features.isWorkspaceEnabled,
+    (isEnabled) => {
+      if (isEnabled && !workspaceStore.isFeatureActive) {
+        debug('Initializing `workspaces` feature');
+        workspaceStore.start(stores, actions);
+      } else if (workspaceStore.isFeatureActive) {
+        debug('Disabling `workspaces` feature');
+        workspaceStore.stop();
+        resetApiRequests();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
+
+export const WORKSPACES_ROUTES = {
+  ROOT: '/settings/workspaces',
+  EDIT: '/settings/workspaces/:action/:id',
+};
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
new file mode 100644
index 000000000..6c73d7095
--- /dev/null
+++ b/src/features/workspaces/models/Workspace.js
@@ -0,0 +1,25 @@
+import { observable } from 'mobx';
+
+export default class Workspace {
+  id = null;
+
+  @observable name = null;
+
+  @observable order = null;
+
+  @observable services = [];
+
+  @observable userId = null;
+
+  constructor(data) {
+    if (!data.id) {
+      throw Error('Workspace requires Id');
+    }
+
+    this.id = data.id;
+    this.name = data.name;
+    this.order = data.order;
+    this.services.replace(data.services);
+    this.userId = data.userId;
+  }
+}
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
new file mode 100644
index 000000000..ea601700e
--- /dev/null
+++ b/src/features/workspaces/store.js
@@ -0,0 +1,276 @@
+import {
+  computed,
+  observable,
+  action,
+} from 'mobx';
+import localStorage from 'mobx-localstorage';
+import { matchRoute } from '../../helpers/routing-helpers';
+import { workspaceActions } from './actions';
+import { FeatureStore } from '../utils/FeatureStore';
+import {
+  createWorkspaceRequest,
+  deleteWorkspaceRequest,
+  getUserWorkspacesRequest,
+  updateWorkspaceRequest,
+} from './api';
+import { WORKSPACES_ROUTES } from './index';
+
+const debug = require('debug')('Franz:feature:workspaces:store');
+
+export default class WorkspacesStore extends FeatureStore {
+  @observable isFeatureEnabled = false;
+
+  @observable isFeatureActive = false;
+
+  @observable isPremiumFeature = true;
+
+  @observable isPremiumUpgradeRequired = true;
+
+  @observable activeWorkspace = null;
+
+  @observable nextWorkspace = null;
+
+  @observable workspaceBeingEdited = null;
+
+  @observable isSwitchingWorkspace = false;
+
+  @observable isWorkspaceDrawerOpen = false;
+
+  @observable isSettingsRouteActive = null;
+
+  @computed get workspaces() {
+    if (!this.isFeatureActive) return [];
+    return getUserWorkspacesRequest.result || [];
+  }
+
+  @computed get settings() {
+    return localStorage.getItem('workspaces') || {};
+  }
+
+  @computed get userHasWorkspaces() {
+    return getUserWorkspacesRequest.wasExecuted && this.workspaces.length > 0;
+  }
+
+  start(stores, actions) {
+    debug('WorkspacesStore::start');
+    this.stores = stores;
+    this.actions = actions;
+
+    this._listenToActions([
+      [workspaceActions.edit, this._edit],
+      [workspaceActions.create, this._create],
+      [workspaceActions.delete, this._delete],
+      [workspaceActions.update, this._update],
+      [workspaceActions.activate, this._setActiveWorkspace],
+      [workspaceActions.deactivate, this._deactivateActiveWorkspace],
+      [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
+      [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
+    ]);
+
+    this._startReactions([
+      this._setWorkspaceBeingEditedReaction,
+      this._setActiveServiceOnWorkspaceSwitchReaction,
+      this._setFeatureEnabledReaction,
+      this._setIsPremiumFeatureReaction,
+      this._activateLastUsedWorkspaceReaction,
+      this._openDrawerWithSettingsReaction,
+      this._cleanupInvalidServiceReferences,
+    ]);
+
+    getUserWorkspacesRequest.execute();
+    this.isFeatureActive = true;
+  }
+
+  stop() {
+    debug('WorkspacesStore::stop');
+    this.isFeatureActive = false;
+    this.activeWorkspace = null;
+    this.nextWorkspace = null;
+    this.workspaceBeingEdited = null;
+    this.isSwitchingWorkspace = false;
+    this.isWorkspaceDrawerOpen = false;
+  }
+
+  filterServicesByActiveWorkspace = (services) => {
+    const { activeWorkspace, isFeatureActive } = this;
+    if (isFeatureActive && activeWorkspace) {
+      return this.getWorkspaceServices(activeWorkspace);
+    }
+    return services;
+  };
+
+  getWorkspaceServices(workspace) {
+    const { services } = this.stores;
+    return workspace.services.map(id => services.one(id)).filter(s => !!s);
+  }
+
+  // ========== PRIVATE ========= //
+
+  _wasDrawerOpenBeforeSettingsRoute = null;
+
+  _getWorkspaceById = id => this.workspaces.find(w => w.id === id);
+
+  _updateSettings = (changes) => {
+    localStorage.setItem('workspaces', {
+      ...this.settings,
+      ...changes,
+    });
+  };
+
+  // Actions
+
+  @action _edit = ({ workspace }) => {
+    this.stores.router.push(`/settings/workspaces/edit/${workspace.id}`);
+  };
+
+  @action _create = async ({ name }) => {
+    try {
+      const workspace = await createWorkspaceRequest.execute(name);
+      await getUserWorkspacesRequest.result.push(workspace);
+      this._edit({ workspace });
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _delete = async ({ workspace }) => {
+    try {
+      await deleteWorkspaceRequest.execute(workspace);
+      await getUserWorkspacesRequest.result.remove(workspace);
+      this.stores.router.push('/settings/workspaces');
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _update = async ({ workspace }) => {
+    try {
+      await updateWorkspaceRequest.execute(workspace);
+      // Path local result optimistically
+      const localWorkspace = this._getWorkspaceById(workspace.id);
+      Object.assign(localWorkspace, workspace);
+      this.stores.router.push('/settings/workspaces');
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  @action _setActiveWorkspace = ({ workspace }) => {
+    // Indicate that we are switching to another workspace
+    this.isSwitchingWorkspace = true;
+    this.nextWorkspace = workspace;
+    // Delay switching to next workspace so that the services loading does not drag down UI
+    setTimeout(() => {
+      this.activeWorkspace = workspace;
+      this._updateSettings({ lastActiveWorkspace: workspace.id });
+    }, 100);
+    // Indicate that we are done switching to the next workspace
+    setTimeout(() => {
+      this.isSwitchingWorkspace = false;
+      this.nextWorkspace = null;
+    }, 1000);
+  };
+
+  @action _deactivateActiveWorkspace = () => {
+    // Indicate that we are switching to default workspace
+    this.isSwitchingWorkspace = true;
+    this.nextWorkspace = null;
+    this._updateSettings({ lastActiveWorkspace: null });
+    // Delay switching to next workspace so that the services loading does not drag down UI
+    setTimeout(() => {
+      this.activeWorkspace = null;
+    }, 100);
+    // Indicate that we are done switching to the default workspace
+    setTimeout(() => { this.isSwitchingWorkspace = false; }, 1000);
+  };
+
+  @action _toggleWorkspaceDrawer = () => {
+    this.isWorkspaceDrawerOpen = !this.isWorkspaceDrawerOpen;
+  };
+
+  @action _openWorkspaceSettings = () => {
+    this.actions.ui.openSettings({ path: 'workspaces' });
+  };
+
+  // Reactions
+
+  _setFeatureEnabledReaction = () => {
+    const { isWorkspaceEnabled } = this.stores.features.features;
+    this.isFeatureEnabled = isWorkspaceEnabled;
+  };
+
+  _setIsPremiumFeatureReaction = () => {
+    const { features, user } = this.stores;
+    const { isPremium } = user.data;
+    const { isWorkspacePremiumFeature } = features.features;
+    this.isPremiumFeature = isWorkspacePremiumFeature;
+    this.isPremiumUpgradeRequired = isWorkspacePremiumFeature && !isPremium;
+  };
+
+  _setWorkspaceBeingEditedReaction = () => {
+    const { pathname } = this.stores.router.location;
+    const match = matchRoute('/settings/workspaces/edit/:id', pathname);
+    if (match) {
+      this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+    }
+  };
+
+  _setActiveServiceOnWorkspaceSwitchReaction = () => {
+    if (!this.isFeatureActive) return;
+    if (this.activeWorkspace) {
+      const services = this.stores.services.allDisplayed;
+      const activeService = services.find(s => s.isActive);
+      const workspaceServices = this.getWorkspaceServices(this.activeWorkspace);
+      if (workspaceServices.length <= 0) return;
+      const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
+      if (!isActiveServiceInWorkspace) {
+        this.actions.service.setActive({ serviceId: workspaceServices[0].id });
+      }
+    }
+  };
+
+  _activateLastUsedWorkspaceReaction = () => {
+    if (!this.activeWorkspace && this.userHasWorkspaces) {
+      const { lastActiveWorkspace } = this.settings;
+      if (lastActiveWorkspace) {
+        const workspace = this._getWorkspaceById(lastActiveWorkspace);
+        if (workspace) this._setActiveWorkspace({ workspace });
+      }
+    }
+  };
+
+  _openDrawerWithSettingsReaction = () => {
+    const { router } = this.stores;
+    const isWorkspaceSettingsRoute = router.location.pathname.includes(WORKSPACES_ROUTES.ROOT);
+    const isSwitchingToSettingsRoute = !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
+    const isLeavingSettingsRoute = !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
+
+    if (isSwitchingToSettingsRoute) {
+      this.isSettingsRouteActive = true;
+      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
+      if (!this._wasDrawerOpenBeforeSettingsRoute) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    } else if (isLeavingSettingsRoute) {
+      this.isSettingsRouteActive = false;
+      if (!this._wasDrawerOpenBeforeSettingsRoute && this.isWorkspaceDrawerOpen) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    }
+  };
+
+  _cleanupInvalidServiceReferences = () => {
+    const { services } = this.stores;
+    let invalidServiceReferencesExist = false;
+    this.workspaces.forEach((workspace) => {
+      workspace.services.forEach((serviceId) => {
+        if (!services.one(serviceId)) {
+          invalidServiceReferencesExist = true;
+        }
+      });
+    });
+    if (invalidServiceReferencesExist) {
+      getUserWorkspacesRequest.execute();
+    }
+  };
+}
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index f374fddd9..dabe4ba16 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suport",
    "menu.help.tos" : "Condicions del Servei",
    "menu.services" : "Serveis",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Afegeix un servei...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualitza",
    "menu.view.enterFullScreen" : "Inicia la pantalla completa",
    "menu.view.exitFullScreen" : "Surt de pantalla completa",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Descarregar",
    "settings.account.manageSubscription.label" : "Gestioneu la vostra subscripció",
    "settings.account.successInfo" : "S'han desat els canvis",
+   "settings.account.tryReloadServices" : "Torna a provar-ho",
    "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
    "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
    "settings.app.buttonClearAllCache" : "Buida la memòria cau",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclou versions beta",
    "settings.app.form.darkMode" : "Uneix-te al Cantó Fosc",
    "settings.app.form.enableGPUAcceleration" : "Activar acceleració GPU",
-   "settings.app.form.enableMenuBar" : "Mostra Franz a la barra de menú",
    "settings.app.form.enableSpellchecking" : "Habilita la comprobació ortogràfica",
    "settings.app.form.enableSystemTray" : "Mostra Franz a la safata del sistema",
-   "settings.app.form.hideDockIcon" : "Oculta la icona de Franz al Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimitza Franz a la safata del sistema",
    "settings.app.form.runInBackground" : "Mantén a Franz en segon pla en tancar la finestra",
    "settings.app.form.showDisabledServices" : "Mostra les pestanyes dels serveis desactivats",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
-   "settings.app.form.spellcheckerLanguage" : "Corrector ortogràfic",
    "settings.app.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Siusplau, reinicieu el Franz després de canviar els ajustaments de proxy",
    "settings.service.form.proxy.user" : "Usuari (opcional)",
    "settings.service.form.saveButton" : "Desa el servei",
-   "settings.service.form.spellcheckerLanguage" : "Idioma del corrector",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilitzar el predeterminat del sistema ({default})",
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ⭐️",
    "settings.service.form.team" : "Equip",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serveis",
    "settings.services.headline" : "Els vostres serveis",
    "settings.services.noServicesAdded" : "Encara no heu afegit cap servei.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "El servei està desactivat",
    "settings.services.tooltip.isMuted" : "Tots els sons estan desactivats",
    "settings.services.tooltip.notificationsDisabled" : "Les notificacions estan desactivades",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residents d'EU: es poden aplicar impostos locals",
    "subscription.features.ads" : "Sense anuncis, mai!",
    "subscription.features.comingSoon" : "properament",
-   "subscription.features.encryptedSync" : "Sincronització de sessió xifrada",
    "subscription.features.noInterruptions" : "Sense retards ni molestes actualitzacions de llicències ",
-   "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
    "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
    "subscription.features.proxy" : "Suport de Proxy per a serveis",
    "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarrega",
    "validation.email" : "{field} no es vàlid",
    "validation.minLength" : "{field} ha de ser al menys {length} caràcters de llargada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es requerit",
    "validation.url" : "{field} es una URL no vàlida",
    "welcome.loginButton" : "Inicia sessió al teu compte",
-   "welcome.signupButton" : "Crea un compte gratuït",
-   "welcome.slogan" : "Crea un compte gratuït"
+   "welcome.signupButton" : "Crea un compte gratuït"
 }
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 3fc6318a2..f0b0b7c81 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmínky použití",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Přidat novou službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobrazení",
    "menu.view.enterFullScreen" : "Spustit režim celé obrazovky",
    "menu.view.exitFullScreen" : "Ukončit celoobrazovkový režim",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Stáhnout",
    "settings.account.manageSubscription.label" : "Spravovat vaše předplatné",
    "settings.account.successInfo" : "Vaše změny byly uloženy",
+   "settings.account.tryReloadServices" : "Zkusit opět",
    "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
    "settings.account.userInfoRequestFailed" : "Nelze načíst informace o uživateli.",
    "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Zahrnout beta verze",
    "settings.app.form.darkMode" : "Připoj se k Temné straně",
    "settings.app.form.enableGPUAcceleration" : "Aktivovat GPU zrychlení",
-   "settings.app.form.enableMenuBar" : "Zobraz Franz v Menu nabídce",
    "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
-   "settings.app.form.hideDockIcon" : "Schovej ikonu Franz v Docku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovat Franz do systémové lišty",
    "settings.app.form.runInBackground" : "Ponechat Franze v pozadí při zavírání okna",
    "settings.app.form.showDisabledServices" : "Zobrazit záložky vypnutých služeb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
-   "settings.app.form.spellcheckerLanguage" : "Oprava překlepů jazyka",
    "settings.app.headline" : "Nastavení",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložit službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ⭐️",
    "settings.service.form.team" : "Tým",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Objevte služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposud jste nepřidali žádné služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je zakázána",
    "settings.services.tooltip.isMuted" : "Všechny zvuky jsou ztišeny",
    "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Pro obyvatelé EU: mohou být aplikovány lokální daně",
    "subscription.features.ads" : "Žádné reklamy, nikdy!",
    "subscription.features.comingSoon" : "již brzy",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizace relací",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Obnovit",
    "validation.email" : "{field} není validní",
    "validation.minLength" : "{field} musí být alespoň {length} znaků dlouhé",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} není validní URL",
    "welcome.loginButton" : "Přihlášení do vašeho účtu",
-   "welcome.signupButton" : "Vytvořit účet zdarma",
-   "welcome.slogan" : "Zprávy, které pracují pro vás"
+   "welcome.signupButton" : "Vytvořit účet zdarma"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 13b8d12fc..06a03db65 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Upgrade deinen Account",
    "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
    "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Als E-Mail senden",
+   "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
+   "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
+   "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
+   "feature.shareFranz.shareText.email" : "Ich verwende Franz! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Ich verwende Franz mit {count} Diensten! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und mehr auf www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kollegen wie toll du Franz findest.",
    "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
    "global.spellchecker.useDefault" : "Standard benutzen ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Sprache automatisch erkennen",
+   "global.spellchecking.autodetect.short" : "Automatisch",
    "global.spellchecking.language" : "Sprache für Rechtschreibprüfung",
    "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Hilfe",
    "menu.help.tos" : "Nutzungsbedingungen",
    "menu.services" : "Dienste",
+   "menu.services.activatePreviousService" : "Vorheriger Dienst",
    "menu.services.addNewService" : "Dienst hinzufügen",
+   "menu.services.setNextServiceActive" : "Nächster Dienst",
    "menu.view" : "Darstellung",
    "menu.view.enterFullScreen" : "Vollbildmodus",
    "menu.view.exitFullScreen" : "Vollbildmodus aus",
@@ -85,6 +87,9 @@
    "menu.window" : "Fenster",
    "menu.window.close" : "Schließen",
    "menu.window.minimize" : "Minimieren",
+   "menu.workspaces": "Workspaces",
+   "menu.workspaces.defaultWorkspace": "All services",
+   "menu.workspaces.addNewWorkspace": "Add New Workspace",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
    "password.link.login" : "An Deinem Konto anmelden",
@@ -128,6 +133,7 @@
    "settings.account.invoiceDownload" : "Herunterladen",
    "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
    "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.account.tryReloadServices" : "Erneut versuchen",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
    "settings.app.buttonClearAllCache" : "Cache leeren",
@@ -140,16 +146,13 @@
    "settings.app.form.beta" : "Beta-Versionen einbeziehen",
    "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich (Dark Mode)",
    "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
-   "settings.app.form.enableMenuBar" : "Franz in Menüleiste anzeigen",
    "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
    "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
-   "settings.app.form.hideDockIcon" : "Franz Icon im Dock ausblenden",
    "settings.app.form.language" : "Sprache",
    "settings.app.form.minimizeToSystemTray" : "Franz in den Infobereich minimieren",
    "settings.app.form.runInBackground" : "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
    "settings.app.form.showDisabledServices" : "Deaktivierte Services-Tabs anzeigen",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
-   "settings.app.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
    "settings.app.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
@@ -169,6 +172,7 @@
    "settings.navigation.logout" : "Abmelden",
    "settings.navigation.settings" : "Einstellungen",
    "settings.navigation.yourServices" : "Deine Dienste",
+   "settings.navigation.yourWorkspaces": "Deine Workspaces",
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
@@ -212,8 +216,6 @@
    "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
    "settings.service.form.proxy.user" : "Benutzer (optional)",
    "settings.service.form.saveButton" : "Dienst speichern",
-   "settings.service.form.spellcheckerLanguage" : "Sprache für Rechtschreibprüfung",
-   "settings.service.form.spellcheckerLanguage.default" : "Standard benutzen ({default})",
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ⭐️",
    "settings.service.form.team" : "Team",
@@ -223,10 +225,19 @@
    "settings.services.discoverServices" : "Dienste entdecken",
    "settings.services.headline" : "Deine Dienste",
    "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
+   "settings.services.servicesRequestFailed" : "Dienste konnten nicht geladen werden",
    "settings.services.tooltip.isDisabled" : "Dienst ist deaktiviert",
    "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
    "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
    "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.workspaces.headline": "Deine Workspaces",
+   "settings.workspace.add.form.submitButton": "Workspace erstellen",
+   "settings.workspace.add.form.name": "Name",
+   "settings.workspace.form.yourWorkspaces": "Deine Workspaces",
+   "settings.workspace.form.name": "Name",
+   "settings.workspace.form.buttonDelete": "Workspace löschen",
+   "settings.workspace.form.buttonSave": "Workspace speichern",
+   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in diesem Workspace",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Einzelperson",
    "settings.user.form.accountType.label" : "Konto-Typ",
@@ -255,9 +266,7 @@
    "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
    "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
    "subscription.features.comingSoon" : "folgt bald",
-   "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
    "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
-   "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
    "subscription.features.proxy" : "Proxy Support für Dienste",
    "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
@@ -280,9 +289,9 @@
    "tabs.item.reload" : "Neuladen",
    "validation.email" : "{field} ist ungültig",
    "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
+   "validation.oneRequired" : "Mindestens ein Wert wird benötigt",
    "validation.required" : "{field} wird benötigt",
    "validation.url" : "{field} ist keine gültige URL",
    "welcome.loginButton" : "Bei Franz einloggen",
-   "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
+   "welcome.signupButton" : "Kostenloses Konto erstellen"
 }
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index fcd24c7ef..698698515 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -625,78 +625,78 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 29
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 23
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!A new update for Franz is available.",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 33
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.updateAvailable",
         "start": {
           "column": 19,
-          "line": 27
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 37
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 31
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 41
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonChangelog",
         "start": {
           "column": 13,
-          "line": 35
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 45
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 39
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 49
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 43
+          "line": 46
         }
       }
     ],
@@ -708,52 +708,78 @@
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 16
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.settings",
         "start": {
           "column": 12,
-          "line": 11
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Add new service",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 20
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.addNewService",
         "start": {
           "column": 17,
-          "line": 15
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 24
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 28
         },
         "file": "src/components/layout/Sidebar.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 10,
-          "line": 23
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/components/layout/Sidebar.js",
+        "id": "sidebar.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 33
         }
       }
     ],
@@ -1276,78 +1302,91 @@
         "defaultMessage": "!!!Available services",
         "end": {
           "column": 3,
-          "line": 12
+          "line": 15
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.availableServices",
         "start": {
           "column": 21,
-          "line": 9
+          "line": 12
         }
       },
       {
         "defaultMessage": "!!!Your services",
         "end": {
           "column": 3,
-          "line": 16
+          "line": 19
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.yourServices",
         "start": {
           "column": 16,
-          "line": 13
+          "line": 16
         }
       },
       {
-        "defaultMessage": "!!!Account",
+        "defaultMessage": "!!!Your workspaces",
         "end": {
           "column": 3,
+          "line": 23
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.yourWorkspaces",
+        "start": {
+          "column": 18,
           "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Account",
+        "end": {
+          "column": 3,
+          "line": 27
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.account",
         "start": {
           "column": 11,
-          "line": 17
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 31
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.settings",
         "start": {
           "column": 12,
-          "line": 21
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Invite Friends",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 35
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.inviteFriends",
         "start": {
           "column": 17,
-          "line": 25
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Logout",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 39
         },
         "file": "src/components/settings/navigation/SettingsNavigation.js",
         "id": "settings.navigation.logout",
         "start": {
           "column": 10,
-          "line": 29
+          "line": 36
         }
       }
     ],
@@ -2496,13 +2535,13 @@
         "defaultMessage": "!!!Upgrade account",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 18
         },
         "file": "src/components/ui/PremiumFeatureContainer/index.js",
         "id": "premiumFeature.button.upgradeAccount",
         "start": {
           "column": 10,
-          "line": 14
+          "line": 15
         }
       }
     ],
@@ -2511,6 +2550,24 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Loading",
+        "end": {
+          "column": 3,
+          "line": 14
+        },
+        "file": "src/components/ui/WebviewLoader/index.js",
+        "id": "service.webviewLoader.loading",
+        "start": {
+          "column": 11,
+          "line": 11
+        }
+      }
+    ],
+    "path": "src/components/ui/WebviewLoader/index.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Something went wrong.",
         "end": {
           "column": 3,
@@ -3165,7 +3222,7 @@
         }
       },
       {
-        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz",
+        "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
         "end": {
           "column": 3,
           "line": 42
@@ -3183,6 +3240,374 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Create workspace",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.submitButton",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+        "id": "settings.workspace.add.form.name",
+        "start": {
+          "column": 8,
+          "line": 17
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Delete workspace",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonDelete",
+        "start": {
+          "column": 16,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Save workspace",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.buttonSave",
+        "start": {
+          "column": 14,
+          "line": 23
+        }
+      },
+      {
+        "defaultMessage": "!!!Name",
+        "end": {
+          "column": 3,
+          "line": 30
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.name",
+        "start": {
+          "column": 8,
+          "line": 27
+        }
+      },
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 34
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.yourWorkspaces",
+        "start": {
+          "column": 18,
+          "line": 31
+        }
+      },
+      {
+        "defaultMessage": "!!!Services in this Workspace",
+        "end": {
+          "column": 3,
+          "line": 38
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+        "start": {
+          "column": 31,
+          "line": 35
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.headline",
+        "start": {
+          "column": 12,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!All services",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.allServices",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces settings",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.workspacesSettingsTooltip",
+        "start": {
+          "column": 29,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.workspaceFeatureInfo",
+        "start": {
+          "column": 24,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Create your first workspace",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.premiumCtaButtonLabel",
+        "start": {
+          "column": 25,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Reactivate premium account",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.reactivatePremiumAccountLabel",
+        "start": {
+          "column": 28,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!add new workspace",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.addNewWorkspaceLabel",
+        "start": {
+          "column": 24,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Premium feature",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+        "id": "workspaceDrawer.proFeatureBadge",
+        "start": {
+          "column": 23,
+          "line": 44
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!No services added yet",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.noServicesAddedYet",
+        "start": {
+          "column": 22,
+          "line": 12
+        }
+      },
+      {
+        "defaultMessage": "!!!edit",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.contextMenuEdit",
+        "start": {
+          "column": 19,
+          "line": 16
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Your workspaces",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.headline",
+        "start": {
+          "column": 12,
+          "line": 17
+        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any workspaces yet.",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.noWorkspacesAdded",
+        "start": {
+          "column": 19,
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Could not load your workspaces",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspacesRequestFailed",
+        "start": {
+          "column": 27,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Try again",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.tryReloadWorkspaces",
+        "start": {
+          "column": 23,
+          "line": 29
+        }
+      },
+      {
+        "defaultMessage": "!!!Your changes have been saved",
+        "end": {
+          "column": 3,
+          "line": 36
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.updatedInfo",
+        "start": {
+          "column": 15,
+          "line": 33
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspace has been deleted",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.deletedInfo",
+        "start": {
+          "column": 15,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Info about workspace feature",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureInfo",
+        "start": {
+          "column": 24,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+        "id": "settings.workspaces.workspaceFeatureHeadline",
+        "start": {
+          "column": 28,
+          "line": 45
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Switching to",
+        "end": {
+          "column": 3,
+          "line": 15
+        },
+        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
+        "id": "workspaces.switchingIndicator.switchingTo",
+        "start": {
+          "column": 15,
+          "line": 12
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Field is required",
         "end": {
           "column": 3,
@@ -3339,624 +3764,689 @@
         "defaultMessage": "!!!Edit",
         "end": {
           "column": 3,
-          "line": 13
+          "line": 16
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit",
         "start": {
           "column": 8,
-          "line": 10
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Undo",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 20
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.undo",
         "start": {
           "column": 8,
-          "line": 14
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Redo",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 24
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.redo",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!!Cut",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 28
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.cut",
         "start": {
           "column": 7,
-          "line": 22
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Copy",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 32
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.copy",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Paste",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 36
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.paste",
         "start": {
           "column": 9,
-          "line": 30
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Paste And Match Style",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 40
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.pasteAndMatchStyle",
         "start": {
           "column": 22,
-          "line": 34
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Delete",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 44
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.delete",
         "start": {
           "column": 10,
-          "line": 38
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Select All",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 48
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.selectAll",
         "start": {
           "column": 13,
-          "line": 42
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Speech",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 52
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.speech",
         "start": {
           "column": 10,
-          "line": 46
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Start Speaking",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 56
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startSpeaking",
         "start": {
           "column": 17,
-          "line": 50
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Stop Speaking",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 60
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.stopSpeaking",
         "start": {
           "column": 16,
-          "line": 54
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Start Dictation",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 64
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.startDictation",
         "start": {
           "column": 18,
-          "line": 58
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Emoji & Symbols",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 68
         },
         "file": "src/lib/Menu.js",
         "id": "menu.edit.emojiSymbols",
         "start": {
           "column": 16,
-          "line": 62
+          "line": 65
         }
       },
       {
         "defaultMessage": "!!!Actual Size",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 72
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.resetZoom",
         "start": {
           "column": 13,
-          "line": 66
+          "line": 69
         }
       },
       {
         "defaultMessage": "!!!Zoom In",
         "end": {
           "column": 3,
-          "line": 73
+          "line": 76
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomIn",
         "start": {
           "column": 10,
-          "line": 70
+          "line": 73
         }
       },
       {
         "defaultMessage": "!!!Zoom Out",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 80
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.zoomOut",
         "start": {
           "column": 11,
-          "line": 74
+          "line": 77
         }
       },
       {
         "defaultMessage": "!!!Enter Full Screen",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 84
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.enterFullScreen",
         "start": {
           "column": 19,
-          "line": 78
+          "line": 81
         }
       },
       {
         "defaultMessage": "!!!Exit Full Screen",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 88
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.exitFullScreen",
         "start": {
           "column": 18,
-          "line": 82
+          "line": 85
         }
       },
       {
         "defaultMessage": "!!!Toggle Full Screen",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 92
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleFullScreen",
         "start": {
           "column": 20,
-          "line": 86
+          "line": 89
         }
       },
       {
         "defaultMessage": "!!!Toggle Developer Tools",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 96
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleDevTools",
         "start": {
           "column": 18,
-          "line": 90
+          "line": 93
         }
       },
       {
         "defaultMessage": "!!!Toggle Service Developer Tools",
         "end": {
           "column": 3,
-          "line": 97
+          "line": 100
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.toggleServiceDevTools",
         "start": {
           "column": 25,
-          "line": 94
+          "line": 97
         }
       },
       {
         "defaultMessage": "!!!Reload Service",
         "end": {
           "column": 3,
-          "line": 101
+          "line": 104
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadService",
         "start": {
           "column": 17,
-          "line": 98
+          "line": 101
         }
       },
       {
         "defaultMessage": "!!!Reload Franz",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 108
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view.reloadFranz",
         "start": {
           "column": 15,
-          "line": 102
+          "line": 105
         }
       },
       {
         "defaultMessage": "!!!Minimize",
         "end": {
           "column": 3,
-          "line": 109
+          "line": 112
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.minimize",
         "start": {
           "column": 12,
-          "line": 106
+          "line": 109
         }
       },
       {
         "defaultMessage": "!!!Close",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 116
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window.close",
         "start": {
           "column": 9,
-          "line": 110
+          "line": 113
         }
       },
       {
         "defaultMessage": "!!!Learn More",
         "end": {
           "column": 3,
-          "line": 117
+          "line": 120
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.learnMore",
         "start": {
           "column": 13,
-          "line": 114
+          "line": 117
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 121
+          "line": 124
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.changelog",
         "start": {
           "column": 13,
-          "line": 118
+          "line": 121
         }
       },
       {
         "defaultMessage": "!!!Support",
         "end": {
           "column": 3,
-          "line": 125
+          "line": 128
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.support",
         "start": {
           "column": 11,
-          "line": 122
+          "line": 125
         }
       },
       {
         "defaultMessage": "!!!Terms of Service",
         "end": {
           "column": 3,
-          "line": 129
+          "line": 132
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.tos",
         "start": {
           "column": 7,
-          "line": 126
+          "line": 129
         }
       },
       {
         "defaultMessage": "!!!Privacy Statement",
         "end": {
           "column": 3,
-          "line": 133
+          "line": 136
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help.privacy",
         "start": {
           "column": 11,
-          "line": 130
+          "line": 133
         }
       },
       {
         "defaultMessage": "!!!File",
         "end": {
           "column": 3,
-          "line": 137
+          "line": 140
         },
         "file": "src/lib/Menu.js",
         "id": "menu.file",
         "start": {
           "column": 8,
-          "line": 134
+          "line": 137
         }
       },
       {
         "defaultMessage": "!!!View",
         "end": {
           "column": 3,
-          "line": 141
+          "line": 144
         },
         "file": "src/lib/Menu.js",
         "id": "menu.view",
         "start": {
           "column": 8,
-          "line": 138
+          "line": 141
         }
       },
       {
         "defaultMessage": "!!!Services",
         "end": {
           "column": 3,
-          "line": 145
+          "line": 148
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services",
         "start": {
           "column": 12,
-          "line": 142
+          "line": 145
         }
       },
       {
         "defaultMessage": "!!!Window",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 152
         },
         "file": "src/lib/Menu.js",
         "id": "menu.window",
         "start": {
           "column": 10,
-          "line": 146
+          "line": 149
         }
       },
       {
         "defaultMessage": "!!!Help",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 156
         },
         "file": "src/lib/Menu.js",
         "id": "menu.help",
         "start": {
           "column": 8,
-          "line": 150
+          "line": 153
         }
       },
       {
         "defaultMessage": "!!!About Franz",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 160
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.about",
         "start": {
           "column": 9,
-          "line": 154
+          "line": 157
         }
       },
       {
         "defaultMessage": "!!!What's new in Franz?",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 164
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.announcement",
         "start": {
           "column": 16,
-          "line": 158
+          "line": 161
         }
       },
       {
         "defaultMessage": "!!!Settings",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 168
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.settings",
         "start": {
           "column": 12,
-          "line": 162
+          "line": 165
         }
       },
       {
         "defaultMessage": "!!!Hide",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 172
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hide",
         "start": {
           "column": 8,
-          "line": 166
+          "line": 169
         }
       },
       {
         "defaultMessage": "!!!Hide Others",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 176
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.hideOthers",
         "start": {
           "column": 14,
-          "line": 170
+          "line": 173
         }
       },
       {
         "defaultMessage": "!!!Unhide",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 180
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.unhide",
         "start": {
           "column": 10,
-          "line": 174
+          "line": 177
         }
       },
       {
         "defaultMessage": "!!!Quit",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 184
         },
         "file": "src/lib/Menu.js",
         "id": "menu.app.quit",
         "start": {
           "column": 8,
-          "line": 178
+          "line": 181
         }
       },
       {
         "defaultMessage": "!!!Add New Service...",
         "end": {
           "column": 3,
-          "line": 185
+          "line": 188
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.addNewService",
         "start": {
           "column": 17,
-          "line": 182
+          "line": 185
         }
       },
       {
-        "defaultMessage": "!!!Activate next service...",
+        "defaultMessage": "!!!Add New Workspace...",
         "end": {
           "column": 3,
+          "line": 192
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.addNewWorkspace",
+        "start": {
+          "column": 19,
           "line": 189
+        }
+      },
+      {
+        "defaultMessage": "!!!Open workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 196
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.openWorkspaceDrawer",
+        "start": {
+          "column": 23,
+          "line": 193
+        }
+      },
+      {
+        "defaultMessage": "!!!Close workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 200
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 197
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 204
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.setNextServiceActive",
         "start": {
           "column": 23,
-          "line": 186
+          "line": 201
         }
       },
       {
         "defaultMessage": "!!!Activate previous service...",
         "end": {
           "column": 3,
-          "line": 193
+          "line": 208
         },
         "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 190
+          "line": 205
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 197
+          "line": 212
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 194
+          "line": 209
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 201
+          "line": 216
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 198
+          "line": 213
+        }
+      },
+      {
+        "defaultMessage": "!!!Workspaces",
+        "end": {
+          "column": 3,
+          "line": 220
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces",
+        "start": {
+          "column": 14,
+          "line": 217
+        }
+      },
+      {
+        "defaultMessage": "!!!Default",
+        "end": {
+          "column": 3,
+          "line": 224
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.defaultWorkspace",
+        "start": {
+          "column": 20,
+          "line": 221
         }
       }
     ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 9639ec5f7..626abfddd 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Υποστήριξη",
    "menu.help.tos" : "Όροι Χρήσης",
    "menu.services" : "Υπηρεσίες",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Νέα Υπηρεσία",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Προβολή",
    "menu.view.enterFullScreen" : "Πλήρης Οθόνη",
    "menu.view.exitFullScreen" : "Έξοδος από πλήρη οθόνη",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Λήψη",
    "settings.account.manageSubscription.label" : "Διαχείριση της συνδρομής σας",
    "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.account.tryReloadServices" : "Δοκιμάστε ξανά",
    "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
    "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
    "settings.app.buttonClearAllCache" : "Καθαρισμός λανθάνουσας μνήμης",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Συμπεριλάβετε εκδόσεις beta",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Ενεργοποιήση Ενίσχυσης GPU ",
-   "settings.app.form.enableMenuBar" : "Εμφάνιση Γραμμής Μενού Franz",
    "settings.app.form.enableSpellchecking" : "Ενεργοποίηση ορθογραφικού ελέγχου",
    "settings.app.form.enableSystemTray" : "Εμφάνιση του Franz στη γραμμή ειδοποιήσεων",
-   "settings.app.form.hideDockIcon" : "Απόκρυψη εικονιδίου Franz",
    "settings.app.form.language" : "Γλώσσα",
    "settings.app.form.minimizeToSystemTray" : "Ελαχιστοποίηση του Franz στη γραμμή ειδοποιήσεων",
    "settings.app.form.runInBackground" : "Κρατήστε το Franz στο παρασκήνιο κατά το κλείσιμο του παραθύρου",
    "settings.app.form.showDisabledServices" : "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Ρυθμίσεις",
    "settings.app.headlineAdvanced" : "Για προχωρημένους",
    "settings.app.headlineAppearance" : "Εμφάνιση",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Αποθήκευση υπηρεσίας",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Φιλοξενείται",
    "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ⭐️",
    "settings.service.form.team" : "Ομάδα",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Ανακαλύψτε υπηρεσίες",
    "settings.services.headline" : "Οι υπηρεσίες σας",
    "settings.services.noServicesAdded" : "Δεν έχετε προσθέσει ακόμα υπηρεσίες.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Η υπηρεσία είναι απενεργοποιημένη",
    "settings.services.tooltip.isMuted" : "Όλοι οι ήχοι είναι απενεργοποιημένοι",
    "settings.services.tooltip.notificationsDisabled" : "Οι ειδοποιήσεις είναι απενεργοποιημένες",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν περιλαμβάνονται τυχόν φόροι και άλλες τοπικές επιβαρύνσεις",
    "subscription.features.ads" : "Τέλος στις διαφημίσεις",
    "subscription.features.comingSoon" : "σύντομα",
-   "subscription.features.encryptedSync" : "Κρυπτογραφημένος συγχρονισμός περιόδου σύνδεσης",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Επαναφόρτωση",
    "validation.email" : "{field} δεν είναι έγκυρο",
    "validation.minLength" : "{field} πρέπει να είναι τουλάχιστον {length} χαρακτήρες",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} είναι υποχρεωτικό",
    "validation.url" : "{field} δεν είναι έγκυρος σύνδεσμος URL",
    "welcome.loginButton" : "Σύνδεση στο λογαριασμό σας",
-   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού",
-   "welcome.slogan" : "Επικοινωνία που λειτουργεί για εσάς"
+   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού"
 }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 573231c45..13775d758 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -10,7 +10,7 @@
   "feature.shareFranz.action.twitter": "Share on Twitter",
   "feature.shareFranz.headline": "Franz is better together!",
   "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz",
+  "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
   "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy": "Can't connect to Franz online services",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
@@ -89,6 +89,11 @@
   "menu.window": "Window",
   "menu.window.close": "Close",
   "menu.window.minimize": "Minimize",
+  "menu.workspaces": "Workspaces",
+  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
+  "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
   "password.headline": "Reset password",
   "password.link.login": "Sign in to your account",
@@ -112,6 +117,7 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
+  "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Franz",
   "settings.account.account.editButton": "Edit account",
@@ -171,6 +177,7 @@
   "settings.navigation.logout": "Logout",
   "settings.navigation.settings": "Settings",
   "settings.navigation.yourServices": "Your services",
+  "settings.navigation.yourWorkspaces": "Your workspaces",
   "settings.recipes.all": "All services",
   "settings.recipes.dev": "Development",
   "settings.recipes.headline": "Available services",
@@ -237,8 +244,25 @@
   "settings.user.form.firstname": "First Name",
   "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "New password",
+  "settings.workspace.add.form.name": "Name",
+  "settings.workspace.add.form.submitButton": "Create workspace",
+  "settings.workspace.form.buttonDelete": "Delete workspace",
+  "settings.workspace.form.buttonSave": "Save workspace",
+  "settings.workspace.form.name": "Name",
+  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
+  "settings.workspace.form.yourWorkspaces": "Your workspaces",
+  "settings.workspaces.deletedInfo": "Workspace has been deleted",
+  "settings.workspaces.headline": "Your workspaces",
+  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
+  "settings.workspaces.tryReloadWorkspaces": "Try again",
+  "settings.workspaces.updatedInfo": "Your changes have been saved",
+  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Franz Workspaces",
+  "settings.workspaces.workspaceFeatureInfo": "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "sidebar.addNewService": "Add new service",
+  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
   "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
   "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.company.label": "Company",
@@ -283,5 +307,16 @@
   "validation.required": "{field} is required",
   "validation.url": "{field} is not a valid URL",
   "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account"
+  "welcome.signupButton": "Create a free account",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
+  "workspaceDrawer.allServices": "All services",
+  "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.item.contextMenuEdit": "edit",
+  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
+  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
+  "workspaceDrawer.proFeatureBadge": "Premium feature",
+  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
+  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
\ No newline at end of file
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 3ac23d9a5..5c26b456c 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -5,8 +5,8 @@
    "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
    "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
    "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
+   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
    "feature.shareFranz.headline" : "Franz is better together!",
    "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ayuda técnica",
    "menu.help.tos" : "Términos del Servicio",
    "menu.services" : "Servicios",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Añadir Nuevo Servicio...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Mostrar",
    "menu.view.enterFullScreen" : "Pasar a pantalla completa",
    "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Descargar",
    "settings.account.manageSubscription.label" : "Administra tu suscripción",
    "settings.account.successInfo" : "Tus cambios han sido guardados",
+   "settings.account.tryReloadServices" : "Intentar de nuevo",
    "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
    "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
    "settings.app.buttonClearAllCache" : "Limpiar caché",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versiones beta",
    "settings.app.form.darkMode" : "Únete al Lado Oscuro",
    "settings.app.form.enableGPUAcceleration" : "Habilitar aceleración de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar a Franz en la barra de menús",
    "settings.app.form.enableSpellchecking" : "Activar corrección ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar Icono de Franz en barra de herramientas",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar Franz a la bandeja del sistema",
    "settings.app.form.runInBackground" : "Mantener Franz en segundo plano al cerrar la ventana",
    "settings.app.form.showDisabledServices" : "Mostrar pestañas de servicios desactivados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
-   "settings.app.form.spellcheckerLanguage" : "Corrector de ortografía",
    "settings.app.headline" : "Configuración",
    "settings.app.headlineAdvanced" : "Avanzado",
    "settings.app.headlineAppearance" : "Apariencia",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Por favor reinicie Franz despues de modificar los ajustes proxy.",
    "settings.service.form.proxy.user" : "Usuario (opcional)",
    "settings.service.form.saveButton" : "Guardar servicio",
-   "settings.service.form.spellcheckerLanguage" : "Marcar faltas de ortografía",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilizar estándar del sistema ({default})",
    "settings.service.form.tabHosted" : "Alojado",
    "settings.service.form.tabOnPremise" : "Auto alojado ⭐️",
    "settings.service.form.team" : "Equipo",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descubrir servicios",
    "settings.services.headline" : "Tus servicios",
    "settings.services.noServicesAdded" : "No has añadido ningún servicio aún.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "El servicio está desactivado",
    "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
    "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes de la UE: pueden aplicarse impuestos locales",
    "subscription.features.ads" : "¡Sin publicidad, para siempre!",
    "subscription.features.comingSoon" : "próximamente",
-   "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
    "subscription.features.noInterruptions" : "Sin retrasos en la app ni molestas actualizaciones de licencias",
-   "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
    "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
    "subscription.features.proxy" : "Soporte Proxy para servicios",
    "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recargar",
    "validation.email" : "{field} no es válido",
    "validation.minLength" : "{field} debería tener al menos {length} caracteres",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} es obligatorio",
    "validation.url" : "{field} no es una URL válida",
    "welcome.loginButton" : "Accede a tu cuenta",
-   "welcome.signupButton" : "Crear una cuenta gratuita",
-   "welcome.slogan" : "Mensajería que funciona para ti"
+   "welcome.signupButton" : "Crear una cuenta gratuita"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 8af875a3d..6f9d81713 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
    "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
    "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Envoyer par mail",
+   "feature.shareFranz.action.facebook" : "Partager sur Facebook",
+   "feature.shareFranz.action.twitter" : "Partager sur Twitter",
+   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
+   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com \/cc @NeetFranz",
+   "feature.shareFranz.text" : "Dites à vos amis et collègues combien Franz est super et aidez nous à faire passer le mot.",
    "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
    "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
    "global.spellchecker.useDefault" : "Par défaut ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Detecter automatiquement la langue",
+   "global.spellchecking.autodetect.short" : "Automatiquement",
    "global.spellchecking.language" : "Langue de la vérification orthographique",
    "import.headline" : "Importez vos services depuis la version 4 de Franz.",
    "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Conditions d'utilisation",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Ajouter un nouveau service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Aperçu",
    "menu.view.enterFullScreen" : "Entrer en mode plein écran",
    "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Télécharger",
    "settings.account.manageSubscription.label" : "Gérer votre abonnement",
    "settings.account.successInfo" : "Vos modifications ont été enregistrées",
+   "settings.account.tryReloadServices" : "Réessayer",
    "settings.account.tryReloadUserInfoRequest" : "Réessayer",
    "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
    "settings.app.buttonClearAllCache" : "Vider le cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Accepter les versions bêta",
    "settings.app.form.darkMode" : "Rejoins le côté obscur",
    "settings.app.form.enableGPUAcceleration" : "Activer l'accélération GPU",
-   "settings.app.form.enableMenuBar" : "Afficher Franz dans la barre des menus",
    "settings.app.form.enableSpellchecking" : "Activer la vérification orthographique",
    "settings.app.form.enableSystemTray" : "Afficher Franz dans la barre d'état système",
-   "settings.app.form.hideDockIcon" : "Masquer Franz dans le Dock",
    "settings.app.form.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
    "settings.app.form.runInBackground" : "Garder Franz ouvert en arrière-plan à la fermeture de la fenêtre",
    "settings.app.form.showDisabledServices" : "Afficher les onglets des services désactivés",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Afficher les badges de messages non lus quand les notifications sont désactivées.",
-   "settings.app.form.spellcheckerLanguage" : "Langue de la vérification orthographique",
    "settings.app.headline" : "Paramètres",
    "settings.app.headlineAdvanced" : "Paramètres avancés",
    "settings.app.headlineAppearance" : "Apparence",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Veuillez redémarrer Franz après avoir modifié les paramètres proxy.",
    "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
    "settings.service.form.saveButton" : "Enregistrer le service",
-   "settings.service.form.spellcheckerLanguage" : "Langue de vérification d'orthographe",
-   "settings.service.form.spellcheckerLanguage.default" : "Par défaut ({default})",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
    "settings.service.form.team" : "Équipe",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Découvrir les services",
    "settings.services.headline" : "Vos services",
    "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Ce service est désactivé",
    "settings.services.tooltip.isMuted" : "Tous les sons sont coupés",
    "settings.services.tooltip.notificationsDisabled" : "Notifications désactivées.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
    "subscription.features.ads" : "Plus de pubs !",
    "subscription.features.comingSoon" : "Bientôt disponible",
-   "subscription.features.encryptedSync" : "Synchronisation de session cryptée",
    "subscription.features.noInterruptions" : "Aucun délai dans l'application ni de harcèlement pour mettre à niveau la licence",
-   "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
    "subscription.features.proxy" : "Support proxy pour les services",
    "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recharger",
    "validation.email" : "{field} n'est pas valide",
    "validation.minLength" : "{field} doit contenir au moins {length} caractère(s)",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} est requis",
    "validation.url" : "{field} n'est pas une URL valide",
    "welcome.loginButton" : "Se connecter sur son compte",
-   "welcome.signupButton" : "Créer un compte gratuit",
-   "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
+   "welcome.signupButton" : "Créer un compte gratuit"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 2b3d39b73..eb7c04491 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Tacaíocht",
    "menu.help.tos" : "Téarmaí tagartha",
    "menu.services" : "Seirbhísí",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Cuir seirbhís nua leis",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Amharc",
    "menu.view.enterFullScreen" : "Cuir isteach mód lánscáileáin",
    "menu.view.exitFullScreen" : "Scoir mód lánscáileáin",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Íoslódáil",
    "settings.account.manageSubscription.label" : "Bainistigh do shíntiús",
    "settings.account.successInfo" : "Sábháladh do chuid athruithe",
+   "settings.account.tryReloadServices" : "Atriail",
    "settings.account.tryReloadUserInfoRequest" : "Atriail",
    "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
    "settings.app.buttonClearAllCache" : "Glan taisce",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Cumasaigh luasghéarú APG",
-   "settings.app.form.enableMenuBar" : "Taispeáin Franz sa bharra roghchláir",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
    "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
-   "settings.app.form.hideDockIcon" : "Cuir íocóin Franz i bhfolach ón leaba nasctha",
    "settings.app.form.language" : "Teanga",
    "settings.app.form.minimizeToSystemTray" : "Íoslaghdaigh Franz chuig tráidire an chórais",
    "settings.app.form.runInBackground" : "Coimeád Franz sa chúlra nuair a dhúntar an fhuinneog",
    "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sábháil seirbhís",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ⭐️",
    "settings.service.form.team" : "Foireann",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Aimsigh seirbhísí",
    "settings.services.headline" : "Do sheirbhísí",
    "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat go fóill.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
    "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
    "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Áithritheoirí an tAÉ: is féidir cáin díolacháin áitiúla a chur i bhfeidhm",
    "subscription.features.ads" : "Fógraí ar bith, choíche!",
    "subscription.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Athlódáil",
    "validation.email" : "Níl {field} neamhbhailí",
    "validation.minLength" : "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Tá {field} de dhíth",
    "validation.url" : "Ní AAA bhailí é {field}",
    "welcome.loginButton" : "Logáil isteach i do chuntas",
-   "welcome.signupButton" : "Cruthaigh cuntas nua",
-   "welcome.slogan" : "Teachtaireachtaí a oibríonn duitse"
+   "welcome.signupButton" : "Cruthaigh cuntas nua"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index dc1d579fa..95920c4ce 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "Očisti memoriju",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Prikaži Franz u traci izbornika",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Sakrij ikonu Franz u prostoru za obavijesti",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži ploče s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Postavke",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena. ",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni. ",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat ",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ponovno učitavanje",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "welcome.signupButton" : "Stvorite novi korisnički račun"
 }
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index ddaffeebb..bce9a368e 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Támogatás",
    "menu.help.tos" : "Felhasználói feltételek",
    "menu.services" : "Szolgáltatások",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Új szolgáltatás hozzáadása...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Nézet",
    "menu.view.enterFullScreen" : "Kilépés a teljes képernyős módból",
    "menu.view.exitFullScreen" : "Kilépés a teljes képernyős módból",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Letöltés",
    "settings.account.manageSubscription.label" : "Előfizetés kezelése",
    "settings.account.successInfo" : "A módosításokat elmentettük",
+   "settings.account.tryReloadServices" : "Próbáld újra",
    "settings.account.tryReloadUserInfoRequest" : "Próbáld újra",
    "settings.account.userInfoRequestFailed" : "A felhasználói adatok betöltése sikertelen",
    "settings.app.buttonClearAllCache" : "Gyorsítótár törlése",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Béta verziók keresése",
    "settings.app.form.darkMode" : "Csatlakozz a Sötét Oldalhoz",
    "settings.app.form.enableGPUAcceleration" : "Hardveres gyorsítás engedélyezése",
-   "settings.app.form.enableMenuBar" : "Franz megjelenítése a menüsorban",
    "settings.app.form.enableSpellchecking" : "Helyesírás-ellenőrzés engedélyezése",
    "settings.app.form.enableSystemTray" : "Franz mutatása a tálcán",
-   "settings.app.form.hideDockIcon" : "Franz ikon elrejtése a Dock mögött",
    "settings.app.form.language" : "Nyelv",
    "settings.app.form.minimizeToSystemTray" : "Franz kicsinyítése a tálcára",
    "settings.app.form.runInBackground" : "Franz fusson a háttérben az ablak bezárásakor",
    "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
-   "settings.app.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
    "settings.app.headline" : "Beállítások",
    "settings.app.headlineAdvanced" : "Haladó",
    "settings.app.headlineAppearance" : "Megjelenés",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Kérjük indítsd újra a Franz-ot a proxy beállítások megváltoztatása után.",
    "settings.service.form.proxy.user" : "Felhasználó (opcionális)",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
-   "settings.service.form.spellcheckerLanguage" : "Helyesírás-ellenőrző nyelve",
-   "settings.service.form.spellcheckerLanguage.default" : "Rendszer alapbeállítás használata ({default})",
    "settings.service.form.tabHosted" : "Üzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Szolgáltatások felfedezése",
    "settings.services.headline" : "Szolgáltatásaid",
    "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva",
    "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
    "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU állampolgárok: helyi vásárlás esetén adók kerülhetnek felszámolásra",
    "subscription.features.ads" : "Hirdetésmentes, mindig!",
    "subscription.features.comingSoon" : "hamarosan",
-   "subscription.features.encryptedSync" : "Titkosított munkamenet szinkronizálás",
    "subscription.features.noInterruptions" : "Nincs több app késlekedés és liszencfrissítési piszkálás",
-   "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
    "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
    "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
    "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Újratöltés",
    "validation.email" : "{field} nem érvényes",
    "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} kitöltése kötelező",
    "validation.url" : "{field} nem érvényes URL",
    "welcome.loginButton" : "Jelentkezz be a fiókodba",
-   "welcome.signupButton" : "Új fiók létrehozása",
-   "welcome.slogan" : "Üzenetküldés okosan"
+   "welcome.signupButton" : "Új fiók létrehozása"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 6abbf064b..73271dceb 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Dukungan",
    "menu.help.tos" : "Ketentuan Layanan",
    "menu.services" : "Layanan",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Tambahkan Layanan Baru...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Tampilan",
    "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
    "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Unduh",
    "settings.account.manageSubscription.label" : "Kelola langganan Anda",
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
+   "settings.account.tryReloadServices" : "Coba lagi",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna",
    "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Sertakan versi beta",
    "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)",
    "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU",
-   "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu",
    "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan",
    "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem",
-   "settings.app.form.hideDockIcon" : "Sembunyikan ikon Franz di Dock",
    "settings.app.form.language" : "Bahasa",
    "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem",
    "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela",
    "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
-   "settings.app.form.spellcheckerLanguage" : "Periksa ejaan",
    "settings.app.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Silahkan mulai ulang Franz setelah mengubah Setelan proxy",
    "settings.service.form.proxy.user" : "Pengguna (opsional)",
    "settings.service.form.saveButton" : "Simpan layanan",
-   "settings.service.form.spellcheckerLanguage" : "Periksa ejaan Bahasa",
-   "settings.service.form.spellcheckerLanguage.default" : "Gunakan Bawaan Sistem ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Temukan layanan",
    "settings.services.headline" : "Layanan Anda",
    "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
    "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
    "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku",
    "subscription.features.ads" : "Tanpa iklan, selamanya!",
    "subscription.features.comingSoon" : "segera hadir",
-   "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
    "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi",
-   "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat",
    "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
    "subscription.features.proxy" : "Dukungan proksi untuk layanan",
    "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Muat Ulang",
    "validation.email" : "{field} tidak benar",
    "validation.minLength" : "{field} setidaknya harus {length} karakter",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} wajib diisi",
    "validation.url" : "{field} bukan URL yang benar",
    "welcome.loginButton" : "Masuk ke akun Anda",
-   "welcome.signupButton" : "Buat akun gratis",
-   "welcome.slogan" : "Perpesanan yang bekerja untuk Anda"
+   "welcome.signupButton" : "Buat akun gratis"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index b63b30a90..71150483c 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Supporto",
    "menu.help.tos" : "Termini di Servizio",
    "menu.services" : "Servizi",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualizza",
    "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
    "menu.view.exitFullScreen" : "Esci da Schermo Intero",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Scarica",
    "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
+   "settings.account.tryReloadServices" : "Prova di nuovo",
    "settings.account.tryReloadUserInfoRequest" : "Prova di nuovo",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
    "settings.app.buttonClearAllCache" : "Svuota la cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Includi versioni beta",
    "settings.app.form.darkMode" : "Unisciti al Lato Oscuro.",
    "settings.app.form.enableGPUAcceleration" : "Attiva Accelerazione GPU",
-   "settings.app.form.enableMenuBar" : "Mostra Franz nella Barra del Menu",
    "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
    "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
-   "settings.app.form.hideDockIcon" : "Nascondi l'icona Franz nel Dock",
    "settings.app.form.language" : "Lingua",
    "settings.app.form.minimizeToSystemTray" : "Minimizza Franz nell'area di notifica",
    "settings.app.form.runInBackground" : "Mantieni Franz in esecuzione quando chiudi la finestra",
    "settings.app.form.showDisabledServices" : "Mostra schede servizi disattivati",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
-   "settings.app.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Riavvia Franz dopo aver cambiato le impostazioni del proxy.",
    "settings.service.form.proxy.user" : "Utente (opzionale)",
    "settings.service.form.saveButton" : "Salva servizio",
-   "settings.service.form.spellcheckerLanguage" : "Lingua per controllo ortografico",
-   "settings.service.form.spellcheckerLanguage.default" : "Usa le impostazioni predefinite di sistema ({default})",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ⭐️",
    "settings.service.form.team" : "Gruppo",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Scopri servizi",
    "settings.services.headline" : "I tuoi servizi",
    "settings.services.noServicesAdded" : "Non hai aggiunto ancora nessun servizio.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
    "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
    "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Per i residenti UE: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
-   "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
    "subscription.features.noInterruptions" : "L'upgrade della licenza avrà impatti sull'utilizzo dell'App",
-   "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come HipChat",
    "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
    "subscription.features.proxy" : "Supporto proxy per i servizi",
    "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ricarica",
    "validation.email" : "{field} non valido",
    "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} è necessario",
    "validation.url" : "{field} non è un URL valido",
    "welcome.loginButton" : "Accedi al tuo account",
-   "welcome.signupButton" : "Crea un account gratuito",
-   "welcome.slogan" : "Un sistema di messaggistica che va bene per te"
+   "welcome.signupButton" : "Crea un account gratuito"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 838dc81ea..bd1024a34 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "サポート",
    "menu.help.tos" : "サービス利用規約",
    "menu.services" : "サービス",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "サービスを追加",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "表示",
    "menu.view.enterFullScreen" : "全画面表示",
    "menu.view.exitFullScreen" : "全画面表示を終了する",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプションの管理",
    "settings.account.successInfo" : "変更内容が保存されました",
+   "settings.account.tryReloadServices" : "もう一度試す",
    "settings.account.tryReloadUserInfoRequest" : "もう一度試す",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読み込めませんでした",
    "settings.app.buttonClearAllCache" : "キャッシュを消去する",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Betaバージョンを含める",
    "settings.app.form.darkMode" : "ダークモードを有効にする",
    "settings.app.form.enableGPUAcceleration" : "GPUアクセラレーションを有効にする",
-   "settings.app.form.enableMenuBar" : "メニューバーにFranzを表示する",
    "settings.app.form.enableSpellchecking" : "スペルチェックを有効にする",
    "settings.app.form.enableSystemTray" : "Franzをシステムトレイに表示する",
-   "settings.app.form.hideDockIcon" : "DockからFranzを隠す",
    "settings.app.form.language" : "言語",
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイに最小化する",
    "settings.app.form.runInBackground" : "ウインドウを閉じた際にFranzをバックグラウンドで実行させておく",
    "settings.app.form.showDisabledServices" : "無効化されたサービスのタブを表示する",
    "settings.app.form.showMessagesBadgesWhenMuted" : "通知の無効時に未読メッセージ件数を表示する",
-   "settings.app.form.spellcheckerLanguage" : "スペルチェックする言語",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "プロキシ設定を変更してから、Franzを再起動してください",
    "settings.service.form.proxy.user" : "ユーザー名（任意）",
    "settings.service.form.saveButton" : "サービスの保存",
-   "settings.service.form.spellcheckerLanguage" : "言語のスペルチェック",
-   "settings.service.form.spellcheckerLanguage.default" : " {default}を初期設定で使用してください",
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ⭐️",
    "settings.service.form.team" : "チーム",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "サービスを探す",
    "settings.services.headline" : "利用中のサービス",
    "settings.services.noServicesAdded" : "まだ、どのサービスも追加されていません。",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "サービスが無効です",
    "settings.services.tooltip.isMuted" : "無音となっています",
    "settings.services.tooltip.notificationsDisabled" : "通知は無効です",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU在住者 : 地域の消費税が適用される可能性があります",
    "subscription.features.ads" : "広告は一切ありません!",
    "subscription.features.comingSoon" : "まもなく登場",
-   "subscription.features.encryptedSync" : "暗号化されたセッションの同期",
    "subscription.features.noInterruptions" : "待ち時間なしでFranz をお使いいただけます",
-   "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
    "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
    "subscription.features.proxy" : "プロキシ設定が利用可能",
    "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "再読み込み",
    "validation.email" : "{field}は正しくありません",
    "validation.minLength" : "{field}は少なくとも{length}文字以上でなければなりません",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}は必須です",
    "validation.url" : "{field}は正しいURLではありません",
    "welcome.loginButton" : "アカウントにログイン",
-   "welcome.signupButton" : "無料アカウントを作成",
-   "welcome.slogan" : "Messaging that works for you"
+   "welcome.signupButton" : "無料アカウントを作成"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index ec0cdd375..4796cbe9f 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Support",
    "menu.help.tos" : "Terms of Service",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Add New Service...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "View",
    "menu.view.enterFullScreen" : "Enter Full Screen",
    "menu.view.exitFullScreen" : "Exit Full Screen",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "გადმოწერა",
    "settings.account.manageSubscription.label" : "თქვენი გამოწერის მართვა",
    "settings.account.successInfo" : "თქვენი ცვლილებები შენახულია",
+   "settings.account.tryReloadServices" : "სცადეთ ხელახლა",
    "settings.account.tryReloadUserInfoRequest" : "სცადეთ ხელახლა",
    "settings.account.userInfoRequestFailed" : "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
    "settings.app.buttonClearAllCache" : "Clear cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "ჩართეთ ბეტა ვერსიები",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Enable GPU Acceleration",
-   "settings.app.form.enableMenuBar" : "Show Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Enable spell checking",
    "settings.app.form.enableSystemTray" : "აჩვენეთ Franz სისტემის უჯრაში",
-   "settings.app.form.hideDockIcon" : "Hide Franz icon in Dock",
    "settings.app.form.language" : "ენა",
    "settings.app.form.minimizeToSystemTray" : "ჩაკეცეთ Franz სისტემის უჯრაში",
    "settings.app.form.runInBackground" : "დატოვეთ Franz გაშვებული როდესაც ფანჯარა დაიხურება",
    "settings.app.form.showDisabledServices" : "Display disabled services tabs",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "პარამეტრები",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "სერვისის შენახვა",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "დაჰოსტილი",
    "settings.service.form.tabOnPremise" : "თვით დაჰოსტილი ⭐️",
    "settings.service.form.team" : "გუნდი",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "აღმოაჩინეთ სერვისები",
    "settings.services.headline" : "თქვენი სერვისები",
    "settings.services.noServicesAdded" : "თქვენ ჯერ არ გაქვთ სერვისები დამატებული.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "სერვისი გათიშულია",
    "settings.services.tooltip.isMuted" : "All sounds are muted",
    "settings.services.tooltip.notificationsDisabled" : "შეტყობინებები გათიშულია",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
    "subscription.features.ads" : "არანაირი რეკლამები, არასდროს!",
    "subscription.features.comingSoon" : "მალე",
-   "subscription.features.encryptedSync" : "დაშიფრული სესიის სინქრონიზაცია",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "on-premise\/hosted სერვისების დამატება, როგორიცაა HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "ჩატვირთვა",
    "validation.email" : "{field} is not valid",
    "validation.minLength" : "{field} should be at least {length} characters long",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is required",
    "validation.url" : "{field} is not a valid URL",
    "welcome.loginButton" : "შედით თქვენს ანგარიშში",
-   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
-   "welcome.slogan" : "შეტყობინების აპლიკაცია, რომელიც მუშაობს შენთვის"
+   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 2082edd6d..00d7ddd06 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Services",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe service toevoegen...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Volledig scherm openen",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache wissen",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclusief beta versies",
    "settings.app.form.darkMode" : "Word lid van de Dark Side",
    "settings.app.form.enableGPUAcceleration" : "GPU Acceleratie Activeren",
-   "settings.app.form.enableMenuBar" : "Toon Franz in Menu Bar",
    "settings.app.form.enableSpellchecking" : "Spellingcontrole inschakelen",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Taal spellingscontrole",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw op na het aanpassen van proxy Instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Taal spellingscontrole",
-   "settings.service.form.spellcheckerLanguage.default" : "Gebruik Systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Services ontdekken",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen reclame, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Synchronisatie van geëncrypteerde sessies",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy ondersteuning voor services",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Inloggen op je account",
-   "welcome.signupButton" : "Maak een gratis account aan",
-   "welcome.slogan" : "Messaging die voor jou werkt"
+   "welcome.signupButton" : "Maak een gratis account aan"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index df0549a28..782c29a6c 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Ondersteuning",
    "menu.help.tos" : "Servicevoorwaarden",
    "menu.services" : "Diensten",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Nieuwe dienst toevoegen",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Weergave",
    "menu.view.enterFullScreen" : "Gebruik volledig scherm",
    "menu.view.exitFullScreen" : "Volledig scherm verlaten",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Download",
    "settings.account.manageSubscription.label" : "Beheer je abonnement",
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.account.tryReloadServices" : "Probeer opnieuw",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikersinformatie niet laden",
    "settings.app.buttonClearAllCache" : "Cache legen",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Inclusief bètaversies",
    "settings.app.form.darkMode" : "Stap over naar de donkere kant",
    "settings.app.form.enableGPUAcceleration" : "Schakel videokaart acceleratie in ",
-   "settings.app.form.enableMenuBar" : "Toon Franz in menubalk",
    "settings.app.form.enableSpellchecking" : "Zet spellingcontrole aan",
    "settings.app.form.enableSystemTray" : "Toon Franz in de systeembalk",
-   "settings.app.form.hideDockIcon" : "Verberg Franz in Dock",
    "settings.app.form.language" : "Taal",
    "settings.app.form.minimizeToSystemTray" : "Minimaliseer Franz naar de systeembalk",
    "settings.app.form.runInBackground" : "Houd Franz op de achtergrond wanneer het venster gesloten wordt",
    "settings.app.form.showDisabledServices" : "Toon uitgeschakelde services",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
-   "settings.app.form.spellcheckerLanguage" : "Spelling checken",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Start Franz opnieuw na het aanpassen van proxy instellingen.",
    "settings.service.form.proxy.user" : "Gebruiker (optioneel)",
    "settings.service.form.saveButton" : "Service opslaan",
-   "settings.service.form.spellcheckerLanguage" : "Spellingcontrole taal",
-   "settings.service.form.spellcheckerLanguage.default" : "Gebruik systeemstandaard ({default})",
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Zelf-gehost ⭐️",
    "settings.service.form.team" : "Team",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Ontdek services",
    "settings.services.headline" : "Jouw services",
    "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld",
    "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
    "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
-   "subscription.features.encryptedSync" : "Beveiligde sessie synchronisatie",
    "subscription.features.noInterruptions" : "Geen haperingen & pop ups over upgrades",
-   "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
    "subscription.features.proxy" : "Proxy understeuning voor diensten",
    "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Herladen",
    "validation.email" : "{field} is niet geldig",
    "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} is vereist",
    "validation.url" : "{field} is niet een geldige URL",
    "welcome.loginButton" : "Log in op je account",
-   "welcome.signupButton" : "Maak een gratis account",
-   "welcome.slogan" : "Messaging die voor jou werkt"
+   "welcome.signupButton" : "Maak een gratis account"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e1a1747b3..dd70f25f7 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Wsparcie",
    "menu.help.tos" : "Warunki świadczenia usług",
    "menu.services" : "Usługi",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Dodaj nową usługę...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Widok",
    "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
    "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Pobierz",
    "settings.account.manageSubscription.label" : "Zarządzaj swoimi subskrypcjami",
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
+   "settings.account.tryReloadServices" : "Spróbuj ponownie",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
    "settings.app.buttonClearAllCache" : "Wyczyść pamięć podręczną (cache)",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Uwzględnij wersje beta",
    "settings.app.form.darkMode" : "Przejdź na Ciemną Stronę",
    "settings.app.form.enableGPUAcceleration" : "Włącz akcelerację GPU",
-   "settings.app.form.enableMenuBar" : "Pokaż Franz na pasku menu",
    "settings.app.form.enableSpellchecking" : "Włącz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w obszarze powiadomień",
-   "settings.app.form.hideDockIcon" : "Ukrywaj ikonę Franz w zasobniku systemowym",
    "settings.app.form.language" : "Język",
    "settings.app.form.minimizeToSystemTray" : "Zminimalizuj aplikację Franz",
    "settings.app.form.runInBackground" : "Zachowaj aplikację Franz w tle po zamknięciu okna",
    "settings.app.form.showDisabledServices" : "Wyłącz wyświetlanie zakładek z usługami",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
-   "settings.app.form.spellcheckerLanguage" : "Język słownika",
    "settings.app.headline" : "Ustawienia",
    "settings.app.headlineAdvanced" : "Zaawansowane",
    "settings.app.headlineAppearance" : "Wygląd",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Uruchom ponownie Franz po zmianie ustawień proxy.",
    "settings.service.form.proxy.user" : "Użytkownik (opcjonalnie)",
    "settings.service.form.saveButton" : "Zapisz usługę",
-   "settings.service.form.spellcheckerLanguage" : "Język sprawdzania pisowni",
-   "settings.service.form.spellcheckerLanguage.default" : "Użyj domyślnego dla systemu ({default})",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ⭐️",
    "settings.service.form.team" : "Zespół",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Przeglądaj usługi",
    "settings.services.headline" : "Twoje usługi",
    "settings.services.noServicesAdded" : "Nie dodałeś jeszcze żadnych usług.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usługa jest nieaktywna",
    "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
    "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Rezydenci UE: lokalne stawki VAT mogą zostać zaaplikowane",
    "subscription.features.ads" : "Brak reklam, na zawsze!",
    "subscription.features.comingSoon" : "wkrótce dostępne",
-   "subscription.features.encryptedSync" : "Szyfrowana synchronizacja sesji",
    "subscription.features.noInterruptions" : "Bez opóźnień i przypominania o ulepszeniu licencji",
-   "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
    "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
    "subscription.features.proxy" : "Obsługa proxy dla usług",
    "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Przeładuj",
    "validation.email" : "Pole {field} nie jest poprawne",
    "validation.minLength" : "Pole {field} powinno składać się z co najmniej {length} znaków",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "Pole {field} jest wymagane",
    "validation.url" : "Pole {field} nie jest poprawnym ciągiem URL.",
    "welcome.loginButton" : "Zaloguj się na swoje konto",
-   "welcome.signupButton" : "Stwórz darmowe konto",
-   "welcome.slogan" : "Komunikator który działa"
+   "welcome.signupButton" : "Stwórz darmowe konto"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 0ab5bdd21..490771c39 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
    "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
    "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Enviar como e-mail",
+   "feature.shareFranz.action.facebook" : "Compartilhar no Facebook",
+   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
+   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
+   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "Adicionei o serviço de {count} ao Franz! Adquira o app grátis para usar WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
    "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
    "global.notConnectedToTheInternet" : "Você não está conectado à internet",
    "global.spellchecker.useDefault" : "Use o padrão do sistema ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Detectar linguagem automaticamente.",
+   "global.spellchecking.autodetect.short" : "Automático",
    "global.spellchecking.language" : "Idioma de verificação ortográfica",
    "import.headline" : "Importe seus serviços do Franz 4 ",
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5 ",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos de Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Adicionar Novo Serviço",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Visualizar ",
    "menu.view.enterFullScreen" : "Modo Tela Cheia",
    "menu.view.exitFullScreen" : "Sair da Tela Cheia",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Baixar",
    "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
    "settings.account.successInfo" : "Suas alterações foram gravadas",
+   "settings.account.tryReloadServices" : "Tente novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
    "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
    "settings.app.buttonClearAllCache" : "Limpar cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versões beta",
    "settings.app.form.darkMode" : "Venha para o Lado Negro da força",
    "settings.app.form.enableGPUAcceleration" : "Ativar Aceleração de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar correção ortográfica",
    "settings.app.form.enableSystemTray" : "Exibir o Franz na barra de sistema",
-   "settings.app.form.hideDockIcon" : "Ocultar ícone do Franz no Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a área de sistema",
    "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
    "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Idioma de verificação ortográfica",
    "settings.app.headline" : "Configurações",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Por favor, reinicie o Franz após alterar as configurações de proxy.",
    "settings.service.form.proxy.user" : "Usuário (opcional)",
    "settings.service.form.saveButton" : "Salvar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Língua do corretor ortográfico",
-   "settings.service.form.spellcheckerLanguage.default" : "Use o padrão do sistema ({default})",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ⭐️",
    "settings.service.form.team" : "Equipe",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Seus serviços",
    "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Sem som",
    "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes na União Europeia: taxas locais serão aplicadas",
    "subscription.features.ads" : "Sem anúncios, pra sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada das sessões",
    "subscription.features.noInterruptions" : "Sem demora e sem chateação para comprar uma licença. ",
-   "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
    "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
    "subscription.features.proxy" : "Suporte de proxy para serviços",
    "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "inválido",
    "validation.minLength" : "{campo} deve ter pelo menos {comprimento} mais caracteres ",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{campo} obrigatório",
    "validation.url" : "{campo} essa URL não é válida",
    "welcome.loginButton" : "Entrar na sua conta",
-   "welcome.signupButton" : "Criar uma conta grátis",
-   "welcome.slogan" : "Mensagens que funcionam para você"
+   "welcome.signupButton" : "Criar uma conta grátis"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 9e7455bdf..7e23aa0ba 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Suporte",
    "menu.help.tos" : "Termos do Serviço",
    "menu.services" : "Serviços",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Ver",
    "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
    "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Transferir",
    "settings.account.manageSubscription.label" : "Gerir as minhas subscrições",
    "settings.account.successInfo" : "As suas alterações foram efetuadas com sucesso",
+   "settings.account.tryReloadServices" : "Tentar novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
    "settings.app.buttonClearAllCache" : "Limpar cache",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
    "settings.app.form.darkMode" : "Junta-te ao Lado Negro",
    "settings.app.form.enableGPUAcceleration" : "Activar Aceleração de GPU",
-   "settings.app.form.enableMenuBar" : "Mostrar Franz na Barra de Menu",
    "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na barra do sistema",
-   "settings.app.form.hideDockIcon" : "Esconder ícone na Dock",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a barra do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
    "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desativados",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
-   "settings.app.form.spellcheckerLanguage" : "Linguagem para correção ortográfica",
    "settings.app.headline" : "Definições",
    "settings.app.headlineAdvanced" : "Avançado",
    "settings.app.headlineAppearance" : "Aparência",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Reinicie, por favor, após atualizar as definições do Franz",
    "settings.service.form.proxy.user" : "Utilizador (opcional)",
    "settings.service.form.saveButton" : "Guardar serviço",
-   "settings.service.form.spellcheckerLanguage" : "Linguagem de correção ortográfica",
-   "settings.service.form.spellcheckerLanguage.default" : "Utilizar o Sistema por Omissão ({default})",
    "settings.service.form.tabHosted" : "Com domínio",
    "settings.service.form.tabOnPremise" : "Com domínio próprio ⭐️",
    "settings.service.form.team" : "Equipa",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os seus serviços",
    "settings.services.noServicesAdded" : "Ainda não adicionou nenhum serviço.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
    "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "em breve",
-   "subscription.features.encryptedSync" : "Sincronização encriptada de sessão",
    "subscription.features.noInterruptions" : "Sem atrasos na aplicação nem mensagens para comprar uma licença",
-   "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
    "subscription.features.proxy" : "Suporte Proxy para os serviços",
    "subscription.features.spellchecker" : "Suporte para correção ortográfica",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Recarregar",
    "validation.email" : "{field} não é válido",
    "validation.minLength" : "{field} deveria ter pelo menos {length} caracteres",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} é obrigatório",
    "validation.url" : "{field} não é uma hiperligação válida",
    "welcome.loginButton" : "Iniciar sessão",
-   "welcome.signupButton" : "Criar uma conta gratuita",
-   "welcome.slogan" : "Sistema de mensagens feito para si"
+   "welcome.signupButton" : "Criar uma conta gratuita"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 6098c8ad9..d8e02b7f3 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -69,8 +69,10 @@
    "menu.help.privacy" : "Политика конфиденциальности",
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "Условия использования",
-   "menu.services" : "Сервисы",
+   "menu.services" : "Сервис",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Добавить новый сервис...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "На весь экран",
    "menu.view.exitFullScreen" : "В окне",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Скачать",
    "settings.account.manageSubscription.label" : "Управление вашей подпиской",
    "settings.account.successInfo" : "Ваши изменения были сохранены",
+   "settings.account.tryReloadServices" : "Попробовать снова",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать снова",
    "settings.account.userInfoRequestFailed" : "Невозможно загрузить информацию пользователя",
    "settings.app.buttonClearAllCache" : "Очистить кэш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Включая бета версии",
    "settings.app.form.darkMode" : "Перейти на Тёмную сторону",
    "settings.app.form.enableGPUAcceleration" : "Включить ускорение GPU",
-   "settings.app.form.enableMenuBar" : "Показывать Franz на панели меню",
    "settings.app.form.enableSpellchecking" : "Включить проверку правописания",
    "settings.app.form.enableSystemTray" : "Показывать Franz в системном трее",
-   "settings.app.form.hideDockIcon" : "Спрятать иконку Franz на панели",
    "settings.app.form.language" : "Язык",
    "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в системный трей",
    "settings.app.form.runInBackground" : "Оставлять Franz в фоне при закрытии окна",
    "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых служб",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
-   "settings.app.form.spellcheckerLanguage" : "Проверка правописания",
    "settings.app.headline" : "Настройки",
    "settings.app.headlineAdvanced" : "Дополнительно",
    "settings.app.headlineAppearance" : "Внешний вид",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Пожалуйста перезапустите Franz после изменения настроек прокси.",
    "settings.service.form.proxy.user" : "Пользователь (опционально)",
    "settings.service.form.saveButton" : "Сохранить сервис",
-   "settings.service.form.spellcheckerLanguage" : "Проверка правописания",
-   "settings.service.form.spellcheckerLanguage.default" : "Использовать системные параметры по умолчанию ({default})",
    "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хостинг ⭐️",
    "settings.service.form.team" : "Команда",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Найти сервисы",
    "settings.services.headline" : "Ваши сервисы",
    "settings.services.noServicesAdded" : "Вы пока не добавили никаких сервисов.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Сервис отключен",
    "settings.services.tooltip.isMuted" : "Все звуки отключены",
    "settings.services.tooltip.notificationsDisabled" : "Уведомления отключены",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут применяться местные налоги",
    "subscription.features.ads" : "Без рекламы, навсегда!",
    "subscription.features.comingSoon" : "скоро",
-   "subscription.features.encryptedSync" : "Зашифрованные сессии синхронизации",
    "subscription.features.noInterruptions" : "Никаких задержек и предложений перейти на платную версию",
-   "subscription.features.onpremise" : "Добавление облачных служб или служб на своём хостинге типа HipChat",
    "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хостинге сервисы, такие как Mattermost",
    "subscription.features.proxy" : "Подержка прокси для сервисов",
    "subscription.features.spellchecker" : "Поддержка проверки правописания",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Перезагрузить",
    "validation.email" : "{field} недействительно",
    "validation.minLength" : "{field} должно быть не менее {length} символов",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обязательно",
    "validation.url" : "{field} является недействительной ссылкой",
    "welcome.loginButton" : "Вход",
-   "welcome.signupButton" : "Создать бесплатный аккаунт",
-   "welcome.slogan" : "Общение, которое работает для вас"
+   "welcome.signupButton" : "Создать бесплатный аккаунт"
 }
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 35c699322..688490b58 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Podpora",
    "menu.help.tos" : "Podmienky použitia",
    "menu.services" : "Služby",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Pridať novú službu...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Zobraziť",
    "menu.view.enterFullScreen" : "Na celú obrazovku",
    "menu.view.exitFullScreen" : "Ukončiť režim na celú obrazovku",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Prevziať",
    "settings.account.manageSubscription.label" : "Spravovať vaše odoberanie",
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
+   "settings.account.tryReloadServices" : "Skúsiť znova",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
    "settings.account.userInfoRequestFailed" : "Nebolo možné načítať informácie o používateľovi",
    "settings.app.buttonClearAllCache" : "Vyčistiť vyrovnávaciu pamäť",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Vrátane beta verzií",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Zapnúť GPU zrýchlenie",
-   "settings.app.form.enableMenuBar" : "Zobraziť Franz v ponuke menu",
    "settings.app.form.enableSpellchecking" : "Zapnúť kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
-   "settings.app.form.hideDockIcon" : "Skryť ikonu Franz v doku",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Po zatvorení okna ponechať Franz spustený na pozadí",
    "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Nastavenia",
    "settings.app.headlineAdvanced" : "Pokročilé",
    "settings.app.headlineAppearance" : "Vzhľad",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Uložiť službu",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostované",
    "settings.service.form.tabOnPremise" : "Vlastné hostovanie ⭐️",
    "settings.service.form.team" : "Tím",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Preskúmať služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Doposiaľ ste nepridali žiadne služby.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
    "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Pre obyvateľov EÚ: môže byť aplikovaná miestna daň",
    "subscription.features.ads" : "Žiadne reklamy, nikdy!",
    "subscription.features.comingSoon" : "už čoskoro",
-   "subscription.features.encryptedSync" : "Šifrovaná synchronizácia relácie",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Pridať lokálne hostované služby, ako napr. HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Obnoviť",
    "validation.email" : "{field} je neplatný",
    "validation.minLength" : "{field} by malo byť dlhé aspoň {length} znakov",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} je povinné",
    "validation.url" : "{field} nie je platné URL",
    "welcome.loginButton" : "Prihlásiť sa do vášho účtu",
-   "welcome.signupButton" : "Vytvoriť účet zdarma",
-   "welcome.slogan" : "Správy, ktoré pracujú pre vás"
+   "welcome.signupButton" : "Vytvoriť účet zdarma"
 }
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 8ffc0c007..a3a80925d 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Подршка",
    "menu.help.tos" : "Услови коришћења услуге",
    "menu.services" : "Usluge",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додај нову услугу",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Преглед",
    "menu.view.enterFullScreen" : "Отвори у целом екрану",
    "menu.view.exitFullScreen" : "Напусти цео екран",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Preuzmite",
    "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
    "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadServices" : "Pokušajte ponovno",
    "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
    "settings.account.userInfoRequestFailed" : "Nije moguće učitati informacije o korisniku",
    "settings.app.buttonClearAllCache" : "Очисти кеш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Obuhvati i beta verzije",
    "settings.app.form.darkMode" : "Join the Dark Side",
    "settings.app.form.enableGPUAcceleration" : "Омогући убрзање графичке јединице",
-   "settings.app.form.enableMenuBar" : "Покажи Франз у менију",
    "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
    "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
-   "settings.app.form.hideDockIcon" : "Сакриј Франз иконицу у доку",
    "settings.app.form.language" : "Jezik",
    "settings.app.form.minimizeToSystemTray" : "Smanji Franca u sustavsku traku",
    "settings.app.form.runInBackground" : "Neka se Franc održava u pozadini i ako je prozor zatvoren",
    "settings.app.form.showDisabledServices" : "Prikaži ploče s onemogućenim servisima",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
-   "settings.app.form.spellcheckerLanguage" : "Spell checking language",
    "settings.app.headline" : "Подешавања",
    "settings.app.headlineAdvanced" : "Napredne alatke",
    "settings.app.headlineAppearance" : "Izgled",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Please restart Franz after changing proxy Settings.",
    "settings.service.form.proxy.user" : "User (optional)",
    "settings.service.form.saveButton" : "Sačuvaj uslugu\/e",
-   "settings.service.form.spellcheckerLanguage" : "Spell checking Language",
-   "settings.service.form.spellcheckerLanguage.default" : "Use System Default ({default})",
    "settings.service.form.tabHosted" : "Hostovano",
    "settings.service.form.tabOnPremise" : "Samo-hostovano ⭐️",
    "settings.service.form.team" : "Tim",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Pronađite usluge",
    "settings.services.headline" : "Vaše usluge",
    "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Usluga je onemogućena.",
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni.",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
    "subscription.features.ads" : "Bez reklama, doživotno!",
    "subscription.features.comingSoon" : "Dolazi uskoro",
-   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Ponovno učitavanje",
    "validation.email" : "{поље} није валидно",
    "validation.minLength" : "{поље} треба да буде најмање {дужина} карактера дугачко",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{поље} је неопходно",
    "validation.url" : "{field} није валидан УРЛ",
    "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun",
-   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+   "welcome.signupButton" : "Stvorite novi korisnički račun"
 }
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 70632b966..9f8313c2e 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -4,18 +4,18 @@
    "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
    "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
    "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.action.email" : "Mail olarak gönder",
+   "feature.shareFranz.action.facebook" : "Facebook'ta Paylaş",
+   "feature.shareFranz.action.twitter" : "Twitter'da Paylaş",
+   "feature.shareFranz.headline" : "Franz birlikte daha iyi!",
+   "feature.shareFranz.shareText.email" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin.",
+   "feature.shareFranz.shareText.twitter" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin. \/cc @MeetFranz",
+   "feature.shareFranz.text" : "Arkadaşlarına ve meslektaşlarına Franz'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
    "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor",
    "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
    "global.spellchecker.useDefault" : "Sistem Dilini Kullan ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect" : "Dili otomatik tespit et",
+   "global.spellchecking.autodetect.short" : "Otomatik",
    "global.spellchecking.language" : "İmla kontrol dili",
    "import.headline" : "Franz 4 servislerinizi içeri aktarın",
    "import.notSupportedHeadline" : "Henüz Franz 5'te desteklenmeyen servisler",
@@ -70,7 +70,9 @@
    "menu.help.support" : "Destek",
    "menu.help.tos" : "Kullanım Şartları",
    "menu.services" : "Hizmetler",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Yeni servis ekle...",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Görünüm",
    "menu.view.enterFullScreen" : "Tam Ekrana Geç",
    "menu.view.exitFullScreen" : "Tam Ekrandan Çık",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "İndir",
    "settings.account.manageSubscription.label" : "Aboneliğini yönet",
    "settings.account.successInfo" : "Değişikliklerin kaydedildi",
+   "settings.account.tryReloadServices" : "Tekrar deneyin",
    "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
    "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi",
    "settings.app.buttonClearAllCache" : "Önbelleği temizle",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Beta versiyonları dahil et",
    "settings.app.form.darkMode" : "Karanlık tarafa katıl",
    "settings.app.form.enableGPUAcceleration" : "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
-   "settings.app.form.enableMenuBar" : "Menü çubuğunda Franz'ı göster",
    "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
    "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
-   "settings.app.form.hideDockIcon" : "Franz Simgesini Gösterme",
    "settings.app.form.language" : "Dil",
    "settings.app.form.minimizeToSystemTray" : "Franz'ı sistem tepsisine küçült",
    "settings.app.form.runInBackground" : "Pencereyi kapatırken Franz'ı arka planda tut",
    "settings.app.form.showDisabledServices" : "Devre dışı bırakılan servis sekmelerini göster",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
-   "settings.app.form.spellcheckerLanguage" : "İmla kontrol dili",
    "settings.app.headline" : "Ayarlar",
    "settings.app.headlineAdvanced" : "Gelişmiş",
    "settings.app.headlineAppearance" : "Görünüm",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Proxy ayarlarını değiştirdikten sonra Franz'ı yeniden başlatınız.",
    "settings.service.form.proxy.user" : "Kullanıcı (opsiyonel)",
    "settings.service.form.saveButton" : "Servisi kaydet",
-   "settings.service.form.spellcheckerLanguage" : "İmla kontrol dili",
-   "settings.service.form.spellcheckerLanguage.default" : "Sistem Dilini Kullan ({default})",
    "settings.service.form.tabHosted" : "Barındırılan",
    "settings.service.form.tabOnPremise" : "Kendi barındırılan",
    "settings.service.form.team" : "Takım",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Servisleri keşfet",
    "settings.services.headline" : "Servislerin",
    "settings.services.noServicesAdded" : "Henüz hiç servis eklemedin.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Servis devre dışı",
    "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
    "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
@@ -255,11 +254,9 @@
    "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
    "subscription.features.ads" : "Reklam yok, asla!",
    "subscription.features.comingSoon" : "yakında geliyor",
-   "subscription.features.encryptedSync" : "Şifreli oturum senkronizasyonu",
-   "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
-   "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
-   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.noInterruptions" : "Uygulama gecikmeleri & yükseltme lisanları için dırdır yok",
+   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
+   "subscription.features.proxy" : "Servisler için proxy desteği",
    "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Tekrar yükle",
    "validation.email" : "{alan} geçerli değil",
    "validation.minLength" : "{field} en az {length} karakter uzunluğunda olmalı",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} gereklidir",
    "validation.url" : "{field} geçerli bir URL değil",
    "welcome.loginButton" : "Hesabına giriş yap",
-   "welcome.signupButton" : "Ücretsiz hesap oluştur",
-   "welcome.slogan" : "Sizin için çalışan mesajlaşma"
+   "welcome.signupButton" : "Ücretsiz hesap oluştur"
 }
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index db3145b36..56dda09d5 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "Підтримка",
    "menu.help.tos" : "Умови використання",
    "menu.services" : "Служби",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "Додати сервіс",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "Вигляд",
    "menu.view.enterFullScreen" : "Вікно на повний екран",
    "menu.view.exitFullScreen" : "Вийти з повного екрану",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "Завантажити",
    "settings.account.manageSubscription.label" : "Керування вашою підпискою",
    "settings.account.successInfo" : "Ваші зміни були збережені",
+   "settings.account.tryReloadServices" : "Спробуйте ще раз",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "Не вдалося завантажити інформацію користувача",
    "settings.app.buttonClearAllCache" : "Очистити кеш",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "Включити бета-версії",
    "settings.app.form.darkMode" : "Переходь на Темну Сторону",
    "settings.app.form.enableGPUAcceleration" : "Ввімкнути прискорення GPU",
-   "settings.app.form.enableMenuBar" : "Відображати Franz в панелі головного меню",
    "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
    "settings.app.form.enableSystemTray" : "Показувати Franz у системному лотку",
-   "settings.app.form.hideDockIcon" : "Сховати значок Franz в Dock",
    "settings.app.form.language" : "Мова",
    "settings.app.form.minimizeToSystemTray" : "Мінімізувати Franz до системного лотка",
    "settings.app.form.runInBackground" : "Тримати Franz в фоні при закритті вікна",
    "settings.app.form.showDisabledServices" : "Показати вкладку вимкнених сервісів",
    "settings.app.form.showMessagesBadgesWhenMuted" : "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
-   "settings.app.form.spellcheckerLanguage" : "Мова перевірки правопису",
    "settings.app.headline" : "Налаштування",
    "settings.app.headlineAdvanced" : "Додаткові налаштування",
    "settings.app.headlineAppearance" : "Вигляд",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "Будь ласка, перезапустіть Franz після зміни налуштувань проксі",
    "settings.service.form.proxy.user" : "Користувач (опційно)",
    "settings.service.form.saveButton" : "Зберегти сервіс",
-   "settings.service.form.spellcheckerLanguage" : "Мова перевірки правопису",
-   "settings.service.form.spellcheckerLanguage.default" : "Використовувати системні параметри за змовчуванням ({default})",
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Самостійно розміщений ⭐️",
    "settings.service.form.team" : "Команда",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "Відкрийте для себе сервіси",
    "settings.services.headline" : "Ваші сервіси",
    "settings.services.noServicesAdded" : "Ви ще не додавали жодних сервісів.",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "Сервіс відключений",
    "settings.services.tooltip.isMuted" : "Всі звуки вимкнено",
    "settings.services.tooltip.notificationsDisabled" : "Сповіщення відключені",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "Для жителів ЄС: можуть застосовуватися податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
-   "subscription.features.encryptedSync" : "Шифрована синхронізація сеансу",
    "subscription.features.noInterruptions" : "Ніяких затримок та набридливих пропозицій з платних підписок",
-   "subscription.features.onpremise" : "Додайте on-premise \/ hosted сервіси, такі як Hipchat",
    "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
    "subscription.features.proxy" : "Підтримка проксі ",
    "subscription.features.spellchecker" : "Підтримка перевірки правопису",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "Перезавантажити",
    "validation.email" : "{field} не валідне",
    "validation.minLength" : "Кількість символів в {field} повина бути не меньше {length} ",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field} обов'язвоке",
    "validation.url" : "{field} не валідний URL",
    "welcome.loginButton" : "Увійдіть до свого акаунту",
-   "welcome.signupButton" : "Створити безплатний акаунт",
-   "welcome.slogan" : "Обмін повідомленнями, який працює для вас"
+   "welcome.signupButton" : "Створити безплатний акаунт"
 }
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 3ae08c9ef..54245ba57 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -70,7 +70,9 @@
    "menu.help.support" : "支援",
    "menu.help.tos" : "服務條款",
    "menu.services" : "服務",
+   "menu.services.activatePreviousService" : "Activate previous service",
    "menu.services.addNewService" : "新增服務",
+   "menu.services.setNextServiceActive" : "Activate next service",
    "menu.view" : "檢視",
    "menu.view.enterFullScreen" : "進入全螢幕模式",
    "menu.view.exitFullScreen" : "離開全螢幕模式",
@@ -128,6 +130,7 @@
    "settings.account.invoiceDownload" : "下載",
    "settings.account.manageSubscription.label" : "管理您的訂閱",
    "settings.account.successInfo" : "您的更變已經被儲存",
+   "settings.account.tryReloadServices" : "再試一次",
    "settings.account.tryReloadUserInfoRequest" : "再試一次",
    "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
    "settings.app.buttonClearAllCache" : "清除快取",
@@ -140,16 +143,13 @@
    "settings.app.form.beta" : "包含測試版",
    "settings.app.form.darkMode" : "加入黑暗面",
    "settings.app.form.enableGPUAcceleration" : "啟用 GPU 加速",
-   "settings.app.form.enableMenuBar" : "在選單列顯示 Franz",
    "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
    "settings.app.form.enableSystemTray" : "在系統列顯示 Franz",
-   "settings.app.form.hideDockIcon" : "隱藏 Dock 中的 Franz 圖示",
    "settings.app.form.language" : "語言",
    "settings.app.form.minimizeToSystemTray" : "最小化 Franz 到系統列",
    "settings.app.form.runInBackground" : "當關閉視窗時，保持 Franz 在背景運作",
    "settings.app.form.showDisabledServices" : "顯示停用的服務標籤",
    "settings.app.form.showMessagesBadgesWhenMuted" : "當通知關閉時，標記未讀的訊息",
-   "settings.app.form.spellcheckerLanguage" : "拼字檢查語言",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "進階",
    "settings.app.headlineAppearance" : "外觀",
@@ -212,8 +212,6 @@
    "settings.service.form.proxy.restartInfo" : "在變更 Proxy 設定後，請重新啟動 Franz",
    "settings.service.form.proxy.user" : "使用者 (選填)",
    "settings.service.form.saveButton" : "保存服務",
-   "settings.service.form.spellcheckerLanguage" : "拼字檢查語言",
-   "settings.service.form.spellcheckerLanguage.default" : "使用系統預設 ({default})",
    "settings.service.form.tabHosted" : "託管",
    "settings.service.form.tabOnPremise" : "自我託管⭐️",
    "settings.service.form.team" : "團隊",
@@ -223,6 +221,7 @@
    "settings.services.discoverServices" : "發現服務",
    "settings.services.headline" : "您的服務",
    "settings.services.noServicesAdded" : "你尚未新增任何服務",
+   "settings.services.servicesRequestFailed" : "Could not load your services",
    "settings.services.tooltip.isDisabled" : "服務已停用",
    "settings.services.tooltip.isMuted" : "所有的聲音都是靜音",
    "settings.services.tooltip.notificationsDisabled" : "通知已停用",
@@ -255,9 +254,7 @@
    "subscription.euTaxInfo" : "歐盟居民：可能採用當地銷售稅",
    "subscription.features.ads" : "無廣告，永遠!",
    "subscription.features.comingSoon" : "即將推出",
-   "subscription.features.encryptedSync" : "加密的會話同步",
    "subscription.features.noInterruptions" : "升級授權沒有延遲與打盹",
-   "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
    "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
    "subscription.features.proxy" : "服務的代理伺服器支援",
    "subscription.features.spellchecker" : "支援拼字檢查",
@@ -280,9 +277,9 @@
    "tabs.item.reload" : "重新載入",
    "validation.email" : "{field}無效",
    "validation.minLength" : "{field}長度至少應為{length}個字",
+   "validation.oneRequired" : "At least one is required",
    "validation.required" : "{field}為必填",
    "validation.url" : "{field}不是個有效的網址",
    "welcome.loginButton" : "登入您的帳戶",
-   "welcome.signupButton" : "建立免費帳號",
-   "welcome.slogan" : "為你通信"
+   "welcome.signupButton" : "建立免費帳號"
 }
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 384d4b441..4dd354afc 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Your services have been updated.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 23,
+      "line": 26,
       "column": 19
     },
     "end": {
-      "line": 26,
+      "line": 29,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!A new update for Franz is available.",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 27,
+      "line": 30,
       "column": 19
     },
     "end": {
-      "line": 30,
+      "line": 33,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Reload services",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 31,
+      "line": 34,
       "column": 24
     },
     "end": {
-      "line": 34,
+      "line": 37,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 35,
+      "line": 38,
       "column": 13
     },
     "end": {
-      "line": 38,
+      "line": 41,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 39,
+      "line": 42,
       "column": 23
     },
     "end": {
-      "line": 42,
+      "line": 45,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Could not load services and user information",
     "file": "src/components/layout/AppLayout.js",
     "start": {
-      "line": 43,
+      "line": 46,
       "column": 26
     },
     "end": {
-      "line": 46,
+      "line": 49,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index 7aa00a186..d67adc96e 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 11,
+      "line": 13,
       "column": 12
     },
     "end": {
-      "line": 14,
+      "line": 16,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 15,
+      "line": 17,
       "column": 17
     },
     "end": {
-      "line": 18,
+      "line": 20,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 19,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 24,
       "column": 3
     }
   },
@@ -43,11 +43,37 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 23,
+      "line": 25,
       "column": 10
     },
     "end": {
-      "line": 26,
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.openWorkspaceDrawer",
+    "defaultMessage": "!!!Open workspace drawer",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 29,
+      "column": 23
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.closeWorkspaceDrawer",
+    "defaultMessage": "!!!Close workspace drawer",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 33,
+      "column": 24
+    },
+    "end": {
+      "line": 36,
       "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 785ce9f29..77b0ed8a4 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": 9,
+      "line": 12,
       "column": 21
     },
     "end": {
-      "line": 12,
+      "line": 15,
       "column": 3
     }
   },
@@ -17,11 +17,24 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 13,
+      "line": 16,
       "column": 16
     },
     "end": {
-      "line": 16,
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 20,
+      "column": 18
+    },
+    "end": {
+      "line": 23,
       "column": 3
     }
   },
@@ -30,11 +43,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 17,
+      "line": 24,
       "column": 11
     },
     "end": {
-      "line": 20,
+      "line": 27,
       "column": 3
     }
   },
@@ -43,11 +56,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 21,
+      "line": 28,
       "column": 12
     },
     "end": {
-      "line": 24,
+      "line": 31,
       "column": 3
     }
   },
@@ -56,11 +69,11 @@
     "defaultMessage": "!!!Invite Friends",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 25,
+      "line": 32,
       "column": 17
     },
     "end": {
-      "line": 28,
+      "line": 35,
       "column": 3
     }
   },
@@ -69,11 +82,11 @@
     "defaultMessage": "!!!Logout",
     "file": "src/components/settings/navigation/SettingsNavigation.js",
     "start": {
-      "line": 29,
+      "line": 36,
       "column": 10
     },
     "end": {
-      "line": 32,
+      "line": 39,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
index 582d546fa..320d3ca3e 100644
--- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
+++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Upgrade account",
     "file": "src/components/ui/PremiumFeatureContainer/index.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 10
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
new file mode 100644
index 000000000..ef3e4b593
--- /dev/null
+++ b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "service.webviewLoader.loading",
+    "defaultMessage": "!!!Loading",
+    "file": "src/components/ui/WebviewLoader/index.js",
+    "start": {
+      "line": 11,
+      "column": 11
+    },
+    "end": {
+      "line": 14,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json
index 0fec9db64..34a43d5a0 100644
--- a/src/i18n/messages/src/features/shareFranz/Component.json
+++ b/src/i18n/messages/src/features/shareFranz/Component.json
@@ -79,7 +79,7 @@
   },
   {
     "id": "feature.shareFranz.shareText.twitter",
-    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz",
+    "defaultMessage": "!!! I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @FranzMessenger",
     "file": "src/features/shareFranz/Component.js",
     "start": {
       "line": 39,
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
new file mode 100644
index 000000000..f62bac42c
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "settings.workspace.add.form.submitButton",
+    "defaultMessage": "!!!Create workspace",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 13,
+      "column": 16
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.add.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
+    "start": {
+      "line": 17,
+      "column": 8
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
new file mode 100644
index 000000000..7b0c3e1ce
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -0,0 +1,67 @@
+[
+  {
+    "id": "settings.workspace.form.buttonDelete",
+    "defaultMessage": "!!!Delete workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 19,
+      "column": 16
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.buttonSave",
+    "defaultMessage": "!!!Save workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 23,
+      "column": 14
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.name",
+    "defaultMessage": "!!!Name",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 27,
+      "column": 8
+    },
+    "end": {
+      "line": 30,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.yourWorkspaces",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 31,
+      "column": 18
+    },
+    "end": {
+      "line": 34,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
+    "defaultMessage": "!!!Services in this Workspace",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 35,
+      "column": 31
+    },
+    "end": {
+      "line": 38,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
new file mode 100644
index 000000000..9f0935620
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "workspaceDrawer.headline",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 16,
+      "column": 12
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.allServices",
+    "defaultMessage": "!!!All services",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 20,
+      "column": 15
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.workspacesSettingsTooltip",
+    "defaultMessage": "!!!Workspaces settings",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 24,
+      "column": 29
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.workspaceFeatureInfo",
+    "defaultMessage": "!!!Info about workspace feature",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 28,
+      "column": 24
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.premiumCtaButtonLabel",
+    "defaultMessage": "!!!Create your first workspace",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 32,
+      "column": 25
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.reactivatePremiumAccountLabel",
+    "defaultMessage": "!!!Reactivate premium account",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 36,
+      "column": 28
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.addNewWorkspaceLabel",
+    "defaultMessage": "!!!add new workspace",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 40,
+      "column": 24
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.proFeatureBadge",
+    "defaultMessage": "!!!Premium feature",
+    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
+    "start": {
+      "line": 44,
+      "column": 23
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
new file mode 100644
index 000000000..4ff190606
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "workspaceDrawer.item.noServicesAddedYet",
+    "defaultMessage": "!!!No services added yet",
+    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+    "start": {
+      "line": 12,
+      "column": 22
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  },
+  {
+    "id": "workspaceDrawer.item.contextMenuEdit",
+    "defaultMessage": "!!!edit",
+    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+    "start": {
+      "line": 16,
+      "column": 19
+    },
+    "end": {
+      "line": 19,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
new file mode 100644
index 000000000..4f3e6d55c
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "workspaces.switchingIndicator.switchingTo",
+    "defaultMessage": "!!!Switching to",
+    "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
+    "start": {
+      "line": 12,
+      "column": 15
+    },
+    "end": {
+      "line": 15,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
new file mode 100644
index 000000000..ef8f1bebc
--- /dev/null
+++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
@@ -0,0 +1,106 @@
+[
+  {
+    "id": "settings.workspaces.headline",
+    "defaultMessage": "!!!Your workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 17,
+      "column": 12
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.noWorkspacesAdded",
+    "defaultMessage": "!!!You haven't added any workspaces yet.",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 21,
+      "column": 19
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspacesRequestFailed",
+    "defaultMessage": "!!!Could not load your workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 25,
+      "column": 27
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.tryReloadWorkspaces",
+    "defaultMessage": "!!!Try again",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 29,
+      "column": 23
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.updatedInfo",
+    "defaultMessage": "!!!Your changes have been saved",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 33,
+      "column": 15
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.deletedInfo",
+    "defaultMessage": "!!!Workspace has been deleted",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 37,
+      "column": 15
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspaceFeatureInfo",
+    "defaultMessage": "!!!Info about workspace feature",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 41,
+      "column": 24
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.workspaces.workspaceFeatureHeadline",
+    "defaultMessage": "!!!Less is More: Introducing Franz Workspaces",
+    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
+    "start": {
+      "line": 45,
+      "column": 28
+    },
+    "end": {
+      "line": 48,
+      "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 0db994871..f4cd35582 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 10,
+      "line": 13,
       "column": 8
     },
     "end": {
-      "line": 13,
+      "line": 16,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Undo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 14,
+      "line": 17,
       "column": 8
     },
     "end": {
-      "line": 17,
+      "line": 20,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Redo",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 18,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 21,
+      "line": 24,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Cut",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 22,
+      "line": 25,
       "column": 7
     },
     "end": {
-      "line": 25,
+      "line": 28,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Copy",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 26,
+      "line": 29,
       "column": 8
     },
     "end": {
-      "line": 29,
+      "line": 32,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Paste",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 30,
+      "line": 33,
       "column": 9
     },
     "end": {
-      "line": 33,
+      "line": 36,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Paste And Match Style",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 34,
+      "line": 37,
       "column": 22
     },
     "end": {
-      "line": 37,
+      "line": 40,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 38,
+      "line": 41,
       "column": 10
     },
     "end": {
-      "line": 41,
+      "line": 44,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Select All",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 42,
+      "line": 45,
       "column": 13
     },
     "end": {
-      "line": 45,
+      "line": 48,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Speech",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 46,
+      "line": 49,
       "column": 10
     },
     "end": {
-      "line": 49,
+      "line": 52,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Start Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 50,
+      "line": 53,
       "column": 17
     },
     "end": {
-      "line": 53,
+      "line": 56,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Stop Speaking",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 54,
+      "line": 57,
       "column": 16
     },
     "end": {
-      "line": 57,
+      "line": 60,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Start Dictation",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 58,
+      "line": 61,
       "column": 18
     },
     "end": {
-      "line": 61,
+      "line": 64,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Emoji & Symbols",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 62,
+      "line": 65,
       "column": 16
     },
     "end": {
-      "line": 65,
+      "line": 68,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Actual Size",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 66,
+      "line": 69,
       "column": 13
     },
     "end": {
-      "line": 69,
+      "line": 72,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Zoom In",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 70,
+      "line": 73,
       "column": 10
     },
     "end": {
-      "line": 73,
+      "line": 76,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Zoom Out",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 74,
+      "line": 77,
       "column": 11
     },
     "end": {
-      "line": 77,
+      "line": 80,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Enter Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 78,
+      "line": 81,
       "column": 19
     },
     "end": {
-      "line": 81,
+      "line": 84,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Exit Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 82,
+      "line": 85,
       "column": 18
     },
     "end": {
-      "line": 85,
+      "line": 88,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Toggle Full Screen",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 86,
+      "line": 89,
       "column": 20
     },
     "end": {
-      "line": 89,
+      "line": 92,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Toggle Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 90,
+      "line": 93,
       "column": 18
     },
     "end": {
-      "line": 93,
+      "line": 96,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Toggle Service Developer Tools",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 94,
+      "line": 97,
       "column": 25
     },
     "end": {
-      "line": 97,
+      "line": 100,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Reload Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 98,
+      "line": 101,
       "column": 17
     },
     "end": {
-      "line": 101,
+      "line": 104,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Reload Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 102,
+      "line": 105,
       "column": 15
     },
     "end": {
-      "line": 105,
+      "line": 108,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Minimize",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 106,
+      "line": 109,
       "column": 12
     },
     "end": {
-      "line": 109,
+      "line": 112,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!Close",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 110,
+      "line": 113,
       "column": 9
     },
     "end": {
-      "line": 113,
+      "line": 116,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!Learn More",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 114,
+      "line": 117,
       "column": 13
     },
     "end": {
-      "line": 117,
+      "line": 120,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Changelog",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 118,
+      "line": 121,
       "column": 13
     },
     "end": {
-      "line": 121,
+      "line": 124,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Support",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 122,
+      "line": 125,
       "column": 11
     },
     "end": {
-      "line": 125,
+      "line": 128,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Terms of Service",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 126,
+      "line": 129,
       "column": 7
     },
     "end": {
-      "line": 129,
+      "line": 132,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Privacy Statement",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 130,
+      "line": 133,
       "column": 11
     },
     "end": {
-      "line": 133,
+      "line": 136,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!File",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 134,
+      "line": 137,
       "column": 8
     },
     "end": {
-      "line": 137,
+      "line": 140,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!View",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 138,
+      "line": 141,
       "column": 8
     },
     "end": {
-      "line": 141,
+      "line": 144,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Services",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 142,
+      "line": 145,
       "column": 12
     },
     "end": {
-      "line": 145,
+      "line": 148,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Window",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 146,
+      "line": 149,
       "column": 10
     },
     "end": {
-      "line": 149,
+      "line": 152,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Help",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 150,
+      "line": 153,
       "column": 8
     },
     "end": {
-      "line": 153,
+      "line": 156,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!About Franz",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 154,
+      "line": 157,
       "column": 9
     },
     "end": {
-      "line": 157,
+      "line": 160,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!What's new in Franz?",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 158,
+      "line": 161,
       "column": 16
     },
     "end": {
-      "line": 161,
+      "line": 164,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 162,
+      "line": 165,
       "column": 12
     },
     "end": {
-      "line": 165,
+      "line": 168,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Hide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 166,
+      "line": 169,
       "column": 8
     },
     "end": {
-      "line": 169,
+      "line": 172,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Hide Others",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 170,
+      "line": 173,
       "column": 14
     },
     "end": {
-      "line": 173,
+      "line": 176,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!Unhide",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 174,
+      "line": 177,
       "column": 10
     },
     "end": {
-      "line": 177,
+      "line": 180,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Quit",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 178,
+      "line": 181,
       "column": 8
     },
     "end": {
-      "line": 181,
+      "line": 184,
       "column": 3
     }
   },
@@ -563,11 +563,50 @@
     "defaultMessage": "!!!Add New Service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 182,
+      "line": 185,
       "column": 17
     },
     "end": {
-      "line": 185,
+      "line": 188,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.addNewWorkspace",
+    "defaultMessage": "!!!Add New Workspace...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 189,
+      "column": 19
+    },
+    "end": {
+      "line": 192,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.openWorkspaceDrawer",
+    "defaultMessage": "!!!Open workspace drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 193,
+      "column": 23
+    },
+    "end": {
+      "line": 196,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.closeWorkspaceDrawer",
+    "defaultMessage": "!!!Close workspace drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 197,
+      "column": 24
+    },
+    "end": {
+      "line": 200,
       "column": 3
     }
   },
@@ -576,11 +615,11 @@
     "defaultMessage": "!!!Activate next service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 186,
+      "line": 201,
       "column": 23
     },
     "end": {
-      "line": 189,
+      "line": 204,
       "column": 3
     }
   },
@@ -589,11 +628,11 @@
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 190,
+      "line": 205,
       "column": 27
     },
     "end": {
-      "line": 193,
+      "line": 208,
       "column": 3
     }
   },
@@ -602,11 +641,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 194,
+      "line": 209,
       "column": 11
     },
     "end": {
-      "line": 197,
+      "line": 212,
       "column": 3
     }
   },
@@ -615,11 +654,37 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 198,
+      "line": 213,
       "column": 13
     },
     "end": {
-      "line": 201,
+      "line": 216,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces",
+    "defaultMessage": "!!!Workspaces",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 217,
+      "column": 14
+    },
+    "end": {
+      "line": 220,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.workspaces.defaultWorkspace",
+    "defaultMessage": "!!!Default",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 221,
+      "column": 20
+    },
+    "end": {
+      "line": 224,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 70f3b2877..46a347237 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -3,6 +3,9 @@ import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceActions } from '../features/workspaces/actions';
+import { gaEvent } from './analytics';
 
 const { app, Menu, dialog } = remote;
 
@@ -183,6 +186,18 @@ const menuItems = defineMessages({
     id: 'menu.services.addNewService',
     defaultMessage: '!!!Add New Service...',
   },
+  addNewWorkspace: {
+    id: 'menu.workspaces.addNewWorkspace',
+    defaultMessage: '!!!Add New Workspace...',
+  },
+  openWorkspaceDrawer: {
+    id: 'menu.workspaces.openWorkspaceDrawer',
+    defaultMessage: '!!!Open workspace drawer',
+  },
+  closeWorkspaceDrawer: {
+    id: 'menu.workspaces.closeWorkspaceDrawer',
+    defaultMessage: '!!!Close workspace drawer',
+  },
   activateNextService: {
     id: 'menu.services.setNextServiceActive',
     defaultMessage: '!!!Activate next service...',
@@ -199,6 +214,14 @@ const menuItems = defineMessages({
     id: 'sidebar.unmuteApp',
     defaultMessage: '!!!Enable notifications & audio',
   },
+  workspaces: {
+    id: 'menu.workspaces',
+    defaultMessage: '!!!Workspaces',
+  },
+  defaultWorkspace: {
+    id: 'menu.workspaces.defaultWorkspace',
+    defaultMessage: '!!!Default',
+  },
 });
 
 function getActiveWebview() {
@@ -302,6 +325,11 @@ const _templateFactory = intl => [
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.workspaces),
+    submenu: [],
+    visible: workspaceStore.isFeatureEnabled,
+  },
+  {
     label: intl.formatMessage(menuItems.window),
     role: 'window',
     submenu: [
@@ -679,7 +707,7 @@ export default class FranzMenu {
         },
       );
 
-      tpl[4].submenu.unshift(about, {
+      tpl[5].submenu.unshift(about, {
         type: 'separator',
       });
     } else {
@@ -714,6 +742,10 @@ export default class FranzMenu {
       tpl[3].submenu = serviceTpl;
     }
 
+    if (workspaceStore.isFeatureEnabled) {
+      tpl[4].submenu = this.workspacesMenu();
+    }
+
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
@@ -764,6 +796,66 @@ export default class FranzMenu {
     return menu;
   }
 
+  workspacesMenu() {
+    const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore;
+    const { intl } = window.franz;
+    const menu = [];
+
+    // Add new workspace item:
+    menu.push({
+      label: intl.formatMessage(menuItems.addNewWorkspace),
+      accelerator: `${cmdKey}+Shift+N`,
+      click: () => {
+        workspaceActions.openWorkspaceSettings();
+      },
+      enabled: this.stores.user.isLoggedIn,
+    });
+
+    // Open workspace drawer:
+    const drawerLabel = (
+      isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
+    );
+    menu.push({
+      label: intl.formatMessage(drawerLabel),
+      accelerator: `${cmdKey}+D`,
+      click: () => {
+        workspaceActions.toggleWorkspaceDrawer();
+        gaEvent(GA_CATEGORY_WORKSPACES, 'toggleDrawer', 'menu');
+      },
+      enabled: this.stores.user.isLoggedIn,
+    }, {
+      type: 'separator',
+    });
+
+    // Default workspace
+    menu.push({
+      label: intl.formatMessage(menuItems.defaultWorkspace),
+      accelerator: `${cmdKey}+Alt+0`,
+      type: 'radio',
+      checked: !activeWorkspace,
+      click: () => {
+        workspaceActions.deactivate();
+        gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
+      },
+    });
+
+    // Workspace items
+    if (this.stores.user.isPremium) {
+      workspaces.forEach((workspace, i) => menu.push({
+        label: workspace.name,
+        accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null,
+        type: 'radio',
+        checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
+        click: () => {
+          workspaceActions.activate({ workspace });
+          gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'menu');
+        },
+      }));
+    }
+
+    return menu;
+  }
+
   _getServiceName(service) {
     if (service.name) {
       return service.name;
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 0519192d1..e7daa9d06 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -28,12 +28,10 @@ ga('send', 'App');
 
 export function gaPage(page) {
   ga('send', 'pageview', page);
-
   debug('GA track page', page);
 }
 
 export function gaEvent(category, action, label) {
   ga('send', 'event', category, action, label);
-
-  debug('GA track event', category, action);
+  debug('GA track event', category, action, label);
 }
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 1c9044b07..dcda021c1 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -1,4 +1,9 @@
-import { computed, observable, reaction } from 'mobx';
+import {
+  computed,
+  observable,
+  reaction,
+  runInAction,
+} from 'mobx';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
@@ -7,6 +12,7 @@ import delayApp from '../features/delayApp';
 import spellchecker from '../features/spellchecker';
 import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
+import workspaces from '../features/workspaces';
 import shareFranz from '../features/shareFranz';
 import announcements from '../features/announcements';
 
@@ -17,13 +23,16 @@ export default class FeaturesStore extends Store {
 
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
+  @observable features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
+
   async setup() {
     this.registerReactions([
+      this._updateFeatures,
       this._monitorLoginStatus.bind(this),
     ]);
 
     await this.featuresRequest._promise;
-    setTimeout(this._enableFeatures.bind(this), 1);
+    setTimeout(this._setupFeatures.bind(this), 1);
 
     // single key reaction
     reaction(() => this.stores.user.data.isPremium, () => {
@@ -37,13 +46,16 @@ export default class FeaturesStore extends Store {
     return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
   }
 
-  @computed get features() {
+  _updateFeatures = () => {
+    const features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
     if (this.stores.user.isLoggedIn) {
-      return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+      const requestResult = this.featuresRequest.execute().result;
+      Object.assign(features, requestResult);
     }
-
-    return DEFAULT_FEATURES_CONFIG;
-  }
+    runInAction('FeaturesStore::_updateFeatures', () => {
+      this.features = features;
+    });
+  };
 
   _monitorLoginStatus() {
     if (this.stores.user.isLoggedIn) {
@@ -53,11 +65,12 @@ export default class FeaturesStore extends Store {
     }
   }
 
-  _enableFeatures() {
+  _setupFeatures() {
     delayApp(this.stores, this.actions);
     spellchecker(this.stores, this.actions);
     serviceProxy(this.stores, this.actions);
     basicAuth(this.stores, this.actions);
+    workspaces(this.stores, this.actions);
     shareFranz(this.stores, this.actions);
     announcements(this.stores, this.actions);
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 88b0331bf..d04fdd0c5 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -12,6 +12,7 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
+import { workspaceStore } from '../features/workspaces';
 
 const debug = require('debug')('Franz:ServiceStore');
 
@@ -100,7 +101,6 @@ export default class ServicesStore extends Store {
         return observable(services.slice().slice().sort((a, b) => a.order - b.order));
       }
     }
-
     return [];
   }
 
@@ -109,13 +109,16 @@ export default class ServicesStore extends Store {
   }
 
   @computed get allDisplayed() {
-    return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+    const services = this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+    return workspaceStore.filterServicesByActiveWorkspace(services);
   }
 
   // This is just used to avoid unnecessary rerendering of resource-heavy webviews
   @computed get allDisplayedUnordered() {
+    const { showDisabledServices } = this.stores.settings.all.app;
     const services = this.allServicesRequest.execute().result || [];
-    return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
+    const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
+    return workspaceStore.filterServicesByActiveWorkspace(filteredServices);
   }
 
   @computed get filtered() {
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index bb7965a4a..a95a8e1e0 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -21,11 +21,12 @@ export default class UIStore extends Store {
     return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
-  @computed get theme() {
-    if (this.stores.settings.all.app.darkMode) {
-      return theme('dark');
-    }
+  @computed get isDarkThemeActive() {
+    return this.stores.settings.all.app.darkMode;
+  }
 
+  @computed get theme() {
+    if (this.isDarkThemeActive) return theme('dark');
     return theme('default');
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 77d84afe1..534690fbb 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -142,6 +142,10 @@ export default class UserStore extends Store {
     return this.getUserInfoRequest.execute().result || {};
   }
 
+  @computed get isPremium() {
+    return !!this.data.isPremium;
+  }
+
   @computed get legacyServices() {
     return this.getLegacyServicesRequest.execute() || {};
   }
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 04f528156..486de8a49 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -85,6 +85,8 @@ export default class Request {
     return this.execute(...this._currentApiCall.args);
   }
 
+  retry = () => this.reload();
+
   isExecutingWithArgs(...args) {
     return this.isExecuting && this._currentApiCall && isEqual(this._currentApiCall.args, args);
   }
@@ -107,7 +109,7 @@ export default class Request {
     Request._hooks.forEach(hook => hook(this));
   }
 
-  reset() {
+  reset = () => {
     this.result = null;
     this.isExecuting = false;
     this.isError = false;
@@ -116,5 +118,5 @@ export default class Request {
     this._promise = Promise;
 
     return this;
-  }
+  };
 }
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 817801982..0a075036a 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -107,7 +107,7 @@
   &__scroll-container {
     max-height: 100vh;
     padding: 80px 0;
-    overflow: scroll;
+    overflow: auto;
     width: 100%;
   }
 
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 9a003a922..e858b7904 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -18,8 +18,14 @@ html { overflow: hidden; }
       font-size: 22px;
 
       &:hover,
-      &:active { color: $dark-theme-gray-smoke; }
-      &.is-muted { color: $theme-brand-primary; }
+      &:active {
+        color: $dark-theme-gray-smoke;
+      }
+
+      &.is-muted,
+      &.is-active {
+        color: $theme-brand-primary;
+      }
     }
   }
 
@@ -33,6 +39,7 @@ html { overflow: hidden; }
   .app__content { display: flex; }
 
   .app__service {
+    position: relative;
     display: flex;
     flex: 1;
     flex-direction: column;
@@ -84,7 +91,7 @@ html { overflow: hidden; }
 
     &:hover,
     &:active { color: lighten($theme-gray-light, 10%); }
-    &.is-muted { color: $theme-brand-primary; }
+    &.is-muted, &.is-active { color: $theme-brand-primary; }
     &--new-service { padding-bottom: 6px; }
   }
 
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 750b6bedd..dd6f56d2b 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -68,7 +68,7 @@
       }
     }
 
-    .premium-info { 
+    .premium-info {
       background: $dark-theme-gray-darker;
       border: 2px solid $theme-brand-primary;
     }
@@ -414,6 +414,7 @@
 
   .settings-navigation__link {
     align-items: center;
+    justify-content: space-between;
     color: $theme-text-color;
     display: flex;
     flex-shrink: 0;
@@ -425,7 +426,9 @@
     &:hover {
       background: darken($theme-gray-lightest, 5%);
 
-      .badge { background: #FFF; }
+      .badge {
+        background: #FFF;
+      }
     }
 
     &.is-active {
@@ -442,8 +445,8 @@
   .settings-navigation__expander { flex: 1; }
 
   .badge {
+
     display: initial;
-    margin-left: 5px;
     transition: background $theme-transition-time, color $theme-transition-time;
   }