107 files changed, 3491 insertions, 1209 deletions

diff --git a/.travis.yml b/.travis.yml
index b3ebc4f25..78c1e3693 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ matrix:
 language: node_js
 
 before_script:
-- yarn add global gulp-cli@1.2.2
-- yarn add global gulpjs/gulp#4.0
 - yarn add global node-sass
 - yarn install
 
@@ -19,7 +17,7 @@ script:
 - travis_wait yarn build
 
 node_js:
-- '7'
+- '8'
 
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef7e1c586..2dd42eec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+<a name="5.0.0-beta.15"></a>
+# [5.0.0-beta.15](https://github.com/meetfranz/franz/compare/v5.0.0-beta.14...v5.0.0-beta.15) (2018-01-10)
+
+
+### Features
+
+* **App:** Add option to clear app cache ([@dannyqiu](https://github.com/dannyqiu)) ([be801ff](https://github.com/meetfranz/franz/commit/be801ff))
+* **App:** Add option to show/hide notification badges for muted ([893a9f6](https://github.com/meetfranz/franz/commit/893a9f6))
+* **Recipes:** Add semver version validation ([5826dc3](https://github.com/meetfranz/franz/commit/5826dc3))
+* **Recipes:** Add `hasHostedOption` to enable hosted & self hosted services ([03610f2](https://github.com/meetfranz/franz/commit/03610f2))
+* **Services:** Add custom service icon upload ([6b97e42](https://github.com/meetfranz/franz/commit/6b97e42))
+* **Services:** Add option to completely disable message badges ([cea7a5c](https://github.com/meetfranz/franz/commit/cea7a5c))
+* **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
+* **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
+* **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+
+### Bug Fixes
+
+* **App:** Allow to turn on notifications when system dnd is enabled ([3045b47](https://github.com/meetfranz/franz/commit/3045b47))
+* **App:** App mute now disables notifications as well ([0fa1caf](https://github.com/meetfranz/franz/commit/0fa1caf))
+* **App:** Fix service reload after waking machine up ([531531e](https://github.com/meetfranz/franz/commit/531531e))
+* **App:** Fix "add services manually" message ([ac417dc](https://github.com/meetfranz/franz/commit/ac417dc))
+* **i18n:** Fallback to system language or english ([9733eaf](https://github.com/meetfranz/franz/commit/9733eaf))
+* **Notification:** Remove notification sound when app is muted ([53fde0c](https://github.com/meetfranz/franz/commit/53fde0c))
+* **Recipes:** Enable `urlInputPrefix` for team and customURL ([873957d](https://github.com/meetfranz/franz/commit/873957d))
+* **Services:** Ctrl/Cmd+R now navigates back to the service root ([7293492](https://github.com/meetfranz/franz/commit/7293492))
+* **Services:** Fix transparent service background ([ed0098f](https://github.com/meetfranz/franz/commit/ed0098f)), closes [#361](https://github.com/meetfranz/franz/issues/361)
+* **Shortcuts:** Fixed settings shortcut inconsistency ([ca74846](https://github.com/meetfranz/franz/commit/ca74846))
+* **Spell checker:** Fixed issues with spell checker ([965fdf2](https://github.com/meetfranz/franz/commit/965fdf2))
+* **Translations:** Re-add Spanish to available languages. ([ad936f2](https://github.com/meetfranz/franz/commit/ad936f2))
+* **Windows:** Open window when clicking on toast notification ([b82bbc8](https://github.com/meetfranz/franz/commit/b82bbc8)), closes [#370](https://github.com/meetfranz/franz/issues/370)
+
+
 <a name="5.0.0-beta.14"></a>
 # [5.0.0-beta.14](https://github.com/meetfranz/franz/compare/v5.0.0-beta.13...v5.0.0-beta.14) (2017-11-23)
 
diff --git a/README.md b/README.md
index 6110573a8..099100284 100644
--- a/README.md
+++ b/README.md
@@ -31,12 +31,6 @@ $ brew install yarn
 ##### Linux
 [Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/)
 
-#### Install Gulp 4
-```bash
-$ yarn add global gulp-cli@1.2.2
-$ yarn add global gulpjs/gulp#4.0
-```
-
 #### Fix native modules to match current electron node version
 ```bash
 $ yarn run rebuild
diff --git a/appveyor.yml b/appveyor.yml
index a8e55d25f..d9296b1f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,8 +11,6 @@ version: 5.0.0.{build}
 install:
   - ps: Install-Product node 8
   - yarn cache clean
-  - yarn add global gulp-cli@1.2.2
-  - yarn add global gulpjs/gulp#4.0
   - yarn install
 
 # cache:
diff --git a/build-helpers/images/icon.png b/build-helpers/images/icon.png
index e0b4935b5..9c39f06e0 100644
--- a/build-helpers/images/icon.png
+++ b/build-helpers/images/icon.png
diff --git a/build-helpers/images/icons/1024x1024.png b/build-helpers/images/icons/1024x1024.png
index e0b4935b5..9c39f06e0 100644
--- a/build-helpers/images/icons/1024x1024.png
+++ b/build-helpers/images/icons/1024x1024.png
diff --git a/build-helpers/images/icons/128x128.png b/build-helpers/images/icons/128x128.png
new file mode 100644
index 000000000..8eb811283
--- /dev/null
+++ b/build-helpers/images/icons/128x128.png
diff --git a/build-helpers/images/icons/16x16.png b/build-helpers/images/icons/16x16.png
new file mode 100644
index 000000000..2523dd8a7
--- /dev/null
+++ b/build-helpers/images/icons/16x16.png
diff --git a/build-helpers/images/icons/24x24.png b/build-helpers/images/icons/24x24.png
new file mode 100644
index 000000000..9cb17a0b1
--- /dev/null
+++ b/build-helpers/images/icons/24x24.png
diff --git a/build-helpers/images/icons/256x256.png b/build-helpers/images/icons/256x256.png
new file mode 100644
index 000000000..5742147b8
--- /dev/null
+++ b/build-helpers/images/icons/256x256.png
diff --git a/build-helpers/images/icons/32x32.png b/build-helpers/images/icons/32x32.png
new file mode 100644
index 000000000..09b88a805
--- /dev/null
+++ b/build-helpers/images/icons/32x32.png
diff --git a/build-helpers/images/icons/48x48.png b/build-helpers/images/icons/48x48.png
new file mode 100644
index 000000000..c9d2f331c
--- /dev/null
+++ b/build-helpers/images/icons/48x48.png
diff --git a/build-helpers/images/icons/512x512.png b/build-helpers/images/icons/512x512.png
new file mode 100644
index 000000000..9d5f1c658
--- /dev/null
+++ b/build-helpers/images/icons/512x512.png
diff --git a/build-helpers/images/icons/64x64.png b/build-helpers/images/icons/64x64.png
new file mode 100644
index 000000000..7842217ed
--- /dev/null
+++ b/build-helpers/images/icons/64x64.png
diff --git a/build-helpers/images/icons/96x96.png b/build-helpers/images/icons/96x96.png
new file mode 100644
index 000000000..bbae07f45
--- /dev/null
+++ b/build-helpers/images/icons/96x96.png
diff --git a/electron-builder.yml b/electron-builder.yml
index adc8f8ae9..96bd63cc2 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -24,10 +24,17 @@ linux:
   icon: ./build-helpers/images/icons
   category: Network;InstantMessaging;
   executableName: franz
+  synopsis: "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more."
+  description: "Franz is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Franz currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Franz for free for Mac & Windows."
   target:
     - target: AppImage
     - target: deb
+    - target: tar.gz
 
 nsis:
   perMachine: false
   oneClick: true
+
+protocols: 
+  name: Franz
+  schemes: [franz] 
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d947974b3..95b026f66 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -110,7 +110,9 @@ export function watch() {
 }
 
 export function webserver() {
-  gulp.src(paths.dest)
+  gulp.src([
+    paths.dest,
+  ])
     .pipe(server({
       livereload: true,
     }));
diff --git a/package.json b/package.json
index 54df530ca..d9145dd7a 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,11 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.14",
+  "version": "5.0.0-beta.15",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
+  "homepage": "https://meetfranz.com",
   "repository": "https://github.com/meetfranz/franz.git",
   "private": true,
   "scripts": {
@@ -33,11 +34,13 @@
     "babel-polyfill": "^6.23.0",
     "babel-runtime": "^6.23.0",
     "classnames": "^2.2.5",
+    "du": "^0.1.0",
     "electron-fetch": "^1.1.0",
-    "electron-spellchecker": "^1.2.0",
+    "electron-spellchecker": "^1.1.2",
     "electron-updater": "^2.4.3",
     "electron-window-state": "^4.1.0",
     "fs-extra": "^3.0.1",
+    "gulp-cli": "1.2.2",
     "ini": "^1.3.4",
     "jshashes": "^1.0.6",
     "jsonwebtoken": "^7.4.1",
@@ -48,15 +51,17 @@
     "mkdirp": "^0.5.1",
     "mobx": "^3.1.0",
     "mobx-react": "^4.1.0",
-    "mobx-react-form": "1.24.0",
+    "mobx-react-form": "^1.32.2",
     "mobx-react-router": "^3.1.2",
     "moment": "^2.17.1",
     "normalize-url": "^1.9.1",
+    "pretty-bytes": "^4.0.2",
     "prop-types": "^15.5.10",
     "prop-types-extended": "^0.2.1",
     "react": "^15.4.1",
     "react-addons-css-transition-group": "^15.4.2",
     "react-dom": "^15.4.1",
+    "react-dropzone": "^4.2.1",
     "react-electron-web-view": "^2.0.1",
     "react-intl": "^2.3.0",
     "react-loader": "^2.4.0",
@@ -102,7 +107,7 @@
     "gulp-sass": "^3.1.0",
     "gulp-sass-variables": "^1.1.1",
     "gulp-server-livereload": "^1.9.2",
-    "node-sass": "^4.5.3"
+    "node-sass": "^4.7.2"
   },
   "config": {
     "commitizen": {
diff --git a/src/actions/app.js b/src/actions/app.js
index 25ff9344d..e6f7f22ba 100644
--- a/src/actions/app.js
+++ b/src/actions/app.js
@@ -22,6 +22,8 @@ export default {
   healthCheck: {},
   muteApp: {
     isMuted: PropTypes.bool.isRequired,
+    overrideSystemMute: PropTypes.bool,
   },
   toggleMuteApp: {},
+  clearAllCache: {},
 };
diff --git a/src/actions/service.js b/src/actions/service.js
index e3100e986..5d483b12a 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -25,6 +25,9 @@ export default {
     serviceId: PropTypes.string.isRequired,
     redirect: PropTypes.string,
   },
+  clearCache: {
+    serviceId: PropTypes.string.isRequired,
+  },
   setUnreadMessageCount: {
     serviceId: PropTypes.string.isRequired,
     count: PropTypes.object.isRequired,
diff --git a/src/actions/user.js b/src/actions/user.js
index fe32b8a05..ccf1fa56a 100644
--- a/src/actions/user.js
+++ b/src/actions/user.js
@@ -27,4 +27,5 @@ export default {
   importLegacyServices: PropTypes.arrayOf(PropTypes.shape({
     recipe: PropTypes.string.isRequired,
   })).isRequired,
+  delete: {},
 };
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 6f2b049d6..3f84f8a0b 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -15,4 +15,12 @@ export default class LocalApi {
   removeKey(key) {
     return this.local.removeKey(key);
   }
+
+  getAppCacheSize() {
+    return this.local.getAppCacheSize();
+  }
+
+  clearAppCache() {
+    return this.local.clearAppCache();
+  }
 }
diff --git a/src/api/ServicesApi.js b/src/api/ServicesApi.js
index 3cb40ba0d..36ed9482f 100644
--- a/src/api/ServicesApi.js
+++ b/src/api/ServicesApi.js
@@ -1,5 +1,6 @@
 export default class ServicesApi {
-  constructor(server) {
+  constructor(server, local) {
+    this.local = local;
     this.server = server;
   }
 
@@ -30,4 +31,8 @@ export default class ServicesApi {
   reorder(data) {
     return this.server.reorderService(data);
   }
+
+  clearCache(serviceId) {
+    return this.local.clearCache(serviceId);
+  }
 }
diff --git a/src/api/UserApi.js b/src/api/UserApi.js
index e8fd75bed..edfb88988 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.js
@@ -46,4 +46,8 @@ export default class UserApi {
   getLegacyServices() {
     return this.server.getLegacyServices();
   }
+
+  delete() {
+    return this.server.deleteAccount();
+  }
 }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index eba236f16..e95d750ac 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,4 +1,9 @@
-import SettingsModel from '../../models/Settings';
+import { remote } from 'electron';
+import du from 'du';
+
+import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
+
+const { session } = remote;
 
 export default class LocalApi {
   // App
@@ -15,7 +20,7 @@ export default class LocalApi {
   async getAppSettings() {
     const settingsString = localStorage.getItem('app');
     try {
-      const settings = new SettingsModel(JSON.parse(settingsString) || {});
+      const settings = JSON.parse(settingsString) || {};
       console.debug('LocalApi::getAppSettings resolves', settings);
 
       return settings;
@@ -32,4 +37,31 @@ export default class LocalApi {
       localStorage.setItem('app', JSON.stringify(settings));
     }
   }
+
+  // Services
+  async getAppCacheSize() {
+    const partitionsDir = getServicePartitionsDirectory();
+    return new Promise((resolve, reject) => {
+      du(partitionsDir, (err, size) => {
+        if (err) reject(err);
+
+        console.debug('LocalApi::getAppCacheSize resolves', size);
+        resolve(size);
+      });
+    });
+  }
+
+  async clearCache(serviceId) {
+    const s = session.fromPartition(`persist:service-${serviceId}`);
+
+    console.debug('LocalApi::clearCache resolves', serviceId);
+    return new Promise(resolve => s.clearCache(resolve));
+  }
+
+  async clearAppCache() {
+    const s = session.defaultSession;
+
+    console.debug('LocalApi::clearCache clearAppCache');
+    return new Promise(resolve => s.clearCache(resolve));
+  }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index f25f02eaa..d37ff51f8 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -12,6 +12,8 @@ import NewsModel from '../../models/News';
 import UserModel from '../../models/User';
 import OrderModel from '../../models/Order';
 
+import { sleep } from '../../helpers/async-helpers';
+
 import { API } from '../../environment';
 
 import {
@@ -20,6 +22,10 @@ import {
   loadRecipeConfig,
 } from '../../helpers/recipe-helpers';
 
+import {
+  removeServicePartitionDirectory,
+} from '../../helpers/service-helpers.js';
+
 module.paths.unshift(
   getDevRecipeDirectory(),
   getRecipeDirectory(),
@@ -125,6 +131,19 @@ export default class ServerApi {
     return user;
   }
 
+  async deleteAccount() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me`, this._prepareAuthRequest({
+      method: 'DELETE',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    console.debug('ServerApi::deleteAccount resolves', data);
+    return data;
+  }
+
   // Services
   async getServices() {
     const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/me/services`, this._prepareAuthRequest({
@@ -152,27 +171,65 @@ export default class ServerApi {
       throw request;
     }
     const serviceData = await request.json();
+
+    if (data.iconFile) {
+      const iconData = await this.uploadServiceIcon(serviceData.data.id, data.iconFile);
+
+      serviceData.data = iconData;
+    }
+
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
     console.debug('ServerApi::createService resolves', service);
     return service;
   }
 
-  async updateService(recipeId, data) {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${recipeId}`, this._prepareAuthRequest({
+  async updateService(serviceId, rawData) {
+    const data = rawData;
+
+    if (data.iconFile) {
+      await this.uploadServiceIcon(serviceId, data.iconFile);
+    }
+
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, this._prepareAuthRequest({
       method: 'PUT',
       body: JSON.stringify(data),
     }));
+
     if (!request.ok) {
       throw request;
     }
+
     const serviceData = await request.json();
+
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
     console.debug('ServerApi::updateService resolves', service);
     return service;
   }
 
+  async uploadServiceIcon(serviceId, icon) {
+    const formData = new FormData();
+    formData.append('icon', icon);
+
+    const requestData = this._prepareAuthRequest({
+      method: 'PUT',
+      body: formData,
+    });
+
+    delete requestData.headers['Content-Type'];
+
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/${serviceId}`, requestData);
+
+    if (!request.ok) {
+      throw request;
+    }
+
+    const serviceData = await request.json();
+
+    return serviceData.data;
+  }
+
   async reorderService(data) {
     const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/service/reorder`, this._prepareAuthRequest({
       method: 'PUT',
@@ -195,6 +252,8 @@ export default class ServerApi {
     }
     const data = await request.json();
 
+    removeServicePartitionDirectory(id, true);
+
     console.debug('ServerApi::deleteService resolves', data);
     return data;
   }
@@ -290,18 +349,25 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
+      console.debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
-      tar.x({
+      await sleep(10);
+
+      await tar.x({
         file: archivePath,
         cwd: recipeTempDirectory,
-        sync: true,
+        preservePaths: true,
+        unlink: true,
+        preserveOwner: false,
+        onwarn: x => console.log('warn', recipeId, x),
       });
 
+      await sleep(10);
+
       const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json'));
       const recipeDirectory = path.join(recipesDirectory, id);
-
       fs.copySync(recipeTempDirectory, recipeDirectory);
       fs.remove(recipeTempDirectory);
       fs.remove(path.join(recipesDirectory, recipeId, 'recipe.tar.gz'));
diff --git a/src/app.js b/src/app.js
index a0b88611c..8e62776d2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -105,3 +105,5 @@ window.addEventListener('load', () => {
 // Prevent drag and drop into window from redirecting
 window.addEventListener('dragover', event => event.preventDefault());
 window.addEventListener('drop', event => event.preventDefault());
+window.addEventListener('dragover', event => event.stopPropagation());
+window.addEventListener('drop', event => event.stopPropagation());
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 06493a0fd..078244434 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -24,7 +24,7 @@ const messages = defineMessages({
   },
   skipButtonLabel: {
     id: 'import.skip.label',
-    defaultMessage: '!!!I want add services manually',
+    defaultMessage: '!!!I want to add services manually',
   },
 });
 
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 06b10ecfe..eb9fbb847 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -55,12 +55,16 @@ export default class Login extends Component {
         </div>
         <div className="welcome__featured-services">
           {recipes.map(recipe => (
-            <img
+            <div
               key={recipe.id}
-              src={recipe.icons.svg}
               className="welcome__featured-service"
-              alt=""
-            />
+            >
+              <img
+                key={recipe.id}
+                src={recipe.icons.svg}
+                alt=""
+              />
+            </div>
           ))}
         </div>
       </div>
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index cb2ecc8ce..915ebeace 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -17,12 +17,12 @@ const messages = defineMessages({
     defaultMessage: '!!!Add new service',
   },
   mute: {
-    id: 'sidebar.mute',
-    defaultMessage: '!!!Disable audio',
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
   },
   unmute: {
-    id: 'sidebar.unmute',
-    defaultMessage: '!!!Enable audio',
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
   },
 });
 
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index faa356d3d..c146abf4e 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -65,6 +65,7 @@ export default class ServiceWebview extends Component {
 
     const webviewClasses = classnames({
       services__webview: true,
+      'services__webview-wrapper': true,
       'is-active': service.isActive,
       'services__webview--force-repaint': this.state.forceRepaint,
     });
@@ -105,7 +106,6 @@ export default class ServiceWebview extends Component {
             onUpdateTargetUrl={this.updateTargetUrl}
             useragent={service.userAgent}
             muted={isAppMuted || service.isMuted}
-            disablewebsecurity
             allowpopups
           />
         )}
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 2daf55676..489027d57 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -17,6 +17,8 @@ class TabBarSortableList extends Component {
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   }
 
   render() {
@@ -30,6 +32,8 @@ class TabBarSortableList extends Component {
       disableService,
       enableService,
       openSettings,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
 
     return (
@@ -50,6 +54,8 @@ class TabBarSortableList extends Component {
             disableService={() => disableService({ serviceId: service.id })}
             enableService={() => enableService({ serviceId: service.id })}
             openSettings={openSettings}
+            showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
+            showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
           />
         ))}
         {/* <li>
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index a7136c43f..7aed8fda7 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -63,6 +63,8 @@ class TabItem extends Component {
     deleteService: PropTypes.func.isRequired,
     disableService: PropTypes.func.isRequired,
     enableService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -81,6 +83,8 @@ class TabItem extends Component {
       disableService,
       enableService,
       openSettings,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
     const { intl } = this.context;
 
@@ -121,6 +125,26 @@ class TabItem extends Component {
     }];
     const menu = Menu.buildFromTemplate(menuTemplate);
 
+    let notificationBadge = null;
+    if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && service.isBadgeEnabled) {
+      notificationBadge = (
+        <span>
+          {service.unreadDirectMessageCount > 0 && (
+            <span className="tab-item__message-count">
+              {service.unreadDirectMessageCount}
+            </span>
+          )}
+          {service.unreadIndirectMessageCount > 0
+            && service.unreadDirectMessageCount === 0
+            && service.isIndirectMessageBadgeEnabled && (
+              <span className="tab-item__message-count is-indirect">
+                •
+              </span>
+            )}
+        </span>
+      );
+    }
+
     return (
       <li
         className={classnames({
@@ -138,18 +162,7 @@ class TabItem extends Component {
           className="tab-item__icon"
           alt=""
         />
-        {service.unreadDirectMessageCount > 0 && (
-          <span className="tab-item__message-count">
-            {service.unreadDirectMessageCount}
-          </span>
-        )}
-        {service.unreadIndirectMessageCount > 0
-          && service.unreadDirectMessageCount === 0
-          && service.isIndirectMessageBadgeEnabled && (
-            <span className="tab-item__message-count is-indirect">
-            •
-            </span>
-          )}
+        {notificationBadge}
       </li>
     );
   }
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index 9da1090b7..ceb88c51c 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -18,6 +18,8 @@ export default class TabBar extends Component {
     toggleAudio: PropTypes.func.isRequired,
     deleteService: PropTypes.func.isRequired,
     updateService: PropTypes.func.isRequired,
+    showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
+    showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
   }
 
   onSortEnd = ({ oldIndex, newIndex }) => {
@@ -64,6 +66,8 @@ export default class TabBar extends Component {
       toggleNotifications,
       toggleAudio,
       deleteService,
+      showMessageBadgeWhenMutedSetting,
+      showMessageBadgesEvenWhenMuted,
     } = this.props;
 
     return (
@@ -85,6 +89,8 @@ export default class TabBar extends Component {
           axis="y"
           lockAxis="y"
           helperClass="is-reordering"
+          showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting}
+          showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
         />
       </div>
     );
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 75dbdef49..89fa07800 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -28,6 +28,10 @@ const messages = defineMessages({
     id: 'settings.account.headlineInvoices',
     defaultMessage: '!!Invoices',
   },
+  headlineDangerZone: {
+    id: 'settings.account.headlineDangerZone',
+    defaultMessage: '!!Danger Zone',
+  },
   manageSubscriptionButtonLabel: {
     id: 'settings.account.manageSubscription.label',
     defaultMessage: '!!!Manage your subscription',
@@ -72,6 +76,18 @@ const messages = defineMessages({
     id: 'settings.account.mining.cancel',
     defaultMessage: '!!!Cancel mining',
   },
+  deleteAccount: {
+    id: 'settings.account.deleteAccount',
+    defaultMessage: '!!!Delete account',
+  },
+  deleteInfo: {
+    id: 'settings.account.deleteInfo',
+    defaultMessage: '!!!If you don\'t need your Franz account any longer, you can delete your account and all related data here.',
+  },
+  deleteEmailSent: {
+    id: 'settings.account.deleteEmailSent',
+    defaultMessage: '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
+  },
 });
 
 @observer
@@ -90,6 +106,9 @@ export default class AccountDashboard extends Component {
     openExternalUrl: PropTypes.func.isRequired,
     onCloseSubscriptionWindow: PropTypes.func.isRequired,
     stopMiner: PropTypes.func.isRequired,
+    deleteAccount: PropTypes.func.isRequired,
+    isLoadingDeleteAccount: PropTypes.bool.isRequired,
+    isDeleteAccountSuccessful: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -111,6 +130,9 @@ export default class AccountDashboard extends Component {
       retryUserInfoRequest,
       onCloseSubscriptionWindow,
       stopMiner,
+      deleteAccount,
+      isLoadingDeleteAccount,
+      isDeleteAccountSuccessful,
     } = this.props;
     const { intl } = this.context;
 
@@ -201,7 +223,7 @@ export default class AccountDashboard extends Component {
                             />
                           </div>
                         </div>
-                        <div className="account__box account__box--last">
+                        <div className="account__box">
                           <h2>{intl.formatMessage(messages.headlineInvoices)}</h2>
                           <table className="invoices">
                             <tbody>
@@ -230,7 +252,7 @@ export default class AccountDashboard extends Component {
 
               {user.isMiner && (
                 <div className="account franz-form">
-                  <div className="account__box">
+                  <div className="account__box account__box--last">
                     <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
                     <div className="account__subscription">
                       <div>
@@ -267,7 +289,7 @@ export default class AccountDashboard extends Component {
                   <Loader />
                 ) : (
                   <div className="account franz-form">
-                    <div className="account__box account__box--last">
+                    <div className="account__box">
                       <h2>{intl.formatMessage(messages.headlineUpgrade)}</h2>
                       <SubscriptionForm
                         onCloseWindow={onCloseSubscriptionWindow}
@@ -276,8 +298,29 @@ export default class AccountDashboard extends Component {
                   </div>
                 )
               )}
+
+              <div className="account franz-form">
+                <div className="account__box">
+                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                  {!isDeleteAccountSuccessful && (
+                    <div className="account__subscription">
+                      <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                      <Button
+                        label={intl.formatMessage(messages.deleteAccount)}
+                        buttonType="danger"
+                        onClick={() => deleteAccount()}
+                        loaded={!isLoadingDeleteAccount}
+                      />
+                    </div>
+                  )}
+                  {isDeleteAccountSuccessful && (
+                    <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                  )}
+                </div>
+              </div>
             </div>
           )}
+
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
       </div>
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index b6ade5da4..4610c69a5 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -16,6 +16,10 @@ const messages = defineMessages({
     id: 'settings.recipes.headline',
     defaultMessage: '!!!Available Services',
   },
+  searchService: {
+    id: 'settings.searchService',
+    defaultMessage: '!!!Search service',
+  },
   mostPopularRecipes: {
     id: 'settings.recipes.mostPopular',
     defaultMessage: '!!!Most popular',
@@ -81,13 +85,7 @@ export default class RecipesDashboard extends Component {
     return (
       <div className="settings__main">
         <div className="settings__header">
-          <SearchInput
-            className="settings__search-header"
-            defaultValue={intl.formatMessage(messages.headline)}
-            onChange={e => searchRecipes(e)}
-            onReset={() => resetSearch()}
-            throttle
-          />
+          <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body recipes">
           {serviceStatus.length > 0 && serviceStatus.includes('created') && (
@@ -101,7 +99,13 @@ export default class RecipesDashboard extends Component {
               </Infobox>
             </Appear>
           )}
-          {/* {!searchNeedle && ( */}
+          <SearchInput
+            placeholder={intl.formatMessage(messages.searchService)}
+            onChange={e => searchRecipes(e)}
+            onReset={() => resetSearch()}
+            autoFocus
+            throttle
+          />
           <div className="recipes__navigation">
             <Link
               to="/settings/recipes"
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 36cefe87c..f6f2df2f3 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -13,6 +13,7 @@ import Tabs, { TabItem } from '../../ui/Tabs';
 import Input from '../../ui/Input';
 import Toggle from '../../ui/Toggle';
 import Button from '../../ui/Button';
+import ImageUpload from '../../ui/ImageUpload';
 
 const messages = defineMessages({
   saveService: {
@@ -47,6 +48,10 @@ const messages = defineMessages({
     id: 'settings.service.form.tabOnPremise',
     defaultMessage: '!!!Self hosted ��',
   },
+  useHostedService: {
+    id: 'settings.service.form.useHostedService',
+    defaultMessage: '!!!Use the hosted {name} service.',
+  },
   customUrlValidationError: {
     id: 'settings.service.form.customUrlValidationError',
     defaultMessage: '!!!Could not validate custom {name} server.',
@@ -67,6 +72,26 @@ const messages = defineMessages({
     id: 'settings.service.form.isMutedInfo',
     defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted',
   },
+  headlineNotifications: {
+    id: 'settings.service.form.headlineNotifications',
+    defaultMessage: '!!!Notifications',
+  },
+  headlineBadges: {
+    id: 'settings.service.form.headlineBadges',
+    defaultMessage: '!!!Unread message badges',
+  },
+  headlineGeneral: {
+    id: 'settings.service.form.headlineGeneral',
+    defaultMessage: '!!!General',
+  },
+  iconDelete: {
+    id: 'settings.service.form.iconDelete',
+    defaultMessage: '!!!Delete',
+  },
+  iconUpload: {
+    id: 'settings.service.form.iconUpload',
+    defaultMessage: '!!!Drop your image, or click here',
+  },
 });
 
 @observer
@@ -108,9 +133,13 @@ export default class EditServiceForm extends Component {
     this.props.form.submit({
       onSuccess: async (form) => {
         const values = form.values();
-
         let isValid = true;
 
+        const files = form.$('customIcon').files;
+        if (files) {
+          values.iconFile = files[0];
+        }
+
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
@@ -166,6 +195,13 @@ export default class EditServiceForm extends Component {
       />
     );
 
+    let activeTabIndex = 0;
+    if (recipe.hasHostedOption && service.team) {
+      activeTabIndex = 1;
+    } else if (recipe.hasHostedOption && service.customUrl) {
+      activeTabIndex = 2;
+    }
+
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -195,14 +231,25 @@ export default class EditServiceForm extends Component {
         </div>
         <div className="settings__body">
           <form onSubmit={e => this.submit(e)} id="form">
-            <Input field={form.$('name')} focus />
+            <div className="service-name">
+              <Input field={form.$('name')} focus />
+            </div>
             {(recipe.hasTeamId || recipe.hasCustomUrl) && (
               <Tabs
-                active={service.customUrl ? 1 : 0}
+                active={activeTabIndex}
               >
+                {recipe.hasHostedOption && (
+                  <TabItem title={recipe.name}>
+                    {intl.formatMessage(messages.useHostedService, { name: recipe.name })}
+                  </TabItem>
+                )}
                 {recipe.hasTeamId && (
                   <TabItem title={intl.formatMessage(messages.tabHosted)}>
-                    <Input field={form.$('team')} suffix={recipe.urlInputSuffix} />
+                    <Input
+                      field={form.$('team')}
+                      prefix={recipe.urlInputPrefix}
+                      suffix={recipe.urlInputSuffix}
+                    />
                   </TabItem>
                 )}
                 {recipe.hasCustomUrl && (
@@ -230,21 +277,42 @@ export default class EditServiceForm extends Component {
                 )}
               </Tabs>
             )}
-            <div className="settings__options">
-              <Toggle field={form.$('isNotificationEnabled')} />
-              {recipe.hasIndirectMessages && (
-                <div>
-                  <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
+            <div className="service-flex-grid">
+              <div className="settings__options">
+                <div className="settings__settings-group">
+                  <h3>{intl.formatMessage(messages.headlineNotifications)}</h3>
+                  <Toggle field={form.$('isNotificationEnabled')} />
+                  <Toggle field={form.$('isMuted')} />
                   <p className="settings__help">
-                    {intl.formatMessage(messages.indirectMessageInfo)}
+                    {intl.formatMessage(messages.isMutedInfo)}
                   </p>
                 </div>
-              )}
-              <Toggle field={form.$('isMuted')} />
-              <p className="settings__help">
-                {intl.formatMessage(messages.isMutedInfo)}
-              </p>
-              <Toggle field={form.$('isEnabled')} />
+
+                <div className="settings__settings-group">
+                  <h3>{intl.formatMessage(messages.headlineBadges)}</h3>
+                  <Toggle field={form.$('isBadgeEnabled')} />
+                  {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
+                    <div>
+                      <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
+                      <p className="settings__help">
+                        {intl.formatMessage(messages.indirectMessageInfo)}
+                      </p>
+                    </div>
+                  )}
+                </div>
+
+                <div className="settings__settings-group">
+                  <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
+                  <Toggle field={form.$('isEnabled')} />
+                </div>
+              </div>
+              <div className="service-icon">
+                <ImageUpload
+                  field={form.$('customIcon')}
+                  textDelete={intl.formatMessage(messages.iconDelete)}
+                  textUpload={intl.formatMessage(messages.iconUpload)}
+                />
+              </div>
             </div>
             {recipe.message && (
               <p className="settings__message">
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index 5f146b5f3..20e451f01 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -15,10 +15,18 @@ const messages = defineMessages({
     id: 'settings.services.headline',
     defaultMessage: '!!!Your services',
   },
+  searchService: {
+    id: 'settings.searchService',
+    defaultMessage: '!!!Search service',
+  },
   noServicesAdded: {
     id: 'settings.services.noServicesAdded',
     defaultMessage: '!!!You haven\'t added any services yet.',
   },
+  noServiceFound: {
+    id: 'settings.recipes.nothingFound',
+    defaultMessage: '!!!Sorry, but no service matched your search term.',
+  },
   discoverServices: {
     id: 'settings.services.discoverServices',
     defaultMessage: '!!!Discover services',
@@ -53,7 +61,13 @@ export default class ServicesDashboard extends Component {
     servicesRequestFailed: PropTypes.bool.isRequired,
     retryServicesRequest: PropTypes.func.isRequired,
     status: MobxPropTypes.arrayOrObservableArray.isRequired,
+    searchNeedle: PropTypes.string,
   };
+
+  static defaultProps = {
+    searchNeedle: '',
+  }
+
   static contextTypes = {
     intl: intlShape,
   };
@@ -69,20 +83,24 @@ export default class ServicesDashboard extends Component {
       servicesRequestFailed,
       retryServicesRequest,
       status,
+      searchNeedle,
     } = this.props;
     const { intl } = this.context;
 
     return (
       <div className="settings__main">
         <div className="settings__header">
-          <SearchInput
-            className="settings__search-header"
-            defaultValue={intl.formatMessage(messages.headline)}
-            onChange={needle => filterServices({ needle })}
-            onReset={() => resetFilter()}
-          />
+          <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
         <div className="settings__body">
+          {!isLoading && (
+            <SearchInput
+              placeholder={intl.formatMessage(messages.searchService)}
+              onChange={needle => filterServices({ needle })}
+              onReset={() => resetFilter()}
+              autoFocus
+            />
+          )}
           {!isLoading && servicesRequestFailed && (
             <div>
               <Infobox
@@ -121,7 +139,7 @@ export default class ServicesDashboard extends Component {
             </Appear>
           )}
 
-          {!isLoading && services.length === 0 && (
+          {!isLoading && services.length === 0 && !searchNeedle && (
             <div className="align-middle settings__empty-state">
               <p className="settings__empty-text">
                 <span className="emoji">
@@ -132,6 +150,16 @@ export default class ServicesDashboard extends Component {
               <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
             </div>
           )}
+          {!isLoading && services.length === 0 && searchNeedle && (
+            <div className="align-middle settings__empty-state">
+              <p className="settings__empty-text">
+                <span className="emoji">
+                  <img src="./assets/images/emoji/dontknow.png" alt="" />
+                </span>
+                {intl.formatMessage(messages.noServiceFound)}
+              </p>
+            </div>
+          )}
           {isLoading ? (
             <Loader />
           ) : (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 4ce9b7ab2..72aa5a8af 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -40,6 +40,18 @@ const messages = defineMessages({
     id: 'settings.app.translationHelp',
     defaultMessage: '!!!Help us to translate Franz into your language.',
   },
+  subheadlineCache: {
+    id: 'settings.app.subheadlineCache',
+    defaultMessage: '!!!Cache',
+  },
+  cacheInfo: {
+    id: 'settings.app.cacheInfo',
+    defaultMessage: '!!!Franz cache is currently using {size} of disk space.',
+  },
+  buttonClearAllCache: {
+    id: 'settings.app.buttonClearAllCache',
+    defaultMessage: '!!!Clear cache',
+  },
   buttonSearchForUpdate: {
     id: 'settings.app.buttonSearchForUpdate',
     defaultMessage: '!!!Check for updates',
@@ -64,10 +76,6 @@ const messages = defineMessages({
     id: 'settings.app.currentVersion',
     defaultMessage: '!!!Current version:',
   },
-  restartRequired: {
-    id: 'settings.app.restartRequired',
-    defaultMessage: '!!!Changes require restart',
-  },
 });
 
 @observer
@@ -81,6 +89,9 @@ export default class EditSettingsForm extends Component {
     isUpdateAvailable: PropTypes.bool.isRequired,
     noUpdateAvailable: PropTypes.bool.isRequired,
     updateIsReadyToInstall: PropTypes.bool.isRequired,
+    isClearingAllCache: PropTypes.bool.isRequired,
+    onClearAllCache: PropTypes.func.isRequired,
+    cacheSize: PropTypes.string.isRequired,
   };
 
   static contextTypes = {
@@ -107,6 +118,9 @@ export default class EditSettingsForm extends Component {
       isUpdateAvailable,
       noUpdateAvailable,
       updateIsReadyToInstall,
+      isClearingAllCache,
+      onClearAllCache,
+      cacheSize,
     } = this.props;
     const { intl } = this.context;
 
@@ -142,6 +156,7 @@ export default class EditSettingsForm extends Component {
             {/* Appearance */}
             <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
             <Toggle field={form.$('showDisabledServices')} />
+            <Toggle field={form.$('showMessageBadgeWhenMuted')} />
 
             {/* Language */}
             <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
@@ -157,8 +172,26 @@ export default class EditSettingsForm extends Component {
             {/* Advanced */}
             <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
             <Toggle field={form.$('enableSpellchecking')} />
-            <p className="settings__help">{intl.formatMessage(messages.restartRequired)}</p>
             {/* <Select field={form.$('spellcheckingLanguage')} /> */}
+            <div className="settings__settings-group">
+              <h3>
+                {intl.formatMessage(messages.subheadlineCache)}
+              </h3>
+              <p>
+                {intl.formatMessage(messages.cacheInfo, {
+                  size: cacheSize,
+                })}
+              </p>
+              <p>
+                <Button
+                  buttonType="secondary"
+                  label={intl.formatMessage(messages.buttonClearAllCache)}
+                  onClick={onClearAllCache}
+                  disabled={isClearingAllCache}
+                  loaded={!isClearingAllCache}
+                />
+              </p>
+            </div>
 
             {/* Updates */}
             <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2>
@@ -169,6 +202,7 @@ export default class EditSettingsForm extends Component {
               />
             ) : (
               <Button
+                buttonType="secondary"
                 label={intl.formatMessage(updateButtonLabelMessage)}
                 onClick={checkForUpdates}
                 disabled={isCheckingForUpdates || isUpdateAvailable}
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index 07e94192f..554206cb7 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -68,7 +68,7 @@ export default class Button extends Component {
           loaded={loaded}
           lines={10}
           scale={0.4}
-          color={buttonType === '' ? '#FFF' : '#373a3c'}
+          color={buttonType !== 'secondary' ? '#FFF' : '#373a3c'}
           component="span"
         />
         {label}
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
new file mode 100644
index 000000000..81c3b8da6
--- /dev/null
+++ b/src/components/ui/ImageUpload.js
@@ -0,0 +1,108 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { Field } from 'mobx-react-form';
+// import Loader from 'react-loader';
+import classnames from 'classnames';
+import Dropzone from 'react-dropzone';
+
+@observer
+export default class ImageUpload extends Component {
+  static propTypes = {
+    field: PropTypes.instanceOf(Field).isRequired,
+    className: PropTypes.string,
+    multiple: PropTypes.bool,
+    textDelete: PropTypes.string.isRequired,
+    textUpload: PropTypes.string.isRequired,
+  };
+
+  static defaultProps = {
+    className: null,
+    multiple: false,
+  };
+
+  state = {
+    path: null,
+  }
+
+  onDrop(acceptedFiles) {
+    const { field } = this.props;
+
+    acceptedFiles.forEach((file) => {
+      this.setState({
+        path: file.path,
+      });
+      this.props.field.onDrop(file);
+    });
+
+    field.set('');
+  }
+
+  dropzoneRef = null;
+
+  render() {
+    const {
+      field,
+      className,
+      multiple,
+      textDelete,
+      textUpload,
+    } = this.props;
+
+    const cssClasses = classnames({
+      'image-upload__dropzone': true,
+      [`${className}`]: className,
+    });
+
+    return (
+      <div className="image-upload-wrapper">
+        <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label>
+        <div className="image-upload">
+          {(field.value && field.value !== 'delete') || this.state.path ? (
+            <div>
+              <div
+                className="image-upload__preview"
+                style={({
+                  backgroundImage: `url("${this.state.path || field.value}")`,
+                })}
+              />
+              <div className="image-upload__action">
+                <button
+                  type="button"
+                  onClick={() => {
+                    if (field.value) {
+                      field.set('delete');
+                    } else {
+                      this.setState({
+                        path: null,
+                      });
+                    }
+                  }}
+                >
+                  <i className="mdi mdi-delete" />
+                  <p>
+                    {textDelete}
+                  </p>
+                </button>
+                <div className="image-upload__action-background" />
+              </div>
+            </div>
+          ) : (
+            <Dropzone
+              ref={(node) => { this.dropzoneRef = node; }}
+              onDrop={this.onDrop.bind(this)}
+              className={cssClasses}
+              multiple={multiple}
+              accept="image/jpeg, image/png"
+            >
+              <i className="mdi mdi-file-image" />
+              <p>
+                {textUpload}
+              </p>
+            </Dropzone>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js
index bca412cef..a94cde201 100644
--- a/src/components/ui/SearchInput.js
+++ b/src/components/ui/SearchInput.js
@@ -9,36 +9,46 @@ import { debounce } from 'lodash';
 export default class SearchInput extends Component {
   static propTypes = {
     value: PropTypes.string,
-    defaultValue: PropTypes.string,
+    placeholder: PropTypes.string,
     className: PropTypes.string,
     onChange: PropTypes.func,
     onReset: PropTypes.func,
     name: PropTypes.string,
     throttle: PropTypes.bool,
     throttleDelay: PropTypes.number,
+    autoFocus: PropTypes.bool,
   };
 
   static defaultProps = {
     value: '',
-    defaultValue: '',
+    placeholder: '',
     className: '',
     name: uuidv1(),
     throttle: false,
     throttleDelay: 250,
     onChange: () => null,
     onReset: () => null,
+    autoFocus: false,
   }
 
   constructor(props) {
     super(props);
 
     this.state = {
-      value: props.value || props.defaultValue,
+      value: props.value,
     };
 
     this.throttledOnChange = debounce(this.throttledOnChange, this.props.throttleDelay);
   }
 
+  componentDidMount() {
+    const { autoFocus } = this.props;
+
+    if (autoFocus) {
+      this.input.focus();
+    }
+  }
+
   onChange(e) {
     const { throttle, onChange } = this.props;
     const { value } = e.target;
@@ -52,26 +62,6 @@ export default class SearchInput extends Component {
     }
   }
 
-  onClick() {
-    const { defaultValue } = this.props;
-    const { value } = this.state;
-
-    if (value === defaultValue) {
-      this.setState({ value: '' });
-    }
-
-    this.input.focus();
-  }
-
-  onBlur() {
-    const { defaultValue } = this.props;
-    const { value } = this.state;
-
-    if (value === '') {
-      this.setState({ value: defaultValue });
-    }
-  }
-
   throttledOnChange(e) {
     const { onChange } = this.props;
 
@@ -79,8 +69,8 @@ export default class SearchInput extends Component {
   }
 
   reset() {
-    const { defaultValue, onReset } = this.props;
-    this.setState({ value: defaultValue });
+    const { onReset } = this.props;
+    this.setState({ value: '' });
 
     onReset();
   }
@@ -88,7 +78,7 @@ export default class SearchInput extends Component {
   input = null;
 
   render() {
-    const { className, name, defaultValue } = this.props;
+    const { className, name, placeholder } = this.props;
     const { value } = this.state;
 
     return (
@@ -101,18 +91,16 @@ export default class SearchInput extends Component {
         <label
           htmlFor={name}
           className="mdi mdi-magnify"
-          onClick={() => this.onClick()}
         />
         <input
           name={name}
           type="text"
+          placeholder={placeholder}
           value={value}
           onChange={e => this.onChange(e)}
-          onClick={() => this.onClick()}
-          onBlur={() => this.onBlur()}
           ref={(ref) => { this.input = ref; }}
         />
-        {value !== defaultValue && value.length > 0 && (
+        {value.length > 0 && (
           <span
             className="mdi mdi-close-circle-outline"
             onClick={() => this.reset()}
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 5aae2c47a..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -58,7 +58,6 @@ export default class SubscriptionPopup extends Component {
 
             autosize
             src={encodeURI(url)}
-            disablewebsecurity
             onDidNavigate={completeCheck}
             // onNewWindow={(event, url, frameName, options) =>
             //   openWindow({ event, url, frameName, options })}
diff --git a/src/config.js b/src/config.js
index b3e00c92c..e66594c59 100644
--- a/src/config.js
+++ b/src/config.js
@@ -11,9 +11,11 @@ export const DEFAULT_APP_SETTINGS = {
   enableSystemTray: true,
   minimizeToSystemTray: false,
   showDisabledServices: true,
+  showMessageBadgeWhenMuted: true,
   enableSpellchecking: true,
   // spellcheckingLanguage: 'auto',
-  locale: 'en-US',
+  locale: '',
+  fallbackLocale: 'en-US',
   beta: false,
   isAppMuted: false,
 };
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 7c6ceccd6..e4a9d60c3 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -73,13 +73,11 @@ export default class AppLayoutContainer extends Component {
       );
     }
 
-    const isMuted = settings.all.isAppMuted || app.isSystemMuted;
-
     const sidebar = (
       <Sidebar
         services={services.allDisplayed}
         setActive={setActive}
-        isAppMuted={isMuted}
+        isAppMuted={settings.all.isAppMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
@@ -89,6 +87,8 @@ export default class AppLayoutContainer extends Component {
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
+        showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted}
+        showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
     );
 
@@ -99,7 +99,7 @@ export default class AppLayoutContainer extends Component {
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
-        isAppMuted={isMuted}
+        isAppMuted={settings.all.isAppMuted}
         update={updateService}
       />
     );
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index a1ac8bda3..008c495d4 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -69,6 +69,7 @@ export default class AccountScreen extends Component {
   render() {
     const { user, payment, app } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
+    const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
     const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting;
@@ -89,6 +90,9 @@ export default class AccountScreen extends Component {
         openExternalUrl={url => openExternalUrl({ url })}
         onCloseSubscriptionWindow={() => this.onCloseWindow()}
         stopMiner={() => this.stopMiner()}
+        deleteAccount={userActions.delete}
+        isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
+        isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
       />
     );
   }
@@ -109,6 +113,7 @@ AccountScreen.wrappedComponent.propTypes = {
     }).isRequired,
     user: PropTypes.shape({
       update: PropTypes.func.isRequired,
+      delete: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 191ef447b..c26195a1e 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -26,6 +26,10 @@ const messages = defineMessages({
     id: 'settings.service.form.enableNotification',
     defaultMessage: '!!!Enable Notifications',
   },
+  enableBadge: {
+    id: 'settings.service.form.enableBadge',
+    defaultMessage: '!!!Show unread message badges',
+  },
   enableAudio: {
     id: 'settings.service.form.enableAudio',
     defaultMessage: '!!!Enable audio',
@@ -42,6 +46,10 @@ const messages = defineMessages({
     id: 'settings.service.form.indirectMessages',
     defaultMessage: '!!!Show message badge for all new messages',
   },
+  icon: {
+    id: 'settings.service.form.icon',
+    defaultMessage: '!!!Custom icon',
+  },
 });
 
 @inject('stores', 'actions') @observer
@@ -88,11 +96,22 @@ export default class EditServiceScreen extends Component {
           value: service.isNotificationEnabled,
           default: true,
         },
+        isBadgeEnabled: {
+          label: intl.formatMessage(messages.enableBadge),
+          value: service.isBadgeEnabled,
+          default: true,
+        },
         isMuted: {
           label: intl.formatMessage(messages.enableAudio),
           value: !service.isMuted,
           default: true,
         },
+        customIcon: {
+          label: intl.formatMessage(messages.icon),
+          value: service.hasCustomUploadedIcon ? service.icon : false,
+          default: null,
+          type: 'file',
+        },
       },
     };
 
@@ -118,11 +137,22 @@ export default class EditServiceScreen extends Component {
       });
     }
 
+    // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
       config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
       config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
     }
 
+    // If a service can be hosted and has a teamId or customUrl
+    if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
+      if (config.fields.team) {
+        config.fields.team.validate = [];
+      }
+      if (config.fields.customUrl) {
+        config.fields.customUrl.validate = [url];
+      }
+    }
+
     if (recipe.hasIndirectMessages) {
       Object.assign(config.fields, {
         isIndirectMessageBadgeEnabled: {
@@ -179,6 +209,12 @@ export default class EditServiceScreen extends Component {
       return (<div>Loading...</div>);
     }
 
+    if (!recipe) {
+      return (
+        <div>something went wrong</div>
+      );
+    }
+
     const form = this.prepareForm(recipe, service);
 
     return (
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 62e255dab..1fa7ce8bc 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -43,6 +43,10 @@ const messages = defineMessages({
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
   },
+  showMessageBadgeWhenMuted: {
+    id: 'settings.app.form.showMessagesBadgesWhenMuted',
+    defaultMessage: '!!!Show unread message badge when notifications are disabled',
+  },
   enableSpellchecking: {
     id: 'settings.app.form.enableSpellchecking',
     defaultMessage: '!!!Enable spell checking',
@@ -85,6 +89,7 @@ export default class EditSettingsScreen extends Component {
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         showDisabledServices: settingsData.showDisabledServices,
+        showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
         // spellcheckingLanguage: settingsData.spellcheckingLanguage,
         locale: settingsData.locale,
@@ -104,7 +109,7 @@ export default class EditSettingsScreen extends Component {
     const { intl } = this.context;
 
     const locales = [];
-    Object.keys(APP_LOCALES).forEach((key) => {
+    Object.keys(APP_LOCALES).sort(Intl.Collator().compare).forEach((key) => {
       locales.push({
         value: key,
         label: APP_LOCALES[key],
@@ -154,6 +159,11 @@ export default class EditSettingsScreen extends Component {
           value: settings.all.showDisabledServices,
           default: DEFAULT_APP_SETTINGS.showDisabledServices,
         },
+        showMessageBadgeWhenMuted: {
+          label: intl.formatMessage(messages.showMessageBadgeWhenMuted),
+          value: settings.all.showMessageBadgeWhenMuted,
+          default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted,
+        },
         enableSpellchecking: {
           label: intl.formatMessage(messages.enableSpellchecking),
           value: settings.all.enableSpellchecking,
@@ -183,8 +193,17 @@ export default class EditSettingsScreen extends Component {
   }
 
   render() {
-    const { updateStatus, updateStatusTypes } = this.props.stores.app;
-    const { checkForUpdates, installUpdate } = this.props.actions.app;
+    const {
+      updateStatus,
+      cacheSize,
+      updateStatusTypes,
+      isClearingAllCache,
+    } = this.props.stores.app;
+    const {
+      checkForUpdates,
+      installUpdate,
+      clearAllCache,
+    } = this.props.actions.app;
     const form = this.prepareForm();
 
     return (
@@ -197,6 +216,9 @@ export default class EditSettingsScreen extends Component {
         noUpdateAvailable={updateStatus === updateStatusTypes.NOT_AVAILABLE}
         updateIsReadyToInstall={updateStatus === updateStatusTypes.DOWNLOADED}
         onSubmit={d => this.onSubmit(d)}
+        cacheSize={cacheSize}
+        isClearingAllCache={isClearingAllCache}
+        onClearAllCache={clearAllCache}
       />
     );
   }
@@ -213,6 +235,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
       launchOnStartup: PropTypes.func.isRequired,
       checkForUpdates: PropTypes.func.isRequired,
       installUpdate: PropTypes.func.isRequired,
+      clearAllCache: PropTypes.func.isRequired,
     }).isRequired,
     settings: PropTypes.shape({
       update: PropTypes.func.isRequired,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index 8cfe5efbf..12db1bcd3 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -53,6 +53,7 @@ export default class ServicesScreen extends Component {
         goTo={router.push}
         servicesRequestFailed={services.allServicesRequest.wasExecuted && services.allServicesRequest.isError}
         retryServicesRequest={() => services.allServicesRequest.reload()}
+        searchNeedle={services.filterNeedle}
       />
     );
   }
diff --git a/src/electron/deepLinking.js b/src/electron/deepLinking.js
new file mode 100644
index 000000000..ef23fd3c5
--- /dev/null
+++ b/src/electron/deepLinking.js
@@ -0,0 +1,7 @@
+export default function handleDeepLink(window, rawUrl) {
+  const url = rawUrl.replace('franz://', '');
+
+  if (!url) return;
+
+  window.webContents.send('navigateFromDeepLink', { url });
+}
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 7bc193e2d..ba49a2f97 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,8 +1,9 @@
 import { app, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
+import { isDevMode } from '../../environment.js';
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32') {
+  if (!isDevMode && (process.platform === 'darwin' || process.platform === 'win32')) {
     // autoUpdater.setFeedURL(updateUrl);
     ipcMain.on('autoUpdate', (event, args) => {
       try {
diff --git a/src/helpers/async-helpers.js b/src/helpers/async-helpers.js
new file mode 100644
index 000000000..2ef01ee09
--- /dev/null
+++ b/src/helpers/async-helpers.js
@@ -0,0 +1,5 @@
+/* eslint-disable import/prefer-default-export */
+
+export function sleep(ms = 0) {
+  return new Promise(r => setTimeout(r, ms));
+}
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js
new file mode 100644
index 000000000..5f63f6b7c
--- /dev/null
+++ b/src/helpers/service-helpers.js
@@ -0,0 +1,20 @@
+import path from 'path';
+import { remote } from 'electron';
+import fs from 'fs-extra';
+
+const app = remote.app;
+
+export function getServicePartitionsDirectory() {
+  return path.join(app.getPath('userData'), 'Partitions');
+}
+
+export function removeServicePartitionDirectory(id = '', addServicePrefix = false) {
+  const servicePartition = path.join(getServicePartitionsDirectory(), `${addServicePrefix ? 'service-' : ''}${id}`);
+
+  return fs.remove(servicePartition);
+}
+
+export async function getServiceIdsFromPartitions() {
+  const files = await fs.readdir(getServicePartitionsDirectory());
+  return files.filter(n => n !== '__chrome_extension');
+}
diff --git a/src/helpers/webview-ime-focus-helpers.js b/src/helpers/webview-ime-focus-helpers.js
deleted file mode 100644
index 2593a5f26..000000000
--- a/src/helpers/webview-ime-focus-helpers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-module.exports.releaseDocumentFocus = () => {
-  const element = document.createElement('span');
-  document.body.appendChild(element);
-
-  const range = document.createRange();
-  range.setStart(element, 0);
-
-  const selection = window.getSelection();
-  selection.removeAllRanges();
-  selection.addRange(range);
-  selection.removeAllRanges();
-
-  document.body.removeChild(element);
-};
-
-module.exports.claimDocumentFocus = () => {
-  const { activeElement } = document;
-  const selection = window.getSelection();
-
-  let selectionStart;
-  let selectionEnd;
-  let range;
-
-  if (activeElement) ({ selectionStart, selectionEnd } = activeElement);
-  if (selection.rangeCount) range = selection.getRangeAt(0);
-
-  const restoreOriginalSelection = () => {
-    if (selectionStart >= 0 && selectionEnd >= 0) {
-      activeElement.selectionStart = selectionStart;
-      activeElement.selectionEnd = selectionEnd;
-    } else if (range) {
-      selection.addRange(range);
-    }
-  };
-
-  exports.releaseDocumentFocus();
-  window.requestAnimationFrame(restoreOriginalSelection);
-};
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 677b09405..34b369da7 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -1,24 +1,30 @@
 export const APP_LOCALES = {
   'en-US': 'English',
-  ca: 'Catalan',
-  'zh-HANT': 'Chinese (Traditional)',
-  cs: 'Czech',
-  nl: 'Dutch',
-  fr: 'French',
-  ka: 'Georgian',
-  de: 'German',
-  hu: 'Hungarian',
-  id: 'Indonesian',
-  ga: 'Irish',
-  it: 'Italian',
-  ja: 'Japanese',
-  pl: 'Polish',
-  pt: 'Portuguese',
-  'pt-BR': 'Portuguese (Brazil)',
-  ru: 'Russian',
-  sk: 'Slovak',
-  uk: 'Ukrainian',
+  ca: 'Català',
+  'zh-HANT': '中文 (Chinese Traditional)',
+  cs: 'Čeština',
+  nl: 'Nederlands',
+  fr: 'Français',
+  ka: 'ქ�რთული (Georgian)',
+  de: 'Deutsch',
+  hu: 'Magyar',
+  id: 'Bahasa Indonesia',
+  ga: 'Gaeilge',
+  it: 'Italiano',
+  ja: '日本語 (Japanese)',
+  pl: 'Polski',
+  pt: 'Português',
+  'pt-BR': 'Português (Brazil)',
+  ru: 'Ру��кий (Russian)',
+  sk: 'Sloven�ina',
+  uk: 'Україн�ька (Ukrainian)',
   'nl-BE': 'Vlaams',
+  el: 'ελληνικά (Greek)',
+  hr: 'Hrvatski',
+  sr: 'Srpski',
+  tr: 'Türkçe',
+  'zh-TW': '�語 (Chinese Taiwan)',
+  es: 'Español',
 };
 
 export default APP_LOCALES;
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 6019d8023..5c62753cc 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -5,7 +5,7 @@
    "import.notSupportedHeadline" : "Serveis que encara no s'admeten a Franz 5",
    "import.skip.label" : "Vull afegir serveis manualment",
    "import.submit.label" : "Importar serveis",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Que hi ha de nou?",
    "infobar.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
    "infobar.buttonReloadServices" : "Recarrega serveis",
    "infobar.requiredRequestsFailed" : "No s'han pogut carregar els serveis i la informació de l'usuari",
@@ -48,8 +48,12 @@
    "settings.account.accountType.basic" : "Compte bàsic",
    "settings.account.accountType.premium" : "Compte de Suport Premium",
    "settings.account.buttonSave" : "Actualitzar el perfil",
+   "settings.account.deleteAccount" : "Esborrar compte",
+   "settings.account.deleteEmailSent" : "Has rebut un correu electrònic amb un enllaç per confirmar l'eliminació del compte. El teu compte i la seva informació no podran ser restaurats!",
+   "settings.account.deleteInfo" : "Si ja no necessites el teu compte de Franz, pots esborrar el teu compte i tota la seva informació emmagatzemada aquí.",
    "settings.account.headline" : "Compte",
    "settings.account.headlineAccount" : "Informació del compte",
+   "settings.account.headlineDangerZone" : "Zona de perill",
    "settings.account.headlineInvoices" : "Factures",
    "settings.account.headlinePassword" : "Canvia la contrasenya",
    "settings.account.headlineProfile" : "Actualitza el perfil",
@@ -64,8 +68,10 @@
    "settings.account.successInfo" : "S'han desat els canvis",
    "settings.account.tryReloadUserInfoRequest" : "Torna a provar-ho",
    "settings.account.userInfoRequestFailed" : "No s'ha pogut carregar la informació de l'usuari",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Reinicia i instal·la l'actualització",
    "settings.app.buttonSearchForUpdate" : "Comprova si hi ha actualitzacions",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versió actual:",
    "settings.app.form.autoLaunchInBackground" : "Obrir en segon plà",
    "settings.app.form.autoLaunchOnStart" : "Iniciar Franz a l'inici",
@@ -76,6 +82,7 @@
    "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.headline" : "Configuració",
    "settings.app.headlineAdvanced" : "Avançat",
    "settings.app.headlineAppearance" : "Aparença",
@@ -83,7 +90,8 @@
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Actualitzacions",
    "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Ajuda'ns a traduir Franz en la teva llengua.",
    "settings.app.updateStatusAvailable" : "Actualització disponible, descarregant ...",
    "settings.app.updateStatusSearching" : "Està buscant actualitzacions",
    "settings.app.updateStatusUpToDate" : "Esteu utilitzant la versió més recent de Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Tots els serveis",
    "settings.recipes.dev" : "Desenvolupament",
    "settings.recipes.headline" : "Serveis disponibles",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Trobes a faltar algun servei?",
    "settings.recipes.mostPopular" : "Els més populars",
    "settings.recipes.nothingFound" : "Ho sentim, però cap servei coincideix amb el terme cercat.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "El servei s'ha afegit correctament",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Tornar als serveis",
    "settings.service.error.headline" : "Error",
    "settings.service.error.message" : "No s'ha pogut carregar la recepta del servei.",
@@ -111,8 +120,15 @@
    "settings.service.form.deleteButton" : "Suprimeix el servei",
    "settings.service.form.editServiceHeadline" : "Edita {name}",
    "settings.service.form.enableAudio" : "Activa l'àudio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Activa les notificacions",
    "settings.service.form.enableService" : "Activa el servei",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "General",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Se't notificarà sobre tots els missatges nous en un canal, no només @usuari, @canal, @aquí ...",
    "settings.service.form.indirectMessages" : "Mostra la insígnia de missatge per a tots els missatges nous",
    "settings.service.form.isMutedInfo" : "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
@@ -121,6 +137,7 @@
    "settings.service.form.tabHosted" : "Allotjat",
    "settings.service.form.tabOnPremise" : "Allotjat per si mateix ��",
    "settings.service.form.team" : "Equip",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Els vostres serveis",
    "settings.services.deletedInfo" : "S'ha eliminat el servei",
    "settings.services.discoverServices" : "Descobrir serveis",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "Cognoms",
    "settings.user.form.newPassword" : "Nova contrasenya",
    "sidebar.addNewService" : "Afegeix nou servei",
-   "sidebar.mute" : "Desactiva l'àudio",
+   "sidebar.muteApp" : "Desactivar notificacions i àudio",
    "sidebar.settings" : "Configuració",
-   "sidebar.unmute" : "Activa l'àudio",
+   "sidebar.unmuteApp" : "Activar notificacions i àudio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Correu electrònic",
    "signup.emailDuplicate" : "Ja existeix un usuari amb aquesta adreça de correu electrònic",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 122fc9b53..833c3c7d5 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,55 +1,59 @@
 {
    "global.api.unhealthy" : "Nemůžeme Franz připojit k online službám",
-   "global.notConnectedToTheInternet" : "Nejste připojen k internetu.",
+   "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
    "import.headline" : "Importovat služby z Franz 4",
-   "import.notSupportedHeadline" : "Služby nejsou podporovány v verzi Franz 5",
-   "import.skip.label" : "Chci přidat služby manuálně",
+   "import.notSupportedHeadline" : "Služby nejsou podporovány ve verzi Franz 5",
+   "import.skip.label" : "Chci přidat službu ru�ně",
    "import.submit.label" : "Importovat služby",
-   "infobar.buttonChangelog" : "What is new?",
-   "infobar.buttonInstallUpdate" : "Restartovat a instalovat aktualizaci",
+   "infobar.buttonChangelog" : "Co je nového?",
+   "infobar.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
    "infobar.buttonReloadServices" : "Obnovit služby",
    "infobar.requiredRequestsFailed" : "Není možné nahrát služby a informace o uživateli",
    "infobar.servicesUpdated" : "Vaše služby byly aktualizovány",
    "infobar.updateAvailable" : "Nová aktualizace Franz je k dispozici",
-   "invite.email.label" : "E-mailová adresa",
+   "invite.email.label" : "Email",
    "invite.headline.friends" : "Pozvěte 3 přátele nebo kolegy",
    "invite.name.label" : "Jméno",
-   "invite.skip.label" : "Udělám to později",
+   "invite.skip.label" : "Nechat na později",
    "invite.submit.label" : "Poslat pozvánky",
-   "login.email.label" : "E-mailová adresa",
+   "login.email.label" : "Email",
    "login.headline" : "Přihlásit se",
-   "login.invalidCredentials" : "E-mail nebo heslo nesouhlasí",
+   "login.invalidCredentials" : "Email nebo heslo nesouhlasí",
    "login.link.password" : "Obnovit heslo",
    "login.link.signup" : "Vytvořit uživatelský ú�et zdarma",
    "login.password.label" : "Heslo",
-   "login.serverLogout" : "Sezení vypršelo, prosím přihlaste se znovu.",
+   "login.serverLogout" : "Sezení vypršelo, je třeba se znovu přihlásit.",
    "login.submit.label" : "Přihlásit se",
    "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
    "password.email.label" : "E-mailová adresa",
    "password.headline" : "Obnovit heslo",
-   "password.link.login" : "Přihlášení do vašeho ú�tu",
+   "password.link.login" : "Přihlásit se k ú�tu",
    "password.link.signup" : "Vytvořit uživatelský ú�et zdarma",
-   "password.noUser" : "Uživatel s touto e-mailovou adresou nebyl nalezen",
+   "password.noUser" : "Pro emailovou adresu nebyl nalezený žádný uživatel",
    "password.submit.label" : "Odeslat",
    "password.successInfo" : "Prosím, zkontrolujte svůj e-mail",
-   "pricing.headline" : "Podpořte Franz",
-   "pricing.link.skipPayment" : "Nechci podpořit vývoj skvělé aplikace Franz.",
+   "pricing.headline" : "Podpořit Franz",
+   "pricing.link.skipPayment" : "Nechci podporovat vývoj aplikace Franz.",
    "pricing.submit.label" : "Chci podpořit vývoj aplikace Franz",
    "pricing.support.label" : "Vyberte váš plán podpory",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Na�íst znovu {name}",
+   "service.crashHandler.autoReload" : "Pokus o automatické obnovení {name} za {seconds} sekund",
+   "service.crashHandler.headline" : "Ale ne!",
+   "service.crashHandler.text" : "{name} způsobil chybu.",
+   "service.disabledHandler.action" : "Zapnout {name}",
+   "service.disabledHandler.headline" : "{name} je vypnutý",
    "services.getStarted" : "Za�něme",
    "services.welcome" : "Vítejte v programu Franz",
    "settings.account.account.editButton" : "Upravit ú�et",
    "settings.account.accountType.basic" : "Základní ú�et",
    "settings.account.accountType.premium" : "Prémiový ú�et podporovatele",
    "settings.account.buttonSave" : "Aktualizovat profil",
+   "settings.account.deleteAccount" : "Smazat ú�et",
+   "settings.account.deleteEmailSent" : "Na váš mail byl odeslán email s odkazem pro potvrzení smazání ú�tu. Váš ú�et a data poté nepůjde obnovit!",
+   "settings.account.deleteInfo" : "Pokud již nepotřebujete váš Franz ú�et, můžete zde váš ú�et, a všechna data v něm, smazat.",
    "settings.account.headline" : "Ú�et",
    "settings.account.headlineAccount" : "Informace o ú�tu",
+   "settings.account.headlineDangerZone" : "Nebezpe�ná zóna",
    "settings.account.headlineInvoices" : "Faktury",
    "settings.account.headlinePassword" : "Změnit heslo",
    "settings.account.headlineProfile" : "Aktualizovat profil",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "Vaše změny byly uloženy",
    "settings.account.tryReloadUserInfoRequest" : "Zkusit opět",
    "settings.account.userInfoRequestFailed" : "Nelze na�íst informace o uživateli.",
+   "settings.app.buttonClearAllCache" : "Vyprázdnit mezipaměti",
    "settings.app.buttonInstallUpdate" : "Restartovat a nainstalovat aktualizace",
    "settings.app.buttonSearchForUpdate" : "Zkontrolovat aktualizace",
+   "settings.app.cacheInfo" : "Franz momentálně používá {size} místa na disku.",
    "settings.app.currentVersion" : "Aktuální verze:",
    "settings.app.form.autoLaunchInBackground" : "Spustit na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustit Franz při startu",
    "settings.app.form.beta" : "Zahrnout beta verze",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "Zapnout kontrolu pravopisu",
    "settings.app.form.enableSystemTray" : "Zobrazit Franz v systémové liště",
    "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" : "Display disabled services tabs",
+   "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.headline" : "Nastavení",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Pokro�ilé",
+   "settings.app.headlineAppearance" : "Vzhled",
    "settings.app.headlineGeneral" : "Obecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizace",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Změny vyžadují restart",
+   "settings.app.subheadlineCache" : "Mezipaměť",
+   "settings.app.translationHelp" : "Pomozte nám přeložit Franz do svého jazyka.",
    "settings.app.updateStatusAvailable" : "Aktualizace k dispozici, stahování...",
    "settings.app.updateStatusSearching" : "Hledá aktualizace",
    "settings.app.updateStatusUpToDate" : "Používáte nejnovější verzi programu Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Všechny služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Chybějící služba?",
    "settings.recipes.mostPopular" : "Nejpopulárnější",
    "settings.recipes.nothingFound" : "Je nám líto, ale žádná služba neodpovídá vašemu hledanému výrazu.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Služba byla úspěšně přidána",
+   "settings.searchService" : "Vyhledat službu",
    "settings.service.error.goBack" : "Zpět na služby",
    "settings.service.error.headline" : "Chyba",
    "settings.service.error.message" : "Nelze na�íst službu.",
@@ -110,24 +119,32 @@
    "settings.service.form.customUrlValidationError" : "Nepodařilo se ověřit vlastní server {name}.",
    "settings.service.form.deleteButton" : "Odstranit službu",
    "settings.service.form.editServiceHeadline" : "Upravit {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Zapnout zvuk",
+   "settings.service.form.enableBadge" : "Ukázat odznaky nepře�tených zpráv",
    "settings.service.form.enableNotification" : "Povolit upozornění",
    "settings.service.form.enableService" : "Povolit službu",
+   "settings.service.form.headlineBadges" : "Odznaky nepře�tených zpráv",
+   "settings.service.form.headlineGeneral" : "Obecné",
+   "settings.service.form.headlineNotifications" : "Upozornění",
+   "settings.service.form.icon" : "Vlastní ikona",
+   "settings.service.form.iconDelete" : "Smazat",
+   "settings.service.form.iconUpload" : "Přesuňte váš obrázek, nebo klepněte sem",
    "settings.service.form.indirectMessageInfo" : "Budete informováni o všech nových zprávách v kanálu, nikoliv pouze @název, @kanál, @kde, ...",
    "settings.service.form.indirectMessages" : "Zobrazovat znak zprávy pro všechny nové zprávy",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
    "settings.service.form.name" : "Jméno",
    "settings.service.form.saveButton" : "Uložit službu",
    "settings.service.form.tabHosted" : "Hostováno",
    "settings.service.form.tabOnPremise" : "Samostatně hostované ��",
    "settings.service.form.team" : "Tým",
+   "settings.service.form.useHostedService" : "Použijte hostovanou {name} službu.",
    "settings.service.form.yourServices" : "Vaše služby",
    "settings.services.deletedInfo" : "Služba byla odstraněna",
    "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.tooltip.isDisabled" : "Služba je zakázána",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Všechny zvuky jsou ztišeny",
    "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
    "settings.services.updatedInfo" : "Vaše změny byly uloženy",
    "settings.user.form.accountType.company" : "Spole�nost",
@@ -136,26 +153,26 @@
    "settings.user.form.accountType.non-profit" : "Nezisková organizace",
    "settings.user.form.currentPassword" : "Aktuální heslo",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.firstname" : "Jméno",
+   "settings.user.form.lastname" : "Příjmení",
    "settings.user.form.newPassword" : "Nové heslo",
    "sidebar.addNewService" : "Přidat novou službu",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Vypnout upozornění a zvuky",
    "sidebar.settings" : "Nastavení",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Zapnout upozornění a zvuky",
    "signup.company.label" : "Spole�nost",
    "signup.email.label" : "Emailová adresa",
    "signup.emailDuplicate" : "Uživatel s touto emailovou adresou již existuje",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Jméno",
    "signup.headline" : "Přihlásit se",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Příjmení",
    "signup.legal.info" : "Vytvořením ú�tu Franz souhlasíte s",
    "signup.legal.privacy" : "Prohlášení o ochraně soukromí",
    "signup.legal.terms" : "Podmínky služby",
    "signup.link.login" : "Již máte ú�et, přihlásit se?",
    "signup.password.label" : "Heslo",
    "signup.submit.label" : "Vytvořit ú�et",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "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.customServices" : "Privátní služby pro vás a váš tým",
@@ -178,13 +195,13 @@
    "subscriptionPopup.buttonCancel" : "Zrušit",
    "subscriptionPopup.buttonDone" : "Dokon�it",
    "tabs.item.deleteService" : "Odstranit službu",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Vypnout zvuk",
    "tabs.item.disableNotifications" : "Zakázat upozornění",
    "tabs.item.disableService" : "Zakázat službu",
    "tabs.item.edit" : "Upravit",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Zapnout zvuk",
    "tabs.item.enableNotification" : "Povolit oznamování",
-   "tabs.item.enableService" : "Povolit službu",
+   "tabs.item.enableService" : "Zapnout službu",
    "tabs.item.reload" : "Obnovit",
    "welcome.loginButton" : "Přihlášení do vašeho ú�tu",
    "welcome.signupButton" : "Vytvořit ú�et zdarma",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index cdfce9d55..1ea0554ba 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,21 +1,21 @@
 {
-   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen.",
+   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
    "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
-   "import.headline" : "Importiere deine Franz 4 Dienste",
+   "import.headline" : "Deine Franz 4 Dienste importieren",
    "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
-   "import.skip.label" : "Ich möchte meine Dienste manuell hinzufügen",
+   "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
    "import.submit.label" : "Dienste importieren",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Was gibt es neues?",
    "infobar.buttonInstallUpdate" : "Neustarten & Update installieren",
-   "infobar.buttonReloadServices" : "Dienste neu laden",
+   "infobar.buttonReloadServices" : "Dienste neuladen",
    "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
    "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
    "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
    "invite.email.label" : "E-Mail Adresse",
-   "invite.headline.friends" : "Lade 3 Freunde oder Kollegen ein",
+   "invite.headline.friends" : "3 Freunde oder Kollegen einladen",
    "invite.name.label" : "Name",
    "invite.skip.label" : "Ich möchte das später tun",
-   "invite.submit.label" : "Einladungen senden",
+   "invite.submit.label" : "Einladungen schicken",
    "login.email.label" : "E-Mail Adresse",
    "login.headline" : "Anmelden",
    "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
@@ -27,17 +27,17 @@
    "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde dich erneut an.",
    "password.email.label" : "E-Mail Adresse",
    "password.headline" : "Passwort zurücksetzen",
-   "password.link.login" : "Anmelden",
+   "password.link.login" : "An deinem Konto anmelden",
    "password.link.signup" : "Kostenloses Konto erstellen",
    "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
    "password.submit.label" : "Absenden",
-   "password.successInfo" : "Wir haben dir ein E-Mail mit weiteren Anweisungen geschickt.",
-   "pricing.headline" : "Unterstütze Franz",
+   "password.successInfo" : "Wir haben dir eine E-Mail mit weiteren Anweisungen geschickt.",
+   "pricing.headline" : "Franz unterstützen",
    "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
    "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
    "pricing.support.label" : "Wie möchtest du Franz unterstützen?",
-   "service.crashHandler.action" : "Neu laden",
-   "service.crashHandler.autoReload" : "{name} wird automatisch wiederhergestellt in {seconds} sekunden",
+   "service.crashHandler.action" : "{name} neuladen",
+   "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
    "service.crashHandler.headline" : "Oh nein!",
    "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
    "service.disabledHandler.action" : "{name} aktivieren",
@@ -48,24 +48,30 @@
    "settings.account.accountType.basic" : "Basis Konto",
    "settings.account.accountType.premium" : "Premium-Supporter Konto",
    "settings.account.buttonSave" : "Profil aktualisieren",
+   "settings.account.deleteAccount" : "Benutzerkonto löschen",
+   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung deines Benutzerkontos erhalten. Dein Benutzerkonto und deine Daten können nach der Löschung nicht wiederhergestellt werden!",
+   "settings.account.deleteInfo" : "Hier kannst du dein Franz Benutzerkonto, und alle dazugehörigen Daten, löschen.",
    "settings.account.headline" : "Konto",
    "settings.account.headlineAccount" : "Konto Informationen",
+   "settings.account.headlineDangerZone" : "Benutzerkonto löschen",
    "settings.account.headlineInvoices" : "Rechnungen",
    "settings.account.headlinePassword" : "Passwort ändern",
    "settings.account.headlineProfile" : "Profil aktualisieren",
    "settings.account.headlineSubscription" : "Dein Abonnement",
-   "settings.account.headlineUpgrade" : "Upgrade dein Konto & unterstütze Franz",
-   "settings.account.invoiceDownload" : "Download",
-   "settings.account.manageSubscription.label" : "Verwalte Dein Abonnement",
+   "settings.account.headlineUpgrade" : "Dein Konto upgraden & Franz unterstützen",
+   "settings.account.invoiceDownload" : "Herunterladen",
+   "settings.account.manageSubscription.label" : "Dein Abonnement verwalten",
    "settings.account.mining.active" : "Du führst gerade {hashes} Berechnungen pro Sekunde aus.",
    "settings.account.mining.cancel" : "Mining abbrechen",
    "settings.account.mining.moreInformation" : "Weitere Informationen",
    "settings.account.mining.thankyou" : "Vielen Dank, dass du Franz mit deiner Rechenleistung unterstützt.",
-   "settings.account.successInfo" : "Deine Änderungen wurden gespeichert.",
+   "settings.account.successInfo" : "Deine Änderungen wurden gespeichert",
    "settings.account.tryReloadUserInfoRequest" : "Erneut versuchen",
    "settings.account.userInfoRequestFailed" : "Benutzerinformationen konnten nicht geladen werden",
+   "settings.app.buttonClearAllCache" : "Cache leeren",
    "settings.app.buttonInstallUpdate" : "Neustarten & Update installieren",
    "settings.app.buttonSearchForUpdate" : "Nach Updates suchen",
+   "settings.app.cacheInfo" : "Der Franz Cache belegt derzeit {size}.",
    "settings.app.currentVersion" : "Aktuelle Version:",
    "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
    "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
@@ -76,14 +82,16 @@
    "settings.app.form.minimizeToSystemTray" : "Franz in die Systemleiste 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.headline" : "Einstellungen",
    "settings.app.headlineAdvanced" : "Erweitert",
    "settings.app.headlineAppearance" : "Darstellung",
-   "settings.app.headlineGeneral" : "Allgemein",
+   "settings.app.headlineGeneral" : "Allgemeines",
    "settings.app.headlineLanguage" : "Sprache",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam. ",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Hilf uns, Franz in deine Sprache zu übersetzen.",
    "settings.app.updateStatusAvailable" : "Update verfügbar, herunterladen...",
    "settings.app.updateStatusSearching" : "Suche nach Updates",
    "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Alle Dienste",
    "settings.recipes.dev" : "Entwicklung",
    "settings.recipes.headline" : "Verfügbare Dienste",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Fehlt ein Service?",
    "settings.recipes.mostPopular" : "Am beliebtesten",
    "settings.recipes.nothingFound" : "Entschuldigung, aber kein Dienst entspricht deiner Suchanfrage.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
+   "settings.searchService" : "Service suchen",
    "settings.service.error.goBack" : "Zurück zu den Diensten",
    "settings.service.error.headline" : "Fehler",
    "settings.service.error.message" : "Das Dienst-Rezept konnte nicht geladen werden.",
@@ -106,13 +115,20 @@
    "settings.service.form.availableServices" : "Verfügbare Dienste",
    "settings.service.form.customUrl" : "Eigener Server",
    "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst du ein Franz Premium-Supporter Konto.",
-   "settings.service.form.customUrlUpgradeAccount" : "Upgrade dein Konto",
-   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.\",",
-   "settings.service.form.deleteButton" : "Dienst entfernen",
+   "settings.service.form.customUrlUpgradeAccount" : "Dein Konto upgraden",
+   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.",
+   "settings.service.form.deleteButton" : "Dienst löschen",
    "settings.service.form.editServiceHeadline" : "{name} bearbeiten",
    "settings.service.form.enableAudio" : "Audio aktivieren",
+   "settings.service.form.enableBadge" : "Nachrichten-Badge anzeigen",
    "settings.service.form.enableNotification" : "Benachrichtigungen aktivieren",
    "settings.service.form.enableService" : "Dienst aktivieren",
+   "settings.service.form.headlineBadges" : "Nachrichten-Badge",
+   "settings.service.form.headlineGeneral" : "Allgemeines",
+   "settings.service.form.headlineNotifications" : "Benachrichtigungen",
+   "settings.service.form.icon" : "Icon",
+   "settings.service.form.iconDelete" : "Löschen",
+   "settings.service.form.iconUpload" : "Klicken oder Bild hierher ziehen",
    "settings.service.form.indirectMessageInfo" : "Du wirst über alle neuen Nachrichten in einem Kanal informiert, nicht nur @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
    "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
@@ -121,16 +137,17 @@
    "settings.service.form.tabHosted" : "Gehostet",
    "settings.service.form.tabOnPremise" : "Selbst gehostet ��",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Hosted {name} verwenden.",
    "settings.service.form.yourServices" : "Deine Dienste",
-   "settings.services.deletedInfo" : "Dienst wurde entfernt",
+   "settings.services.deletedInfo" : "Dienst wurde gelöscht",
    "settings.services.discoverServices" : "Dienste entdecken",
    "settings.services.headline" : "Deine Dienste",
    "settings.services.noServicesAdded" : "Du hast noch keine Dienste hinzugefügt.",
-   "settings.services.tooltip.isDisabled" : "Dienst deaktiviert",
-   "settings.services.tooltip.isMuted" : "Audio ist deaktiviert",
+   "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.user.form.accountType.company" : "Unternehmen",
+   "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Einzelperson",
    "settings.user.form.accountType.label" : "Konto-Typ",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
@@ -139,15 +156,15 @@
    "settings.user.form.firstname" : "Vorname",
    "settings.user.form.lastname" : "Nachname",
    "settings.user.form.newPassword" : "Neues Passwort",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.mute" : "Audio deaktivieren",
+   "sidebar.addNewService" : "Neuem Dienst hinzufügen",
+   "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
    "sidebar.settings" : "Einstellungen",
-   "sidebar.unmute" : "Audio aktivieren",
-   "signup.company.label" : "Unternehmen",
+   "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
+   "signup.company.label" : "Firma",
    "signup.email.label" : "E-Mail Adresse",
-   "signup.emailDuplicate" : "Ein Benutzer mit dieser E-Mail Adresse existiert bereits.",
+   "signup.emailDuplicate" : "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
    "signup.firstname.label" : "Vorname",
-   "signup.headline" : "Registrierung",
+   "signup.headline" : "Anmelden",
    "signup.lastname.label" : "Nachname",
    "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst du die",
    "signup.legal.privacy" : "Datenschutzerklärung",
@@ -155,13 +172,13 @@
    "signup.link.login" : "Du hast bereits ein Konto? Melde dich an.",
    "signup.password.label" : "Passwort",
    "signup.submit.label" : "Konto erstellen",
-   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.  ",
+   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
    "subscription.features.ads" : "Nie mehr Werbung!",
    "subscription.features.comingSoon" : "folgt bald",
    "subscription.features.customServices" : "Private Dienste für dich und dein Team",
    "subscription.features.encryptedSync" : "Verschlüsselte Sitzungs-Synchronisation",
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
-   "subscription.features.vpn" : "Proxy & VPN Unterstützung",
+   "subscription.features.vpn" : "Proxy- & VPN-Unterstützung",
    "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
    "subscription.mining.experimental" : "experimentell",
    "subscription.mining.headline" : "Wie funktioniert das?",
@@ -172,12 +189,12 @@
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
    "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
    "subscription.type.free" : "kostenlos",
-   "subscription.type.mining" : "Unterstütze Franz mit Rechenleistung",
+   "subscription.type.mining" : "Franz mit Rechenleistung unterstützen",
    "subscription.type.month" : "Monat",
    "subscription.type.year" : "Jahr",
    "subscriptionPopup.buttonCancel" : "Abbrechen",
    "subscriptionPopup.buttonDone" : "Fertig",
-   "tabs.item.deleteService" : "Dienst entfernen",
+   "tabs.item.deleteService" : "Dienst löschen",
    "tabs.item.disableAudio" : "Audio deaktivieren",
    "tabs.item.disableNotifications" : "Benachrichtigungen deaktivieren",
    "tabs.item.disableService" : "Dienst deaktivieren",
@@ -185,8 +202,8 @@
    "tabs.item.enableAudio" : "Audio aktivieren",
    "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
    "tabs.item.enableService" : "Dienst aktivieren",
-   "tabs.item.reload" : "Neu laden",
-   "welcome.loginButton" : "Anmelden",
+   "tabs.item.reload" : "Neuladen",
+   "welcome.loginButton" : "An deinem Konto anmelden",
    "welcome.signupButton" : "Kostenloses Konto erstellen",
-   "welcome.slogan" : "Kommunikation, die für Dich funktioniert"
+   "welcome.slogan" : "Kommunikation, die für dich funktioniert"
 }
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 5717a18b1..14c9d05ee 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,192 +1,209 @@
 {
-   "global.api.unhealthy" : "Can't connect to Franz online services",
-   "global.notConnectedToTheInternet" : "You are not connected to the internet.",
-   "import.headline" : "Import your Franz 4 services",
-   "import.notSupportedHeadline" : "Services not yet supported in Franz 5",
-   "import.skip.label" : "I want add services manually",
-   "import.submit.label" : "Import services",
-   "infobar.buttonChangelog" : "What is new?",
-   "infobar.buttonInstallUpdate" : "Restart & install update",
-   "infobar.buttonReloadServices" : "Reload services",
-   "infobar.requiredRequestsFailed" : "Could not load services and user information",
-   "infobar.servicesUpdated" : "Your services have been updated.",
-   "infobar.updateAvailable" : "A new update for Franz is available.",
-   "invite.email.label" : "Email address",
-   "invite.headline.friends" : "Invite 3 of your friends or colleagues",
-   "invite.name.label" : "Name",
-   "invite.skip.label" : "I want to do this later",
-   "invite.submit.label" : "Send invites",
-   "login.email.label" : "Email address",
-   "login.headline" : "Sign in",
-   "login.invalidCredentials" : "Email or password not valid",
-   "login.link.password" : "Reset password",
-   "login.link.signup" : "Create a free account",
-   "login.password.label" : "Password",
-   "login.serverLogout" : "Your session expired, please login again.",
-   "login.submit.label" : "Sign in",
-   "login.tokenExpired" : "Your session expired, please login again.",
-   "password.email.label" : "Email address",
-   "password.headline" : "Reset password",
-   "password.link.login" : "Sign in to your account",
-   "password.link.signup" : "Create a free account",
-   "password.noUser" : "No user with that email address was found",
-   "password.submit.label" : "Submit",
-   "password.successInfo" : "Please check your email",
-   "pricing.headline" : "Support Franz",
-   "pricing.link.skipPayment" : "I don't want to support the development of Franz.",
-   "pricing.submit.label" : "I want to support the development of Franz",
-   "pricing.support.label" : "Select your support plan",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
-   "services.getStarted" : "Get started",
-   "services.welcome" : "Welcome to Franz",
-   "settings.account.account.editButton" : "Edit account",
-   "settings.account.accountType.basic" : "Basic Account",
-   "settings.account.accountType.premium" : "Premium Supporter Account",
-   "settings.account.buttonSave" : "Update profile",
-   "settings.account.headline" : "Account",
-   "settings.account.headlineAccount" : "Account information",
-   "settings.account.headlineInvoices" : "Invoices",
-   "settings.account.headlinePassword" : "Change password",
-   "settings.account.headlineProfile" : "Update profile",
-   "settings.account.headlineSubscription" : "Your subscription",
-   "settings.account.headlineUpgrade" : "Upgrade your account & support Franz",
-   "settings.account.invoiceDownload" : "Download",
-   "settings.account.manageSubscription.label" : "Manage your subscription",
-   "settings.account.mining.active" : "You are right now performing {hashes} calculations per second.",
-   "settings.account.mining.cancel" : "Cancel mining",
-   "settings.account.mining.moreInformation" : "Get more information",
-   "settings.account.mining.thankyou" : "Thank you for supporting Franz with your processing power.",
-   "settings.account.successInfo" : "Your changes have been saved",
-   "settings.account.tryReloadUserInfoRequest" : "Try again",
-   "settings.account.userInfoRequestFailed" : "Could not load user information",
-   "settings.app.buttonInstallUpdate" : "Restart & install update",
-   "settings.app.buttonSearchForUpdate" : "Check for updates",
-   "settings.app.currentVersion" : "Current version:",
-   "settings.app.form.autoLaunchInBackground" : "Open in background",
-   "settings.app.form.autoLaunchOnStart" : "Launch Franz on start",
-   "settings.app.form.beta" : "Include beta versions",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
-   "settings.app.form.language" : "Language",
-   "settings.app.form.minimizeToSystemTray" : "Minimize Franz to system tray",
-   "settings.app.form.runInBackground" : "Keep Franz in background when closing the window",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.headline" : "Settings",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
-   "settings.app.headlineGeneral" : "General",
-   "settings.app.headlineLanguage" : "Language",
-   "settings.app.headlineUpdates" : "Updates",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
-   "settings.app.updateStatusAvailable" : "Update available, downloading...",
-   "settings.app.updateStatusSearching" : "Is searching for update",
-   "settings.app.updateStatusUpToDate" : "You are using the latest version of Franz",
-   "settings.navigation.account" : "Account",
-   "settings.navigation.availableServices" : "Available services",
-   "settings.navigation.logout" : "Logout",
-   "settings.navigation.settings" : "Settings",
-   "settings.navigation.yourServices" : "Your services",
-   "settings.recipes.all" : "All services",
-   "settings.recipes.dev" : "Development",
-   "settings.recipes.headline" : "Available services",
-   "settings.recipes.missingService" : "Missing a service?",
-   "settings.recipes.mostPopular" : "Most popular",
-   "settings.recipes.nothingFound" : "Sorry, but no service matched your search term.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Service successfully added",
-   "settings.service.error.goBack" : "Back to services",
-   "settings.service.error.headline" : "Error",
-   "settings.service.error.message" : "Could not load service recipe.",
-   "settings.service.form.addServiceHeadline" : "Add {name}",
-   "settings.service.form.availableServices" : "Available services",
-   "settings.service.form.customUrl" : "Custom server",
-   "settings.service.form.customUrlPremiumInfo" : "To add self hosted services, you need a Franz Premium Supporter Account.",
-   "settings.service.form.customUrlUpgradeAccount" : "Upgrade your account",
-   "settings.service.form.customUrlValidationError" : "Could not validate custom {name} server.",
-   "settings.service.form.deleteButton" : "Delete service",
-   "settings.service.form.editServiceHeadline" : "Edit {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
-   "settings.service.form.enableNotification" : "Enable notifications",
-   "settings.service.form.enableService" : "Enable service",
-   "settings.service.form.indirectMessageInfo" : "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Show message badge for all new messages",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
-   "settings.service.form.name" : "Name",
-   "settings.service.form.saveButton" : "Save service",
-   "settings.service.form.tabHosted" : "Hosted",
-   "settings.service.form.tabOnPremise" : "Self hosted ��",
-   "settings.service.form.team" : "Team",
-   "settings.service.form.yourServices" : "Your services",
-   "settings.services.deletedInfo" : "Service has been deleted",
-   "settings.services.discoverServices" : "Discover services",
-   "settings.services.headline" : "Your services",
-   "settings.services.noServicesAdded" : "You haven't added any services yet.",
-   "settings.services.tooltip.isDisabled" : "Service is disabled",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
-   "settings.services.tooltip.notificationsDisabled" : "Notifications are disabled",
-   "settings.services.updatedInfo" : "Your changes have been saved",
-   "settings.user.form.accountType.company" : "Company",
-   "settings.user.form.accountType.individual" : "Individual",
-   "settings.user.form.accountType.label" : "Account type",
-   "settings.user.form.accountType.non-profit" : "Non-Profit",
-   "settings.user.form.currentPassword" : "Current password",
+   "global.api.unhealthy" : "Δεν είναι δυνατή η σ�νδεση με τις online υπη�εσίες του Franz",
+   "global.notConnectedToTheInternet" : "Δεν είστε συνδεδεμένοι στο διαδίκτυο.",
+   "import.headline" : "Εισαγάγετε τις Franz 4 υπη�εσίες σας",
+   "import.notSupportedHeadline" : "Υπη�εσίες που δεν υποστη�ίζονται ακόμα στο Franz 5",
+   "import.skip.label" : "Θέλω να π�οσθέσω υπη�εσίες χει�οκίνητα",
+   "import.submit.label" : "Εισαγωγή υπη�εσιών",
+   "infobar.buttonChangelog" : "Τι νέο υπά�χει;",
+   "infobar.buttonInstallUpdate" : "Επανεκκίνηση & εγκατάσταση ενημε�ώσεων",
+   "infobar.buttonReloadServices" : "Ανανέωση υπη�εσιών",
+   "infobar.requiredRequestsFailed" : "Δεν ήταν δυνατή η φό�τωση υπη�εσιών και πλη�οφο�ιών χ�ηστών",
+   "infobar.servicesUpdated" : "Οι υπη�εσίες σας έχουν ενημε�ωθεί.",
+   "infobar.updateAvailable" : "Υπά�χει διαθέσιμη μια νέα ενημέ�ωση για τον Franz.",
+   "invite.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
+   "invite.headline.friends" : "Π�οσκαλέστε 3 από τους φίλους ή τους συναδέλφους σας",
+   "invite.name.label" : "Όνομα",
+   "invite.skip.label" : "Θέλω να το κάνω α�γότε�α",
+   "invite.submit.label" : "Αποστολή π�οσκλήσεων",
+   "login.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
+   "login.headline" : "Σ�νδεση",
+   "login.invalidCredentials" : "Το email ή ο κωδικός π�όσβασης δεν είναι έγκυ�ος",
+   "login.link.password" : "Επαναφο�ά κωδικο� π�όσβασης",
+   "login.link.signup" : "Δημιου�γία δω�εάν λογα�ιασμο�",
+   "login.password.label" : "Κωδικός π�όσβασης",
+   "login.serverLogout" : "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
+   "login.submit.label" : "Σ�νδεση",
+   "login.tokenExpired" : "Η συνεδ�ία σας έληξε, συνδεθείτε ξανά.",
+   "password.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
+   "password.headline" : "Επαναφο�ά κωδικο� π�όσβασης",
+   "password.link.login" : "Σ�νδεση στο λογα�ιασμό σας",
+   "password.link.signup" : "Δημιου�γία δω�εάν λογα�ιασμο�",
+   "password.noUser" : "Δεν β�έθηκε χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
+   "password.submit.label" : "Υποβολή",
+   "password.successInfo" : "Ελέγξτε το email σας",
+   "pricing.headline" : "Υποστη�ίξτε το Franz",
+   "pricing.link.skipPayment" : "Δεν θέλω να βοηθήσω στην ανάπτυξη του Franz.",
+   "pricing.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
+   "pricing.support.label" : "Επιλέξτε το πακέτο υποστή�ιξης",
+   "service.crashHandler.action" : "Επαναφό�τωση {name}",
+   "service.crashHandler.autoReload" : "Γίνεται π�οσπάθεια αυτόματης ανάκτησης του {name} σε {seconds} δευτε�όλεπτα",
+   "service.crashHandler.headline" : "Ω, όχι!",
+   "service.crashHandler.text" : "Το {name} π�οκάλεσε ένα σφάλμα.",
+   "service.disabledHandler.action" : "Ενε�γοποίηση {name}",
+   "service.disabledHandler.headline" : "{name} είναι απενε�γοποιημένο",
+   "services.getStarted" : "Ξεκινήστε",
+   "services.welcome" : "Καλώς ο�ίσατε στον Franz",
+   "settings.account.account.editButton" : "Επεξε�γασία λογα�ιασμο�",
+   "settings.account.accountType.basic" : "Βασικός λογα�ιασμός",
+   "settings.account.accountType.premium" : "Λογα�ιασμός Premium Υποστη�ικτή",
+   "settings.account.buttonSave" : "Ενημέ�ωση π�οφίλ",
+   "settings.account.deleteAccount" : "Διαγ�αφή λογα�ιασμο�",
+   "settings.account.deleteEmailSent" : "Έχετε λάβει ένα email με έναν σ�νδεσμο για την επιβεβαίωση της διαγ�αφής του λογα�ιασμο� σας. Ο λογα�ιασμός και τα δεδομένα σας δεν μπο�ο�ν να ανακτηθο�ν!",
+   "settings.account.deleteInfo" : "Εάν δεν χ�ειάζεστε πλέον το λογα�ιασμό σας στο Franz, μπο�είτε να διαγ�άψετε το λογα�ιασμό σας και όλα τα δεδομένα που σχετίζονται με αυτόν εδώ.",
+   "settings.account.headline" : "Λογα�ιασμός",
+   "settings.account.headlineAccount" : "Πλη�οφο�ίες λογα�ιασμο�",
+   "settings.account.headlineDangerZone" : "Επικίνδυνη Ζώνη",
+   "settings.account.headlineInvoices" : "Τιμολόγια",
+   "settings.account.headlinePassword" : "Αλλαγή κωδικο� π�όσβασης",
+   "settings.account.headlineProfile" : "Ενημέ�ωση π�οφίλ",
+   "settings.account.headlineSubscription" : "Η συνδ�ομή σας",
+   "settings.account.headlineUpgrade" : "Αναβάθμιση του λογα�ιασμο� σας και υποστή�ιξη Franz",
+   "settings.account.invoiceDownload" : "Λήψη",
+   "settings.account.manageSubscription.label" : "Διαχεί�ιση της συνδ�ομής σας",
+   "settings.account.mining.active" : "Τώ�α π�αγματοποιείτε {hashes} υπολογισμο�ς ανά δευτε�όλεπτο.",
+   "settings.account.mining.cancel" : "Ακ��ωση εξό�υξης",
+   "settings.account.mining.moreInformation" : "Λάβετε πε�ισσότε�ες πλη�οφο�ίες",
+   "settings.account.mining.thankyou" : "Σας ευχα�ιστο�με για την υποστή�ιξη του Franz με την ισχ� επεξε�γασίας σας",
+   "settings.account.successInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.account.tryReloadUserInfoRequest" : "Δοκιμάστε ξανά",
+   "settings.account.userInfoRequestFailed" : "Δεν ήταν δυνατή η φό�τωση πλη�οφο�ιών χ�ήστη",
+   "settings.app.buttonClearAllCache" : "Καθα�ισμός λανθάνουσας μνήμης",
+   "settings.app.buttonInstallUpdate" : "Επανεκκίνηση & εγκατάσταση ενημε�ώσεων",
+   "settings.app.buttonSearchForUpdate" : "Έλεγχος για ενημε�ώσεις",
+   "settings.app.cacheInfo" : "Το Franz χ�ησιμοποιεί αυτήν τη στιγμή {size} χώ�ου στο δίσκο.",
+   "settings.app.currentVersion" : "Τ�έχουσα έκδοση:",
+   "settings.app.form.autoLaunchInBackground" : "Άνοιγμα στο πα�ασκήνιο",
+   "settings.app.form.autoLaunchOnStart" : "Εκκίνηση του Franz κατά την εκκίνηση του συστήματος",
+   "settings.app.form.beta" : "Συμπε�ιλάβετε εκδόσεις beta",
+   "settings.app.form.enableSpellchecking" : "Ενε�γοποίηση ο�θογ�αφικο� ελέγχου",
+   "settings.app.form.enableSystemTray" : "Εμφάνιση του 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.headline" : "Ρυθμίσεις",
+   "settings.app.headlineAdvanced" : "Για π�οχω�ημένους",
+   "settings.app.headlineAppearance" : "Εμφάνιση",
+   "settings.app.headlineGeneral" : "Γενικά",
+   "settings.app.headlineLanguage" : "Γλώσσα",
+   "settings.app.headlineUpdates" : "Ενημε�ώσεις",
+   "settings.app.restartRequired" : "Οι αλλαγές απαιτο�ν επανεκκίνηση",
+   "settings.app.subheadlineCache" : "Λανθάνουσα μνήμη",
+   "settings.app.translationHelp" : "Βοηθήστε μας να μεταφ�άσουμε το Franz στη δική σας γλώσσα.",
+   "settings.app.updateStatusAvailable" : "Υπά�χει διαθέσιμη ενημέ�ωση, γίνεται λήψη...",
+   "settings.app.updateStatusSearching" : " Γίνεται αναζήτηση για ενημέ�ωση",
+   "settings.app.updateStatusUpToDate" : "Χ�ησιμοποιείτε την τελευταία έκδοση του Franz",
+   "settings.navigation.account" : "Λογα�ιασμός",
+   "settings.navigation.availableServices" : "Διαθέσιμες υπη�εσίες",
+   "settings.navigation.logout" : "Αποσ�νδεση",
+   "settings.navigation.settings" : "Ρυθμίσεις",
+   "settings.navigation.yourServices" : "Οι υπη�εσίες σας",
+   "settings.recipes.all" : "Όλες οι υπη�εσίες",
+   "settings.recipes.dev" : "Ανάπτυξη",
+   "settings.recipes.headline" : "Διαθέσιμες υπη�εσίες",
+   "settings.recipes.missingService" : "Λείπει κάποια υπη�εσία;",
+   "settings.recipes.mostPopular" : "Τα πιο δημοφιλή",
+   "settings.recipes.nothingFound" : "Λυπο�μαστε αλλά καμία υπη�εσία δεν ται�ιάζει με τον ό�ο αναζήτησης.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Η υπη�εσία π�οστέθηκε με επιτυχία",
+   "settings.searchService" : "Αναζήτηση υπη�εσίας",
+   "settings.service.error.goBack" : "Επιστ�οφή στις υπη�εσίες",
+   "settings.service.error.headline" : "Σφάλμα",
+   "settings.service.error.message" : "Δεν ήταν δυνατή η φό�τωση της συνταγής υπη�εσίας.",
+   "settings.service.form.addServiceHeadline" : "Π�οσθήκη {name}",
+   "settings.service.form.availableServices" : "Διαθέσιμες υπη�εσίες",
+   "settings.service.form.customUrl" : "Π�οσα�μοσμένος διακομιστής",
+   "settings.service.form.customUrlPremiumInfo" : "Για να π�οσθέσετε υπη�εσίες που φιλοξενο�νται μόνος σας, χ�ειάζεστε έναν λογα�ιασμό υποστή�ιξης Premium Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Αναβάθμιση του λογα�ιασμο� σας",
+   "settings.service.form.customUrlValidationError" : "Δεν ήταν δυνατή η επικ��ωση του π�οσα�μοσμένου διακομιστή {name}.",
+   "settings.service.form.deleteButton" : "Διαγ�αφή υπη�εσίας",
+   "settings.service.form.editServiceHeadline" : "Επεξε�γασία {name}",
+   "settings.service.form.enableAudio" : "Ενε�γοποίηση ήχου",
+   "settings.service.form.enableBadge" : "Εμφάνιση εικονιδίων μη αναγνωσμένου μην�ματος",
+   "settings.service.form.enableNotification" : "Ενε�γοποίηση ειδοποιήσεων",
+   "settings.service.form.enableService" : "Ενε�γοποίηση υπη�εσίας",
+   "settings.service.form.headlineBadges" : "Εικονίδια μη αναγνωσμένου μην�ματος",
+   "settings.service.form.headlineGeneral" : "Γενικά",
+   "settings.service.form.headlineNotifications" : "Ειδοποιήσεις",
+   "settings.service.form.icon" : "Π�οσα�μοσμένο εικονίδιο",
+   "settings.service.form.iconDelete" : "Διαγ�αφή",
+   "settings.service.form.iconUpload" : "Σ��ετε την εικόνα σας, ή κάντε κλικ εδώ",
+   "settings.service.form.indirectMessageInfo" : "Θα ειδοποιηθείτε για όλα τα νέα μην�ματα σε ένα κανάλι, όχι μόνο @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Εμφάνιση ειδοποίησης μην�ματος για όλα τα νέα μην�ματα",
+   "settings.service.form.isMutedInfo" : "Όλοι οι ήχοι καθώς και η αναπα�αγωγή ήχου θα απενε�γοποιηθο�ν",
+   "settings.service.form.name" : "Όνομα",
+   "settings.service.form.saveButton" : "Αποθήκευση υπη�εσίας",
+   "settings.service.form.tabHosted" : "Φιλοξενείται",
+   "settings.service.form.tabOnPremise" : "Αυτο-φιλοξενείται ��",
+   "settings.service.form.team" : "Ομάδα",
+   "settings.service.form.useHostedService" : "Χ�ήση της φιλοξενο�μενης υπη�εσίας {name}",
+   "settings.service.form.yourServices" : "Οι υπη�εσίες σας",
+   "settings.services.deletedInfo" : "Η υπη�εσία έχει διαγ�αφεί",
+   "settings.services.discoverServices" : "Ανακαλ�ψτε υπη�εσίες",
+   "settings.services.headline" : "Οι υπη�εσίες σας",
+   "settings.services.noServicesAdded" : "Δεν έχετε π�οσθέσει ακόμα υπη�εσίες.",
+   "settings.services.tooltip.isDisabled" : "Η υπη�εσία είναι απενε�γοποιημένη",
+   "settings.services.tooltip.isMuted" : "Όλοι οι ήχοι είναι απενε�γοποιημένοι",
+   "settings.services.tooltip.notificationsDisabled" : "Οι ειδοποιήσεις είναι απενε�γοποιημένες",
+   "settings.services.updatedInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.user.form.accountType.company" : "Εται�εία",
+   "settings.user.form.accountType.individual" : "Ατομικός",
+   "settings.user.form.accountType.label" : "Τ�πος λογα�ιασμο�",
+   "settings.user.form.accountType.non-profit" : "Μη κε�δοσκοπικός",
+   "settings.user.form.currentPassword" : "Τ�έχων κωδικός π�όσβασης",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
-   "settings.user.form.newPassword" : "New password",
-   "sidebar.addNewService" : "Add new service",
-   "sidebar.mute" : "Disable audio",
-   "sidebar.settings" : "Settings",
-   "sidebar.unmute" : "Enable audio",
-   "signup.company.label" : "Company",
-   "signup.email.label" : "Email address",
-   "signup.emailDuplicate" : "A user with that email address already exists",
-   "signup.firstname.label" : "First Name",
-   "signup.headline" : "Sign up",
-   "signup.lastname.label" : "Last Name",
-   "signup.legal.info" : "By creating a Franz account you accept the",
-   "signup.legal.privacy" : "Privacy Statement",
-   "signup.legal.terms" : "Terms of service",
-   "signup.link.login" : "Already have an account, sign in?",
-   "signup.password.label" : "Password",
-   "signup.submit.label" : "Create account",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
-   "subscription.features.ads" : "No ads, ever!",
-   "subscription.features.comingSoon" : "coming soon",
-   "subscription.features.customServices" : "Private services for you and your team",
-   "subscription.features.encryptedSync" : "Encrypted session synchronization",
-   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
-   "subscription.features.vpn" : "Proxy & VPN support",
-   "subscription.includedFeatures" : "Paid Franz Premium Supporter Account includes",
-   "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "How does this work?",
-   "subscription.mining.line1" : "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5\/year.",
-   "subscription.mining.line2" : "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
-   "subscription.mining.line3" : "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
-   "subscription.mining.moreInformation" : "Get more information about this plan.",
-   "subscription.paymentSessionError" : "Could not initialize payment form",
-   "subscription.submit.label" : "I want to support the development of Franz",
-   "subscription.type.free" : "free",
-   "subscription.type.mining" : "Support Franz with processing power",
-   "subscription.type.month" : "month",
-   "subscription.type.year" : "year",
-   "subscriptionPopup.buttonCancel" : "Cancel",
-   "subscriptionPopup.buttonDone" : "Done",
-   "tabs.item.deleteService" : "Delete service",
-   "tabs.item.disableAudio" : "Disable audio",
-   "tabs.item.disableNotifications" : "Disable notifications",
-   "tabs.item.disableService" : "Disable service",
-   "tabs.item.edit" : "Edit",
-   "tabs.item.enableAudio" : "Enable audio",
-   "tabs.item.enableNotification" : "Enable notifications",
-   "tabs.item.enableService" : "Enable service",
-   "tabs.item.reload" : "Reload",
-   "welcome.loginButton" : "Login to your account",
-   "welcome.signupButton" : "Create a free account",
-   "welcome.slogan" : "Messaging that works for you"
+   "settings.user.form.firstname" : "Όνομα",
+   "settings.user.form.lastname" : "Επίθετο",
+   "settings.user.form.newPassword" : "�έος κωδικός π�όσβασης",
+   "sidebar.addNewService" : "Π�οσθήκη νέας υπη�εσίας",
+   "sidebar.muteApp" : "Απενε�γοποίηση ειδοποιήσεων & ήχου",
+   "sidebar.settings" : "Ρυθμίσεις",
+   "sidebar.unmuteApp" : "Ενε�γοποίηση ειδοποιήσεων & ήχου",
+   "signup.company.label" : "Εται�εία",
+   "signup.email.label" : "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου",
+   "signup.emailDuplicate" : "Ένας χ�ήστης με τη συγκεκ�ιμένη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου υπά�χει ήδη",
+   "signup.firstname.label" : "Όνομα",
+   "signup.headline" : "Εγγ�αφή",
+   "signup.lastname.label" : "Επίθετο",
+   "signup.legal.info" : "Δημιου�γώντας έναν λογα�ιασμό Franz αποδέχεστε τους",
+   "signup.legal.privacy" : "Δήλωση απο��ήτου",
+   "signup.legal.terms" : "Ό�οι υπη�εσίας",
+   "signup.link.login" : "Έχετε ήδη λογα�ιασμό? Συνδεθείτε.",
+   "signup.password.label" : "Κωδικός π�όσβασης",
+   "signup.submit.label" : "Δημιου�γία λογα�ιασμο�",
+   "subscription.euTaxInfo" : "Πολίτες Ε.Ε.: Στις τιμές δεν πε�ιλαμβάνονται τυχόν φό�οι και άλλες τοπικές επιβα��νσεις",
+   "subscription.features.ads" : "Τέλος στις διαφημίσεις",
+   "subscription.features.comingSoon" : "σ�ντομα",
+   "subscription.features.customServices" : "Ιδιωτικές υπη�εσίες για εσάς και την ομάδα σας",
+   "subscription.features.encryptedSync" : "Κ�υπτογ�αφημένος συγχ�ονισμός πε�ιόδου σ�νδεσης",
+   "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
+   "subscription.features.vpn" : "Υποστή�ιξη μεσολαβητή (Proxy) και VPN",
+   "subscription.includedFeatures" : "Ο Premium λογα�ιασμός υποστή�ιξης Franz πε�ιλαμβάνει",
+   "subscription.mining.experimental" : "πει�αματική",
+   "subscription.mining.headline" : "Πώς λειτου�γεί αυτό;",
+   "subscription.mining.line1" : "Το Franz χ�ησιμοποιεί πε�ίπου το 20-50% της CPU σας για να εξο��ξει το κ�υπτονόμισμα Monero που ισο�ται πε�ίπου με $ 5 \/ έτος.",
+   "subscription.mining.line2" : "Θα π�οσα�μόσουμε τη χ�ήση της CPU με βάση τη συμπε�ιφο�ά ε�γασίας σας ώστε να μην αποστ�αγγίσουμε την μπατα�ία σας και να επιβ�αδ�νουμε εσάς και το μηχάνημά σας.",
+   "subscription.mining.line3" : "Εφόσον ο Miner είναι ενε�γός, θα έχετε απε�ιό�ιστη π�όσβαση σε όλα τα χα�ακτη�ιστικά του Franz Premium Supporter.",
+   "subscription.mining.moreInformation" : "Λάβετε πε�ισσότε�ες πλη�οφο�ίες σχετικά με αυτό το πακέτο.",
+   "subscription.paymentSessionError" : "Δεν ήταν δυνατή η π�οετοιμασία της φό�μας πλη�ωμής",
+   "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
+   "subscription.type.free" : "δω�εάν",
+   "subscription.type.mining" : "Υποστή�ιξη Franz με ισχ� CPU",
+   "subscription.type.month" : "μήνας",
+   "subscription.type.year" : "έτος",
+   "subscriptionPopup.buttonCancel" : "Ακ��ωση",
+   "subscriptionPopup.buttonDone" : "Έγινε",
+   "tabs.item.deleteService" : "Διαγ�αφή υπη�εσίας",
+   "tabs.item.disableAudio" : "Απενε�γοποίηση ήχου",
+   "tabs.item.disableNotifications" : "Απενε�γοποίηση ειδοποιήσεων",
+   "tabs.item.disableService" : "Απενε�γοποίηση υπη�εσίας",
+   "tabs.item.edit" : "Επεξε�γασία",
+   "tabs.item.enableAudio" : "Ενε�γοποίηση ήχου",
+   "tabs.item.enableNotification" : "Ενε�γοποίηση ειδοποιήσεων",
+   "tabs.item.enableService" : "Ενε�γοποίηση υπη�εσίας",
+   "tabs.item.reload" : "Επαναφό�τωση",
+   "welcome.loginButton" : "Σ�νδεση στο λογα�ιασμό σας",
+   "welcome.signupButton" : "Δημιου�γία δω�εάν λογα�ιασμο�",
+   "welcome.slogan" : "Επικοινωνία που λειτου�γεί για εσάς"
 }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 8de5e5e02..7fc9eac1c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -39,7 +39,7 @@
   "import.headline": "Import your Franz 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Franz 5",
   "import.submit.label": "Import services",
-  "import.skip.label": "I want add services manually",
+  "import.skip.label": "I want to add services manually",
   "invite.submit.label": "Send invites",
   "invite.headline.friends": "Invite 3 of your friends or colleagues",
   "invite.name.label": "Name",
@@ -62,14 +62,16 @@
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "sidebar.settings": "Settings",
   "sidebar.addNewService": "Add new service",
-  "sidebar.mute": "Disable audio",
-  "sidebar.unmute": "Enable audio",
+  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.unmuteApp": "Enable notifications & audio",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
+  "settings.searchService": "Search service",
   "settings.account.headline": "Account",
   "settings.account.headlineSubscription": "Your subscription",
   "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
   "settings.account.headlineInvoices": "Invoices",
+  "settings.account.headlineDangerZone": "Danger Zone",
   "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
@@ -86,6 +88,9 @@
   "settings.account.mining.active": "You are right now performing {hashes} calculations per second.",
   "settings.account.mining.moreInformation": "Get more information",
   "settings.account.mining.cancel": "Cancel mining",
+  "settings.account.deleteAccount": "Delete account",
+  "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.navigation.availableServices": "Available services",
   "settings.navigation.yourServices": "Your services",
   "settings.navigation.account": "Account",
@@ -106,6 +111,7 @@
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.tabHosted": "Hosted",
   "settings.service.form.tabOnPremise": "Self hosted ��",
+  "settings.service.form.useHostedService": "Use the hosted {name} service.",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
@@ -113,11 +119,18 @@
   "settings.service.form.name": "Name",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.enableNotification": "Enable notifications",
+  "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.team": "Team",
   "settings.service.form.customUrl": "Custom server",
   "settings.service.form.indirectMessages": "Show message badge for all new messages",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
+  "settings.service.form.headlineNotifications": "Notifications",
+  "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineGeneral": "General",
+  "settings.service.form.icon": "Custom icon",
+  "settings.service.form.iconDelete": "Delete",
+  "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.error.headline": "Error",
   "settings.service.error.goBack": "Back to services",
   "settings.service.error.message": "Could not load service recipe.",
@@ -140,6 +153,9 @@
   "settings.app.updateStatusSearching": "Is searching for update",
   "settings.app.updateStatusAvailable": "Update available, downloading...",
   "settings.app.updateStatusUpToDate": "You are using the latest version of Franz",
+  "settings.app.subheadlineCache": "Cache",
+  "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.",
+  "settings.app.buttonClearAllCache": "Clear cache",
   "settings.app.form.autoLaunchOnStart": "Launch Franz on start",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.enableSystemTray": "Show Franz in system tray",
@@ -148,6 +164,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.enableSpellchecking": "Enable spell checking",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
+  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.beta": "Include beta versions",
   "settings.app.translationHelp": "Help us to translate Franz into your language.",
   "settings.app.currentVersion": "Current version:",
@@ -188,5 +205,5 @@
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}"    
+  "service.disabledHandler.action": "Enable {name}"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 5717a18b1..c4f598bd1 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,192 +1,209 @@
 {
-   "global.api.unhealthy" : "Can't connect to Franz online services",
-   "global.notConnectedToTheInternet" : "You are not connected to the internet.",
-   "import.headline" : "Import your Franz 4 services",
-   "import.notSupportedHeadline" : "Services not yet supported in Franz 5",
-   "import.skip.label" : "I want add services manually",
-   "import.submit.label" : "Import services",
-   "infobar.buttonChangelog" : "What is new?",
-   "infobar.buttonInstallUpdate" : "Restart & install update",
-   "infobar.buttonReloadServices" : "Reload services",
-   "infobar.requiredRequestsFailed" : "Could not load services and user information",
-   "infobar.servicesUpdated" : "Your services have been updated.",
-   "infobar.updateAvailable" : "A new update for Franz is available.",
-   "invite.email.label" : "Email address",
-   "invite.headline.friends" : "Invite 3 of your friends or colleagues",
-   "invite.name.label" : "Name",
-   "invite.skip.label" : "I want to do this later",
-   "invite.submit.label" : "Send invites",
-   "login.email.label" : "Email address",
-   "login.headline" : "Sign in",
-   "login.invalidCredentials" : "Email or password not valid",
-   "login.link.password" : "Reset password",
-   "login.link.signup" : "Create a free account",
-   "login.password.label" : "Password",
-   "login.serverLogout" : "Your session expired, please login again.",
-   "login.submit.label" : "Sign in",
-   "login.tokenExpired" : "Your session expired, please login again.",
-   "password.email.label" : "Email address",
-   "password.headline" : "Reset password",
-   "password.link.login" : "Sign in to your account",
-   "password.link.signup" : "Create a free account",
-   "password.noUser" : "No user with that email address was found",
-   "password.submit.label" : "Submit",
-   "password.successInfo" : "Please check your email",
-   "pricing.headline" : "Support Franz",
-   "pricing.link.skipPayment" : "I don't want to support the development of Franz.",
-   "pricing.submit.label" : "I want to support the development of Franz",
-   "pricing.support.label" : "Select your support plan",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
-   "services.getStarted" : "Get started",
-   "services.welcome" : "Welcome to Franz",
-   "settings.account.account.editButton" : "Edit account",
-   "settings.account.accountType.basic" : "Basic Account",
-   "settings.account.accountType.premium" : "Premium Supporter Account",
-   "settings.account.buttonSave" : "Update profile",
-   "settings.account.headline" : "Account",
-   "settings.account.headlineAccount" : "Account information",
-   "settings.account.headlineInvoices" : "Invoices",
-   "settings.account.headlinePassword" : "Change password",
-   "settings.account.headlineProfile" : "Update profile",
-   "settings.account.headlineSubscription" : "Your subscription",
-   "settings.account.headlineUpgrade" : "Upgrade your account & support Franz",
-   "settings.account.invoiceDownload" : "Download",
-   "settings.account.manageSubscription.label" : "Manage your subscription",
-   "settings.account.mining.active" : "You are right now performing {hashes} calculations per second.",
-   "settings.account.mining.cancel" : "Cancel mining",
-   "settings.account.mining.moreInformation" : "Get more information",
-   "settings.account.mining.thankyou" : "Thank you for supporting Franz with your processing power.",
-   "settings.account.successInfo" : "Your changes have been saved",
-   "settings.account.tryReloadUserInfoRequest" : "Try again",
-   "settings.account.userInfoRequestFailed" : "Could not load user information",
-   "settings.app.buttonInstallUpdate" : "Restart & install update",
-   "settings.app.buttonSearchForUpdate" : "Check for updates",
-   "settings.app.currentVersion" : "Current version:",
-   "settings.app.form.autoLaunchInBackground" : "Open in background",
-   "settings.app.form.autoLaunchOnStart" : "Launch Franz on start",
-   "settings.app.form.beta" : "Include beta versions",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
-   "settings.app.form.language" : "Language",
-   "settings.app.form.minimizeToSystemTray" : "Minimize Franz to system tray",
-   "settings.app.form.runInBackground" : "Keep Franz in background when closing the window",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
-   "settings.app.headline" : "Settings",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "global.api.unhealthy" : "No se puede conectar a los servicios en línea de Franz",
+   "global.notConnectedToTheInternet" : "No estás conectado a Internet.",
+   "import.headline" : "Importa tus servicios de Franz 4",
+   "import.notSupportedHeadline" : "Servicios no soportados aún en Franz 5",
+   "import.skip.label" : "Quiero agregar servicios manualmente",
+   "import.submit.label" : "Importar servicios",
+   "infobar.buttonChangelog" : "Qué hay de nuevo:",
+   "infobar.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
+   "infobar.buttonReloadServices" : "Recargar servicios",
+   "infobar.requiredRequestsFailed" : "No ha sido posible cargar servicios e información del usuario",
+   "infobar.servicesUpdated" : "Sus servicios han sido actualizados.",
+   "infobar.updateAvailable" : "Nueva actualización para Franz disponible.",
+   "invite.email.label" : "Correo electrónico",
+   "invite.headline.friends" : "Invita a 3 amigos o colegas",
+   "invite.name.label" : "Nombre",
+   "invite.skip.label" : "Haré esto más tarde",
+   "invite.submit.label" : "Enviar invitaciones",
+   "login.email.label" : "Correo electrónico",
+   "login.headline" : "Iniciar sesión",
+   "login.invalidCredentials" : "Correo electrónico o contraseña no válidos",
+   "login.link.password" : "Restablecer contraseña",
+   "login.link.signup" : "Crear cuenta gratuita",
+   "login.password.label" : "Contraseña",
+   "login.serverLogout" : "Su sesión ha expirado, por favor inicie sesión nuevamente.",
+   "login.submit.label" : "Acceder",
+   "login.tokenExpired" : "Su sesión ha expirado, por favor acceda de nuevo.",
+   "password.email.label" : "Correo electrónico",
+   "password.headline" : "Restablecer contraseña",
+   "password.link.login" : "Acceder a tu cuenta",
+   "password.link.signup" : "Crear cuenta gratuita",
+   "password.noUser" : "No se encontró ningún usuario con esa dirección de correo electrónico",
+   "password.submit.label" : "Enviar",
+   "password.successInfo" : "Por favor, revise su correo electrónico",
+   "pricing.headline" : "Apoya a Franz",
+   "pricing.link.skipPayment" : "No quiero apoyar el desarrollo de Franz.",
+   "pricing.submit.label" : "Quiero apoyar el desarrollo de Franz",
+   "pricing.support.label" : "Selecciona tu plan de soporte",
+   "service.crashHandler.action" : "Recargar {name}",
+   "service.crashHandler.autoReload" : "Intentando recuperar automáticamente {name} en {seconds} segundos",
+   "service.crashHandler.headline" : "¡Oh, no!",
+   "service.crashHandler.text" : "{name} ha causado un error.",
+   "service.disabledHandler.action" : "Activar {name}",
+   "service.disabledHandler.headline" : "{name} está desactivado",
+   "services.getStarted" : "Primeros pasos",
+   "services.welcome" : "Bienvenido a Franz",
+   "settings.account.account.editButton" : "Editar cuenta",
+   "settings.account.accountType.basic" : "Cuenta Básica",
+   "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
+   "settings.account.buttonSave" : "Actualizar perfil",
+   "settings.account.deleteAccount" : "Eliminar cuenta",
+   "settings.account.deleteEmailSent" : "Ha recibido un correo electrónico con el enlace para confirmar la eliminación de su cuenta. ¡Su cuenta y sus datos no podrán ser restaurados!",
+   "settings.account.deleteInfo" : "Si usted no necesita una cuenta de Franz, puede eliminarla junto a todos los datos aquí relacionados.",
+   "settings.account.headline" : "Cuenta",
+   "settings.account.headlineAccount" : "Información de la cuenta",
+   "settings.account.headlineDangerZone" : "Zona Peligrosa",
+   "settings.account.headlineInvoices" : "Facturas",
+   "settings.account.headlinePassword" : "Cambiar contraseña",
+   "settings.account.headlineProfile" : "Actualizar perfil",
+   "settings.account.headlineSubscription" : "Su suscripción",
+   "settings.account.headlineUpgrade" : "Actualice su cuenta y apoye a Franz",
+   "settings.account.invoiceDownload" : "Descargar",
+   "settings.account.manageSubscription.label" : "Administre su suscripción",
+   "settings.account.mining.active" : "Ahora mismo esta realizando {hashes} cálculos por segundo.",
+   "settings.account.mining.cancel" : "Cancelar minería",
+   "settings.account.mining.moreInformation" : "Obtener más información",
+   "settings.account.mining.thankyou" : "Gracias por apoyar a Franz con su potencia de procesamiento.",
+   "settings.account.successInfo" : "Sus cambios han sido guardados",
+   "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
+   "settings.account.userInfoRequestFailed" : "No ha sido posible cargar la información de usuario",
+   "settings.app.buttonClearAllCache" : "Limpiar caché",
+   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
+   "settings.app.buttonSearchForUpdate" : "Comprobar actualizaciones",
+   "settings.app.cacheInfo" : "El cache de Franz actualmente usa {size} de espacio en disco.",
+   "settings.app.currentVersion" : "Versión actual:",
+   "settings.app.form.autoLaunchInBackground" : "Abrir en segundo plano",
+   "settings.app.form.autoLaunchOnStart" : "Abrir Franz al iniciar",
+   "settings.app.form.beta" : "Incluir versiones beta",
+   "settings.app.form.enableSpellchecking" : "Activar la verificación ortográfica",
+   "settings.app.form.enableSystemTray" : "Mostrar Franz en la bandeja del sistema",
+   "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.headline" : "Configuración",
+   "settings.app.headlineAdvanced" : "Avanzado",
+   "settings.app.headlineAppearance" : "Apariencia",
    "settings.app.headlineGeneral" : "General",
-   "settings.app.headlineLanguage" : "Language",
-   "settings.app.headlineUpdates" : "Updates",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
-   "settings.app.updateStatusAvailable" : "Update available, downloading...",
-   "settings.app.updateStatusSearching" : "Is searching for update",
-   "settings.app.updateStatusUpToDate" : "You are using the latest version of Franz",
-   "settings.navigation.account" : "Account",
-   "settings.navigation.availableServices" : "Available services",
-   "settings.navigation.logout" : "Logout",
-   "settings.navigation.settings" : "Settings",
-   "settings.navigation.yourServices" : "Your services",
-   "settings.recipes.all" : "All services",
-   "settings.recipes.dev" : "Development",
-   "settings.recipes.headline" : "Available services",
-   "settings.recipes.missingService" : "Missing a service?",
-   "settings.recipes.mostPopular" : "Most popular",
-   "settings.recipes.nothingFound" : "Sorry, but no service matched your search term.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Service successfully added",
-   "settings.service.error.goBack" : "Back to services",
+   "settings.app.headlineLanguage" : "Idioma",
+   "settings.app.headlineUpdates" : "Actualizaciones",
+   "settings.app.restartRequired" : "Los cambios requieren reiniciar",
+   "settings.app.subheadlineCache" : "Caché",
+   "settings.app.translationHelp" : "Ayúdenos a traducir Franz a su idioma.",
+   "settings.app.updateStatusAvailable" : "Actualización disponible, descargando...",
+   "settings.app.updateStatusSearching" : "Buscando actualizaciones",
+   "settings.app.updateStatusUpToDate" : "Está utilizando la última versión de Franz",
+   "settings.navigation.account" : "Cuenta",
+   "settings.navigation.availableServices" : "Servicios disponibles",
+   "settings.navigation.logout" : "Cerrar sesión",
+   "settings.navigation.settings" : "Configuración",
+   "settings.navigation.yourServices" : "Sus servicios",
+   "settings.recipes.all" : "Todos los servicios",
+   "settings.recipes.dev" : "Desarrollo",
+   "settings.recipes.headline" : "Servicios disponibles",
+   "settings.recipes.missingService" : "¿Falta algún servicio?",
+   "settings.recipes.mostPopular" : "Más populares",
+   "settings.recipes.nothingFound" : "Lo siento, no se encuentra ningún servicio con tus condiciones de búsqueda.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Servicio añadido satisfactoriamente",
+   "settings.searchService" : "Buscar Servicio",
+   "settings.service.error.goBack" : "Volver a los servicios",
    "settings.service.error.headline" : "Error",
-   "settings.service.error.message" : "Could not load service recipe.",
-   "settings.service.form.addServiceHeadline" : "Add {name}",
-   "settings.service.form.availableServices" : "Available services",
-   "settings.service.form.customUrl" : "Custom server",
-   "settings.service.form.customUrlPremiumInfo" : "To add self hosted services, you need a Franz Premium Supporter Account.",
-   "settings.service.form.customUrlUpgradeAccount" : "Upgrade your account",
-   "settings.service.form.customUrlValidationError" : "Could not validate custom {name} server.",
-   "settings.service.form.deleteButton" : "Delete service",
-   "settings.service.form.editServiceHeadline" : "Edit {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
-   "settings.service.form.enableNotification" : "Enable notifications",
-   "settings.service.form.enableService" : "Enable service",
-   "settings.service.form.indirectMessageInfo" : "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-   "settings.service.form.indirectMessages" : "Show message badge for all new messages",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
-   "settings.service.form.name" : "Name",
-   "settings.service.form.saveButton" : "Save service",
-   "settings.service.form.tabHosted" : "Hosted",
-   "settings.service.form.tabOnPremise" : "Self hosted ��",
-   "settings.service.form.team" : "Team",
-   "settings.service.form.yourServices" : "Your services",
-   "settings.services.deletedInfo" : "Service has been deleted",
-   "settings.services.discoverServices" : "Discover services",
-   "settings.services.headline" : "Your services",
-   "settings.services.noServicesAdded" : "You haven't added any services yet.",
-   "settings.services.tooltip.isDisabled" : "Service is disabled",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
-   "settings.services.tooltip.notificationsDisabled" : "Notifications are disabled",
-   "settings.services.updatedInfo" : "Your changes have been saved",
-   "settings.user.form.accountType.company" : "Company",
-   "settings.user.form.accountType.individual" : "Individual",
-   "settings.user.form.accountType.label" : "Account type",
-   "settings.user.form.accountType.non-profit" : "Non-Profit",
-   "settings.user.form.currentPassword" : "Current password",
-   "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
-   "settings.user.form.newPassword" : "New password",
-   "sidebar.addNewService" : "Add new service",
-   "sidebar.mute" : "Disable audio",
-   "sidebar.settings" : "Settings",
-   "sidebar.unmute" : "Enable audio",
-   "signup.company.label" : "Company",
-   "signup.email.label" : "Email address",
-   "signup.emailDuplicate" : "A user with that email address already exists",
-   "signup.firstname.label" : "First Name",
-   "signup.headline" : "Sign up",
-   "signup.lastname.label" : "Last Name",
-   "signup.legal.info" : "By creating a Franz account you accept the",
-   "signup.legal.privacy" : "Privacy Statement",
-   "signup.legal.terms" : "Terms of service",
-   "signup.link.login" : "Already have an account, sign in?",
-   "signup.password.label" : "Password",
-   "signup.submit.label" : "Create account",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
-   "subscription.features.ads" : "No ads, ever!",
-   "subscription.features.comingSoon" : "coming soon",
-   "subscription.features.customServices" : "Private services for you and your team",
-   "subscription.features.encryptedSync" : "Encrypted session synchronization",
-   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
-   "subscription.features.vpn" : "Proxy & VPN support",
-   "subscription.includedFeatures" : "Paid Franz Premium Supporter Account includes",
+   "settings.service.error.message" : "No se puede cargar el servicio",
+   "settings.service.form.addServiceHeadline" : "Añadir {name}",
+   "settings.service.form.availableServices" : "Servicios disponibles",
+   "settings.service.form.customUrl" : "Servidor personalizado",
+   "settings.service.form.customUrlPremiumInfo" : "Para añadir tus propios servicios necesitas una Cuenta Colaborador Premium de Franz.",
+   "settings.service.form.customUrlUpgradeAccount" : "Asciende tu cuenta",
+   "settings.service.form.customUrlValidationError" : "No se pudo validar el servidor personalizado {name}.",
+   "settings.service.form.deleteButton" : "Eliminar servicio",
+   "settings.service.form.editServiceHeadline" : "Editar {name}",
+   "settings.service.form.enableAudio" : "Habilitar audio",
+   "settings.service.form.enableBadge" : "Mostrar insignia de mensajes no leídos",
+   "settings.service.form.enableNotification" : "Activar notificaciones",
+   "settings.service.form.enableService" : "Activar servicio",
+   "settings.service.form.headlineBadges" : "Insignias de mensaje no leídos",
+   "settings.service.form.headlineGeneral" : "General",
+   "settings.service.form.headlineNotifications" : "Notificaciones",
+   "settings.service.form.icon" : "Icono Personalizado",
+   "settings.service.form.iconDelete" : "Borrar",
+   "settings.service.form.iconUpload" : "Arrastra tu imagen o haz clic aquí",
+   "settings.service.form.indirectMessageInfo" : "Se le notificará de todos los mensajes del canal, no sólo @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Muestra etiqueta de notificación para todos los mensajes nuevos",
+   "settings.service.form.isMutedInfo" : "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio se silencian",
+   "settings.service.form.name" : "Nombre",
+   "settings.service.form.saveButton" : "Guardar servicio",
+   "settings.service.form.tabHosted" : "Alojado",
+   "settings.service.form.tabOnPremise" : "Auto alojado ��",
+   "settings.service.form.team" : "Equipo",
+   "settings.service.form.useHostedService" : "Use el servicio alojado {name}.",
+   "settings.service.form.yourServices" : "Tus servicios",
+   "settings.services.deletedInfo" : "El servicio ha sido borrado",
+   "settings.services.discoverServices" : "Descubrir servicios",
+   "settings.services.headline" : "Tus servicios",
+   "settings.services.noServicesAdded" : "No has añadido ningún servicio aún.",
+   "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",
+   "settings.services.updatedInfo" : "Tus cambios se han guardado",
+   "settings.user.form.accountType.company" : "Compañía",
+   "settings.user.form.accountType.individual" : "Personal",
+   "settings.user.form.accountType.label" : "Tipo de cuenta",
+   "settings.user.form.accountType.non-profit" : "Sin fines lucrativos",
+   "settings.user.form.currentPassword" : "Contraseña actual",
+   "settings.user.form.email" : "Correo electrónico",
+   "settings.user.form.firstname" : "Nombre",
+   "settings.user.form.lastname" : "Apellidos",
+   "settings.user.form.newPassword" : "Contraseña nueva",
+   "sidebar.addNewService" : "Añadir un nuevo servicio",
+   "sidebar.muteApp" : "Desactivar notificaciones y sonido",
+   "sidebar.settings" : "Configuración",
+   "sidebar.unmuteApp" : "Activar notificaciones y sonido",
+   "signup.company.label" : "Compañía",
+   "signup.email.label" : "Dirección de correo electrónico",
+   "signup.emailDuplicate" : "Ya existe un usuario con esa dirección de correo electrónico",
+   "signup.firstname.label" : "Nombre",
+   "signup.headline" : "Registrarse",
+   "signup.lastname.label" : "Apellidos",
+   "signup.legal.info" : "Al crear una cuenta en Franz usted acepta las",
+   "signup.legal.privacy" : "Declaración de privacidad",
+   "signup.legal.terms" : "Términos de servicio",
+   "signup.link.login" : "Ya tienes una cuenta, ¿Iniciar sesión?",
+   "signup.password.label" : "Contraseña",
+   "signup.submit.label" : "Crear cuenta",
+   "subscription.euTaxInfo" : "Residentes en la UE: pueden ser aplicados impuestos locales",
+   "subscription.features.ads" : "¡Sin publicidad, para siempre!",
+   "subscription.features.comingSoon" : "próximamente",
+   "subscription.features.customServices" : "Servicios privados para ti y tu equipo",
+   "subscription.features.encryptedSync" : "Sincronización de sesión encriptada",
+   "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
+   "subscription.features.vpn" : "Soporte para Proxy y VPN",
+   "subscription.includedFeatures" : "La Cuenta Colaborador Premium de Franz incluye",
    "subscription.mining.experimental" : "experimental",
-   "subscription.mining.headline" : "How does this work?",
-   "subscription.mining.line1" : "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5\/year.",
-   "subscription.mining.line2" : "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
-   "subscription.mining.line3" : "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
-   "subscription.mining.moreInformation" : "Get more information about this plan.",
-   "subscription.paymentSessionError" : "Could not initialize payment form",
-   "subscription.submit.label" : "I want to support the development of Franz",
-   "subscription.type.free" : "free",
-   "subscription.type.mining" : "Support Franz with processing power",
-   "subscription.type.month" : "month",
-   "subscription.type.year" : "year",
-   "subscriptionPopup.buttonCancel" : "Cancel",
-   "subscriptionPopup.buttonDone" : "Done",
-   "tabs.item.deleteService" : "Delete service",
-   "tabs.item.disableAudio" : "Disable audio",
-   "tabs.item.disableNotifications" : "Disable notifications",
-   "tabs.item.disableService" : "Disable service",
-   "tabs.item.edit" : "Edit",
-   "tabs.item.enableAudio" : "Enable audio",
-   "tabs.item.enableNotification" : "Enable notifications",
-   "tabs.item.enableService" : "Enable service",
-   "tabs.item.reload" : "Reload",
-   "welcome.loginButton" : "Login to your account",
-   "welcome.signupButton" : "Create a free account",
-   "welcome.slogan" : "Messaging that works for you"
+   "subscription.mining.headline" : "¿Cómo funciona?",
+   "subscription.mining.line1" : "Al habilitar \"Soporte con poder de procesamiento\", Franz usará aproximadamente 20-50% de su CPU para extraer la criptomoneda Monero, lo que equivale a aproximadamente 5 $\/año.",
+   "subscription.mining.line2" : "Adaptaremos el uso de la CPU en función de su comportamiento de trabajo para no agotar la batería y evitar que tu equipo vaya más lento.",
+   "subscription.mining.line3" : "Mientras el sistema de minado se encuentre activo, podrá tener acceso ilimitado a todas las Características del Colaborador Premium de Franz.",
+   "subscription.mining.moreInformation" : "Obtén más información sobre este plan.",
+   "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
+   "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
+   "subscription.type.free" : "gratis",
+   "subscription.type.mining" : "Ayuda a Franz con potencia de procesamiento",
+   "subscription.type.month" : "mes",
+   "subscription.type.year" : "año",
+   "subscriptionPopup.buttonCancel" : "Cancelar",
+   "subscriptionPopup.buttonDone" : "Listo",
+   "tabs.item.deleteService" : "Borrar servicio",
+   "tabs.item.disableAudio" : "Desactivar sonido",
+   "tabs.item.disableNotifications" : "Desactivar notificaciones",
+   "tabs.item.disableService" : "Desactivar servicio",
+   "tabs.item.edit" : "Editar",
+   "tabs.item.enableAudio" : "Activar sonido",
+   "tabs.item.enableNotification" : "Activar notificaciones",
+   "tabs.item.enableService" : "Activar servicio",
+   "tabs.item.reload" : "Recargar",
+   "welcome.loginButton" : "Accede a tu cuenta",
+   "welcome.signupButton" : "Crear una cuenta gratuita",
+   "welcome.slogan" : "Mensajería que funciona para ti"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index d54d7c34e..4a06975bb 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,18 +1,18 @@
 {
-   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
-   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
-   "import.headline" : "Importez vos services depuis Franz 4",
-   "import.notSupportedHeadline" : "Services non supportés actuellement dans Franz 5",
+   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz.",
+   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté(e) à Internet.",
+   "import.headline" : "Importez vos services depuis la version 4 de Franz.",
+   "import.notSupportedHeadline" : "Ces services ne sont pas encore supportés par Franz 5",
    "import.skip.label" : "Je veux ajouter des services manuellement",
    "import.submit.label" : "Importer des services",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Nouveautés",
    "infobar.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
    "infobar.buttonReloadServices" : "Recharger les services",
-   "infobar.requiredRequestsFailed" : "Impossible de charger les services et les informations de l'utilisateur",
+   "infobar.requiredRequestsFailed" : "Impossible d'accéder aux services et informations de l'utilisateur",
    "infobar.servicesUpdated" : "Vos services ont été mis à jour.",
-   "infobar.updateAvailable" : "Une nouvelle mise à jour est disponible pour Franz.",
+   "infobar.updateAvailable" : "Une nouvelle mise à jour pour Franz est disponible.",
    "invite.email.label" : "Adresse e-mail",
-   "invite.headline.friends" : "Invitez 3 de vos amis ou collègues",
+   "invite.headline.friends" : "Invitez 3 amis ou collègues",
    "invite.name.label" : "Nom",
    "invite.skip.label" : "Je veux faire cela plus tard",
    "invite.submit.label" : "Envoyer des invitations",
@@ -20,41 +20,45 @@
    "login.headline" : "S'inscrire",
    "login.invalidCredentials" : "E-mail ou mot de passe invalide",
    "login.link.password" : "Réinitialiser le mot de passe",
-   "login.link.signup" : "Créer un compte gratuitement",
+   "login.link.signup" : "Créer un compte gratuit",
    "login.password.label" : "Mot de passe",
-   "login.serverLogout" : "Votre session a expiré, veuillez vous reconnecter.",
-   "login.submit.label" : "Se connecter",
+   "login.serverLogout" : "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
+   "login.submit.label" : "Connexion",
    "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
    "password.email.label" : "Adresse e-mail",
    "password.headline" : "Réinitialiser le mot de passe",
    "password.link.login" : "Connectez-vous à votre compte",
-   "password.link.signup" : "Créer un compte gratuitement",
-   "password.noUser" : "Aucun utilisateur avec cette adresse e-mail n'a été trouvé",
+   "password.link.signup" : "Créer un compte gratuit.",
+   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail ",
    "password.submit.label" : "Soumettre",
    "password.successInfo" : "Merci de consulter vos e-mails",
-   "pricing.headline" : "Supportez Franz",
+   "pricing.headline" : "Soutenez Franz",
    "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
    "pricing.submit.label" : "Je veux soutenir le développement de Franz",
    "pricing.support.label" : "Sélectionnez votre plan de soutien",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Recharger {name}",
+   "service.crashHandler.autoReload" : "Tentative de restauration automatique de {name} dans {seconds} secondes",
+   "service.crashHandler.headline" : "Oh non !",
+   "service.crashHandler.text" : "{name} a causé une erreur.",
+   "service.disabledHandler.action" : "Activer {name}",
+   "service.disabledHandler.headline" : "{name} est désactivé",
    "services.getStarted" : "Commencer",
-   "services.welcome" : "Bienvenue sur Franz",
+   "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
-   "settings.account.accountType.basic" : "Compte basique",
-   "settings.account.accountType.premium" : "Compte Supporter Premium",
+   "settings.account.accountType.basic" : "Compte de base",
+   "settings.account.accountType.premium" : "Compte supporteur premium",
    "settings.account.buttonSave" : "Mettre à jour le profil",
+   "settings.account.deleteAccount" : "Supprimer le compte",
+   "settings.account.deleteEmailSent" : "Vous avez reçu un email contenant le lien pour confirmer la suppression de votre compte. Votre compte et les données qui lui sont associés ne pourront être récupérés",
+   "settings.account.deleteInfo" : "Si vous n'avez plus besoin de votre compte Franz, vous pouvez le supprimer avec toutes ses données associées.",
    "settings.account.headline" : "Compte",
-   "settings.account.headlineAccount" : "Informations de compte",
+   "settings.account.headlineAccount" : "Informations sur le compte",
+   "settings.account.headlineDangerZone" : "Zone Dangereuse !",
    "settings.account.headlineInvoices" : "Factures",
    "settings.account.headlinePassword" : "Changer le mot de passe",
    "settings.account.headlineProfile" : "Mettre à jour le profil",
    "settings.account.headlineSubscription" : "Votre abonnement",
-   "settings.account.headlineUpgrade" : "Améliorez votre compte et supportez Franz",
+   "settings.account.headlineUpgrade" : "Améliorez votre compte et soutenez Franz",
    "settings.account.invoiceDownload" : "Télécharger",
    "settings.account.manageSubscription.label" : "Gérer votre abonnement",
    "settings.account.mining.active" : "Vous êtes en train d'effectuer {hashes} calculs par seconde.",
@@ -64,28 +68,32 @@
    "settings.account.successInfo" : "Vos modifications ont été enregistrées",
    "settings.account.tryReloadUserInfoRequest" : "Réessayer",
    "settings.account.userInfoRequestFailed" : "Impossible de charger les informations de l'utilisateur",
+   "settings.app.buttonClearAllCache" : "Vider le cache",
    "settings.app.buttonInstallUpdate" : "Redémarrer et installer la mise à jour",
    "settings.app.buttonSearchForUpdate" : "Vérifier les mises à jour",
-   "settings.app.currentVersion" : "Version actuelle:",
+   "settings.app.cacheInfo" : "Le cache de Franz occupe actuellement {size} en espace disque.",
+   "settings.app.currentVersion" : "Version actuelle :",
    "settings.app.form.autoLaunchInBackground" : "Ouvrir en arrière-plan",
    "settings.app.form.autoLaunchOnStart" : "Lancer Franz au démarrage",
-   "settings.app.form.beta" : "Inclure les versions bêta",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.beta" : "Accepter les versions bêta",
+   "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.language" : "Langue",
    "settings.app.form.minimizeToSystemTray" : "Minimiser Franz dans la zone de notification",
-   "settings.app.form.runInBackground" : "Ouvrir en arrière-plan",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "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.headline" : "Paramètres",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Paramètres avancés",
+   "settings.app.headlineAppearance" : "Apparence",
    "settings.app.headlineGeneral" : "Général",
    "settings.app.headlineLanguage" : "Langue",
    "settings.app.headlineUpdates" : "Mises à jour",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
-   "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement...",
-   "settings.app.updateStatusSearching" : "Recherche des mises à jour",
+   "settings.app.restartRequired" : "Les modifications nécessitent un redémarrage",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Aidez-nous à traduire Franz dans votre langue.",
+   "settings.app.updateStatusAvailable" : "Mise à jour disponible, téléchargement en cours...",
+   "settings.app.updateStatusSearching" : "Recherche d'une mise à jour",
    "settings.app.updateStatusUpToDate" : "Vous utilisez la dernière version de Franz",
    "settings.navigation.account" : "Compte",
    "settings.navigation.availableServices" : "Services disponibles",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Tous les services",
    "settings.recipes.dev" : "Développement",
    "settings.recipes.headline" : "Services disponibles",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Un service est manquant ?",
    "settings.recipes.mostPopular" : "Les plus populaires",
    "settings.recipes.nothingFound" : "Désolé, aucun service ne correspond à votre recherche.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Service ajouté avec succès",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Le service a été ajouté avec succès",
+   "settings.searchService" : "Chercher un service",
    "settings.service.error.goBack" : "Retour aux services",
    "settings.service.error.headline" : "Erreur",
    "settings.service.error.message" : "Impossible de charger le service.",
@@ -107,65 +116,73 @@
    "settings.service.form.customUrl" : "Serveur personnalisé",
    "settings.service.form.customUrlPremiumInfo" : "Pour ajouter des services auto-hébergés, vous avez besoin d'un compte Supporter Premium Franz.",
    "settings.service.form.customUrlUpgradeAccount" : "Améliorez votre compte",
-   "settings.service.form.customUrlValidationError" : "Impossible de valider le {name} personnalisé du serveur.",
+   "settings.service.form.customUrlValidationError" : "Impossible de valider le serveur personnalisé {name}.",
    "settings.service.form.deleteButton" : "Supprimer le service",
    "settings.service.form.editServiceHeadline" : "Modifier {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Activer l'audio",
+   "settings.service.form.enableBadge" : "Afficher le badge des messages non lus",
    "settings.service.form.enableNotification" : "Activer les notifications",
    "settings.service.form.enableService" : "Activer le service",
-   "settings.service.form.indirectMessageInfo" : "Vous serez averti de tous les nouveaux messages dans un salon, pas seulement @username, @channel, @here, ...",
+   "settings.service.form.headlineBadges" : "Badge des messages non lus",
+   "settings.service.form.headlineGeneral" : "Général",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Icône personnalisée",
+   "settings.service.form.iconDelete" : "Supprimer",
+   "settings.service.form.iconUpload" : "Déposez votre image, ou cliquez ici",
+   "settings.service.form.indirectMessageInfo" : "Vous serez averti de tous les nouveaux messages en ligne, pas seulement sur @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
    "settings.service.form.name" : "Nom",
    "settings.service.form.saveButton" : "Enregistrer le service",
    "settings.service.form.tabHosted" : "Hébergé",
    "settings.service.form.tabOnPremise" : "Auto-hébergé ��",
    "settings.service.form.team" : "Équipe",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Vos services",
    "settings.services.deletedInfo" : "Le service a été supprimé",
-   "settings.services.discoverServices" : "Découvrir des services",
+   "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.tooltip.isDisabled" : "Le service est désactivé",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
-   "settings.services.tooltip.notificationsDisabled" : "Les notifications sont désactivées",
+   "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.",
    "settings.services.updatedInfo" : "Vos modifications ont été enregistrées",
    "settings.user.form.accountType.company" : "Entreprise",
    "settings.user.form.accountType.individual" : "Individuel",
    "settings.user.form.accountType.label" : "Type de compte",
-   "settings.user.form.accountType.non-profit" : "Non lucratif",
+   "settings.user.form.accountType.non-profit" : "Non-lucratif",
    "settings.user.form.currentPassword" : "Mot de passe actuel",
    "settings.user.form.email" : "E-mail",
    "settings.user.form.firstname" : "Prénom",
    "settings.user.form.lastname" : "Nom",
    "settings.user.form.newPassword" : "Nouveau mot de passe",
    "sidebar.addNewService" : "Ajouter un nouveau service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Désactiver les notifications et les sons",
    "sidebar.settings" : "Paramètres",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Activer les notifications et les sons",
    "signup.company.label" : "Entreprise",
    "signup.email.label" : "Adresse e-mail",
-   "signup.emailDuplicate" : "Un utilisateur avec cette adresse e-mail existe déjà",
+   "signup.emailDuplicate" : "Cette adresse e-mail est déjà utilisée",
    "signup.firstname.label" : "Prénom",
    "signup.headline" : "S'inscrire",
    "signup.lastname.label" : "Nom",
-   "signup.legal.info" : "En créant un compte Franz, vous acceptez les",
+   "signup.legal.info" : "En créant un compte Franz, vous acceptez la",
    "signup.legal.privacy" : "Déclaration de confidentialité",
    "signup.legal.terms" : "Conditions d'utilisation",
-   "signup.link.login" : "Vous possédez déjà un compte ? Connectez-vous",
+   "signup.link.login" : "Vous avez déjà un compte ? Connectez-vous",
    "signup.password.label" : "Mot de passe",
    "signup.submit.label" : "Créer un compte",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
-   "subscription.features.ads" : "Aucune publicité!",
-   "subscription.features.comingSoon" : "arrive bientôt",
-   "subscription.features.customServices" : "Des services privés pour vous et votre équipe",
-   "subscription.features.encryptedSync" : "Synchronisation de session chiffrée",
-   "subscription.features.onpremise" : "Add on-premise\/hosted services like HipChat",
+   "subscription.euTaxInfo" : "Résidents de l'UE : une taxe locale peut s'appliquer",
+   "subscription.features.ads" : "No ads, ever!",
+   "subscription.features.comingSoon" : "coming soon",
+   "subscription.features.customServices" : "Private services for you and your team",
+   "subscription.features.encryptedSync" : "Encrypted session synchronization",
+   "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.vpn" : "Support des Proxy et VPN",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
    "subscription.mining.experimental" : "expérimental",
-   "subscription.mining.headline" : "Comment cela fonctionne-t-il?",
-   "subscription.mining.line1" : "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera environ de 20 à 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$\/an.",
+   "subscription.mining.headline" : "Comment ça marche ?",
+   "subscription.mining.line1" : "En activant \"Soutenez Franz avec de la puissance de calcul\", Franz utilisera entre 20 et 50% de votre CPU pour miner la crypto-monnaie Monero, ce qui équivaut à environ 5$\/an.",
    "subscription.mining.line2" : "Nous adapterons l'utilisation du processeur en fonction de vos habitudes de travail pour ne pas vider votre batterie et ne pas ralentir votre machine.",
    "subscription.mining.line3" : "Tant que le minage est actif, vous aurez un accès illimité à toutes les fonctionnalités Supporter Premium Franz.",
    "subscription.mining.moreInformation" : "Obtenir plus d'informations.",
@@ -178,15 +195,15 @@
    "subscriptionPopup.buttonCancel" : "Annuler",
    "subscriptionPopup.buttonDone" : "Terminé",
    "tabs.item.deleteService" : "Supprimer le service",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Désactiver l'audio",
    "tabs.item.disableNotifications" : "Désactiver les notifications",
    "tabs.item.disableService" : "Désactiver le service",
    "tabs.item.edit" : "Modifier",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Activer l'audio",
    "tabs.item.enableNotification" : "Activer les notifications",
    "tabs.item.enableService" : "Activer le service",
    "tabs.item.reload" : "Recharger",
    "welcome.loginButton" : "Connectez-vous à votre compte",
-   "welcome.signupButton" : "Créer un compte gratuitement",
+   "welcome.signupButton" : "Créer un compte gratuit",
    "welcome.slogan" : "Une messagerie qui fonctionne pour vous"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 63816cf65..f1a03612d 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,21 +1,21 @@
 {
-   "global.api.unhealthy" : "Ní fhéadfar nascadh le seirbhísí arlíne Franz",
+   "global.api.unhealthy" : "Ní féidir le Franz nascadh le seirbhísí ar líne",
    "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
-   "import.headline" : "Iompórtáil do chuid seirbhísí Franz 4",
-   "import.notSupportedHeadline" : "Níl na seirbhísí seo taca i Franz 5 go fóill",
-   "import.skip.label" : "Ba mhaith liom seirbhísí a chur leis de láimh",
-   "import.submit.label" : "Iomportaigh seirbhísí",
-   "infobar.buttonChangelog" : "What is new?",
-   "infobar.buttonInstallUpdate" : "Atosaigh & suiteáil nuashonrú",
+   "import.headline" : "Iompórtáil do chuid seirbhísí ó Franz 4",
+   "import.notSupportedHeadline" : "Níl na seirbhísí seo faoi thacaíocht le Franz 5 go fóill",
+   "import.skip.label" : "Ba mhaith liom seirbhísí a chur de láimh",
+   "import.submit.label" : "Iompórtáil seirbhísí",
+   "infobar.buttonChangelog" : "Cad atá nua?",
+   "infobar.buttonInstallUpdate" : "Atosaigh � suiteáil nuashonrú",
    "infobar.buttonReloadServices" : "Athlódáil seirbhísí",
-   "infobar.requiredRequestsFailed" : "Ní fhéadfar seirbhísí agus eolas úsáideora a lódáil",
-   "infobar.servicesUpdated" : "Nuashonraítear do chuid seirbhísí.",
-   "infobar.updateAvailable" : "Tá nuashonrú nua do Franz le fáil.",
+   "infobar.requiredRequestsFailed" : "Ní féidir le Franz seirbhísí agus eolas úsáideora a lódáil",
+   "infobar.servicesUpdated" : "Nuashonraíodh do chuid seirbhísí.",
+   "infobar.updateAvailable" : "Tá nuashonrú nua ar fáil do Franz.",
    "invite.email.label" : "Seoladh ríomhphoist",
-   "invite.headline.friends" : "Tabhair cuireadh do thriúr de do chairde nó chomhghleacaithe",
+   "invite.headline.friends" : "Tabhair cuireadh do thriúr chara nó chomhghleacaí",
    "invite.name.label" : "Ainm",
    "invite.skip.label" : "Ba mhaith liom é seo a dhéanamh níos deireanaí",
-   "invite.submit.label" : "Seol cuireadh",
+   "invite.submit.label" : "Seol cuirí",
    "login.email.label" : "Seoladh ríomhphoist",
    "login.headline" : "Logáil isteach",
    "login.invalidCredentials" : "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
@@ -27,29 +27,33 @@
    "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
    "password.email.label" : "Seoladh ríomhphoist",
    "password.headline" : "Athshocraigh pasfhocal",
-   "password.link.login" : "Logáil isteach i do chúntas",
+   "password.link.login" : "Logáil isteach do do chúntas",
    "password.link.signup" : "Cruthaigh cuntas saor in aisce",
    "password.noUser" : "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
    "password.submit.label" : "Cuir isteach",
    "password.successInfo" : "Seiceáil do chuid ríomhphoist, le do thoil",
    "pricing.headline" : "Tabhair tacaíocht do Franz",
    "pricing.link.skipPayment" : "Ní mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
-   "pricing.submit.label" : "Ba maith liom tacaíocht a thabhairt d'fhorbairt Franz.",
+   "pricing.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz.",
    "pricing.support.label" : "Roghnaigh do phlean tacaíochta",
    "service.crashHandler.action" : "Athlódáil {name}",
    "service.crashHandler.autoReload" : "Ag baint triail {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
-   "service.crashHandler.headline" : "Ó, ná habair!",
+   "service.crashHandler.headline" : "Oró, ní hea!",
    "service.crashHandler.text" : "Tá {name} tar éis earraid a dhéanamh.",
    "service.disabledHandler.action" : "Cumasaigh {name}",
    "service.disabledHandler.headline" : "Tá {name} díchumasaithe",
-   "services.getStarted" : "Tosaigh",
+   "services.getStarted" : "Cuir tús",
    "services.welcome" : "Fáilte go Franz",
    "settings.account.account.editButton" : "Cuir cuntas in eagar",
    "settings.account.accountType.basic" : "Bunchuntas",
    "settings.account.accountType.premium" : "Cuntas Phŕeimhtacadóra Franz",
    "settings.account.buttonSave" : "Nuashonraigh próifíl",
+   "settings.account.deleteAccount" : "Scrios cuntas",
+   "settings.account.deleteEmailSent" : "Fuair tú ríomhphost a fháil le nasc a dheimhnóidh scriosadh do chuntais. Ní feidir leat do chuntas agus do chuid sonraí a thabhairt ar ais!",
+   "settings.account.deleteInfo" : "Más rud é nár ghá duit cuntas Franz a bheith agat a thuilleadh, is féidir leat do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
    "settings.account.headline" : "Cuntas",
-   "settings.account.headlineAccount" : "Eolas an chuntais",
+   "settings.account.headlineAccount" : "Eolas faoin gcuntas",
+   "settings.account.headlineDangerZone" : "Scrios cuntas",
    "settings.account.headlineInvoices" : "Sonraisc",
    "settings.account.headlinePassword" : "Athraigh pasfhocal",
    "settings.account.headlineProfile" : "Nuashonraigh próifíl",
@@ -58,81 +62,94 @@
    "settings.account.invoiceDownload" : "�oslódáil",
    "settings.account.manageSubscription.label" : "Bainistigh do shintiús",
    "settings.account.mining.active" : "Tá tú ag déanamh {hashes} áireamh in aghaidh an soicind anois.",
-   "settings.account.mining.cancel" : "Cuir an mhíneáil ar ceal",
+   "settings.account.mining.cancel" : "Cuir míneáil ar ceal",
    "settings.account.mining.moreInformation" : "Faigh tuilleadh eolais",
    "settings.account.mining.thankyou" : "Go raibh maith agat as ucht tacaíocht a thabhairt go Franz le do chumhacht phróiseála.",
    "settings.account.successInfo" : "Sábhailtear do chuid athruithe",
    "settings.account.tryReloadUserInfoRequest" : "Atriail",
-   "settings.account.userInfoRequestFailed" : "Ní fheadfar eolas úsáideora a lódáil",
-   "settings.app.buttonInstallUpdate" : "Atosaigh & suiteáil nuashonrú",
-   "settings.app.buttonSearchForUpdate" : "Seiceáil do nuashonruithe",
+   "settings.account.userInfoRequestFailed" : "Ní féidir eolas úsáideora a lódáil",
+   "settings.app.buttonClearAllCache" : "Glan taisce",
+   "settings.app.buttonInstallUpdate" : "Atosaigh � suiteáil nuashonrú",
+   "settings.app.buttonSearchForUpdate" : "Cinntigh le haghaidh nuashonruithe",
+   "settings.app.cacheInfo" : "Tá taisce Franz ag baint úsáid as {size} de chuid an spáis diosca.",
    "settings.app.currentVersion" : "Leagan reatha:",
    "settings.app.form.autoLaunchInBackground" : "Oscail sa chúlra",
    "settings.app.form.autoLaunchOnStart" : "Láinseáil Franz ón tús",
    "settings.app.form.beta" : "Cuir leagain béite san áireamh",
    "settings.app.form.enableSpellchecking" : "Cumasaigh seiceáil litrithe",
-   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtrae an chórais",
+   "settings.app.form.enableSystemTray" : "Taispeáin Franz i dtráidire an chórais",
    "settings.app.form.language" : "Teanga",
-   "settings.app.form.minimizeToSystemTray" : "�oslaghdaigh Franz go dtí trae an chórais",
+   "settings.app.form.minimizeToSystemTray" : "�oslaghdaigh Franz go dtí tráidire an chórais",
    "settings.app.form.runInBackground" : "Cóimeád Franz sa chúlra agus an fhuinneog a dhúnadh",
-   "settings.app.form.showDisabledServices" : "Taispeáin tabanna do sheirbhísí díchumasaithe",
+   "settings.app.form.showDisabledServices" : "Taispeáin tabanna sheirbhísí dhíchumasaithe",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Taispeáin teachtaireachtaí neamhléite agus fógraí díchumasaithe",
    "settings.app.headline" : "Socruithe",
    "settings.app.headlineAdvanced" : "Casta",
    "settings.app.headlineAppearance" : "Dealramh",
    "settings.app.headlineGeneral" : "Ginearálta",
    "settings.app.headlineLanguage" : "Teanga",
    "settings.app.headlineUpdates" : "Nuashonruithe",
-   "settings.app.restartRequired" : "Ní gá tosú arís chun athruithe a chur i bhfeidhm",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
-   "settings.app.updateStatusAvailable" : "Nuashonrú le fáil, ag íoslódáil",
+   "settings.app.restartRequired" : "Ní gá duit tosnú arís chun athruithe a chur i bhfeidhm",
+   "settings.app.subheadlineCache" : "Taisce",
+   "settings.app.translationHelp" : "Cabhraigh linn, Franz a aistriú do do theanga.",
+   "settings.app.updateStatusAvailable" : "Nuashonrú ar fáil, á íoslódáil...",
    "settings.app.updateStatusSearching" : "Ag cuardú le haghaidh nuashonrú",
-   "settings.app.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagn is deireanaí de Franz",
+   "settings.app.updateStatusUpToDate" : "Tá tú ag baint úsáid as an leagan is deireanaí de Franz",
    "settings.navigation.account" : "Cuntas",
-   "settings.navigation.availableServices" : "Seirbhísí le fáil",
+   "settings.navigation.availableServices" : "Seirbhísí ar fáil",
    "settings.navigation.logout" : "Logáil amach",
    "settings.navigation.settings" : "Socruithe",
    "settings.navigation.yourServices" : "Do chuid seirbhísí",
    "settings.recipes.all" : "Gach seirbhís",
    "settings.recipes.dev" : "Forbairt",
-   "settings.recipes.headline" : "Seirbhísí le fáil",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.headline" : "Seirbhísí ar fáil",
+   "settings.recipes.missingService" : "Seirbhís ar iarraidh?",
    "settings.recipes.mostPopular" : "Is coitianta",
    "settings.recipes.nothingFound" : "Tá brón orm, ach níl seirbhís ar bith ag teacht le do théarma chuardach.",
-   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha leis go ráthúil",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Seirbhís curtha go ráthúil",
+   "settings.searchService" : "Cuardaigh seirbhís",
    "settings.service.error.goBack" : "Ar ais go dtí seirbhísí",
-   "settings.service.error.headline" : "Earraid",
-   "settings.service.error.message" : "Ní fhéadfar oideas seirbhíse a lódáil.",
+   "settings.service.error.headline" : "Earráid",
+   "settings.service.error.message" : "Ní féidir le oidis seirbhíse a lódáil.",
    "settings.service.form.addServiceHeadline" : "Cuir {name} leis",
    "settings.service.form.availableServices" : "Seirbhísí le fáil",
-   "settings.service.form.customUrl" : "Freastalaí saincheaptha",
-   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur leis, ní gá Cuntas Phŕeimhtacadóra Franz a bheith agat.",
+   "settings.service.form.customUrl" : "Freastalaí shaincheaptha",
+   "settings.service.form.customUrlPremiumInfo" : "Chun seirbhísí féinóstáilte a chur le Franz, ní gá Cuntas Phŕeimhtacadóra Franz a bheith agat.",
    "settings.service.form.customUrlUpgradeAccount" : "Uasghrádaigh do chuntas",
-   "settings.service.form.customUrlValidationError" : "Ní fhéadfar seirbhís {name} saincheaptha a dheimhniú",
+   "settings.service.form.customUrlValidationError" : "Ní féidir le seirbhís {name} saincheaptha a dheimhniú",
    "settings.service.form.deleteButton" : "Scrios seirbhís",
    "settings.service.form.editServiceHeadline" : "Cuir {name} in eagar",
    "settings.service.form.enableAudio" : "Cumasaigh fuaim",
+   "settings.service.form.enableBadge" : "Taispeáin comharthaí do theachtaireachtaí neamhléite",
    "settings.service.form.enableNotification" : "Cumasaigh fógraí",
    "settings.service.form.enableService" : "Cumasaigh seirbhís",
-   "settings.service.form.indirectMessageInfo" : "Fógraítear thú faoi gach teachtaireacht nua i gcainéail, ní amháin @username, @channel, @here, ...",
+   "settings.service.form.headlineBadges" : "Comharthaí do theachtaireachtaí neamhléite",
+   "settings.service.form.headlineGeneral" : "Ginearálta",
+   "settings.service.form.headlineNotifications" : "Fógraí",
+   "settings.service.form.icon" : "Deilbhín saincheaptha",
+   "settings.service.form.iconDelete" : "Scrios",
+   "settings.service.form.iconUpload" : "Scaoil d'íomhá, nó cliceáil anseo",
+   "settings.service.form.indirectMessageInfo" : "Gheobhaidh tú fógraí faoi gach teachtaireacht nua i mbealach, ní amháin @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Taispeáin comhartha theachtaireachta do theachtaireachtaí nua",
-   "settings.service.form.isMutedInfo" : "Nuair a dhíchumasaítear é seo, tachtar gach fuaim fógraí agus athchasadh fuaime",
+   "settings.service.form.isMutedInfo" : "Tar éis é a dhíchumasú, tachtar gach fuaim fógraí agus athchasadh fuaime",
    "settings.service.form.name" : "Ainm",
    "settings.service.form.saveButton" : "Sábhail seirbhís",
    "settings.service.form.tabHosted" : "Óstáilte",
    "settings.service.form.tabOnPremise" : "Féinóstáilte ��",
-   "settings.service.form.team" : "Meitheal",
+   "settings.service.form.team" : "Foireann",
+   "settings.service.form.useHostedService" : "Bain úsáis as an seirbhís óstáilte {name}.",
    "settings.service.form.yourServices" : "Do chuid seirbhísí",
    "settings.services.deletedInfo" : "Seirbhís scriosta",
    "settings.services.discoverServices" : "Aimsigh seirbhísí",
    "settings.services.headline" : "Do chuid seirbhísí",
    "settings.services.noServicesAdded" : "Níl aon seirbhís curtha agat fós.",
    "settings.services.tooltip.isDisabled" : "Seirbhís díchumasaithe",
-   "settings.services.tooltip.isMuted" : "Gach fuaim tachta",
-   "settings.services.tooltip.notificationsDisabled" : "Fógraí díchumasaithe",
+   "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
+   "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
    "settings.services.updatedInfo" : "Sábháiltear do chuid athruithe",
    "settings.user.form.accountType.company" : "Comhlacht",
-   "settings.user.form.accountType.individual" : "Aonair",
-   "settings.user.form.accountType.label" : "Cineál cuntais",
+   "settings.user.form.accountType.individual" : "Ar leith",
+   "settings.user.form.accountType.label" : "Cineál chuntais",
    "settings.user.form.accountType.non-profit" : "Neamhbhrabúis",
    "settings.user.form.currentPassword" : "Pasfhocal reatha",
    "settings.user.form.email" : "Ríomhphost",
@@ -140,42 +157,42 @@
    "settings.user.form.lastname" : "Sloinne",
    "settings.user.form.newPassword" : "Pasfhocal nua",
    "sidebar.addNewService" : "Cuir seirbhís nua leis",
-   "sidebar.mute" : "Díchumasaigh fuaim",
+   "sidebar.muteApp" : "Díchumasaigh fógraí � fuaim",
    "sidebar.settings" : "Socruithe",
-   "sidebar.unmute" : "Cumasaigh fuaim",
+   "sidebar.unmuteApp" : "Cumasaigh fógraí � fuaim",
    "signup.company.label" : "Comhlacht",
    "signup.email.label" : "Seoladh ríomhphoist",
-   "signup.emailDuplicate" : "Tá úsáideoir leis an seoladh ríomhphoist sin chean féin",
+   "signup.emailDuplicate" : "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
    "signup.firstname.label" : "Céadainm",
    "signup.headline" : "Cláraigh",
    "signup.lastname.label" : "Sloinne",
-   "signup.legal.info" : "Agus tú ag cruthú cuntais Franz glacann tú leis an",
-   "signup.legal.privacy" : "Ráiteas príobháideachais",
+   "signup.legal.info" : "Agus tú ag cruthú cuntas Franz, glacann tú le",
+   "signup.legal.privacy" : "Ráiteas phríobháideachais",
    "signup.legal.terms" : "Tearmaí seirbhíse",
    "signup.link.login" : "Cuntas agat cheana féin, logáil isteach?",
    "signup.password.label" : "Pasfhocal",
    "signup.submit.label" : "Cruthaigh cuntas",
-   "subscription.euTaxInfo" : "�ithritheoirí an tAÉ: féadfar cáin díolacháin áitiúla a chur i bhfeidhm",
-   "subscription.features.ads" : "Fógraí ar bith, choíche!",
+   "subscription.euTaxInfo" : "�ithritheoirí an tAÉ: is féidir le cáin díolacháin áitiúla cur i bhfeidhm",
+   "subscription.features.ads" : "Ní bheadh fógraí ar bith, choíche!",
    "subscription.features.comingSoon" : "ag teacht go luath",
-   "subscription.features.customServices" : "Seirbhísí phríobháideach duitse agus do do mheitheal",
+   "subscription.features.customServices" : "Seirbhísí phríobháideach duitse agus do d'fhoireann",
    "subscription.features.encryptedSync" : "Sionchronú seisiúin chriptithe",
    "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
-   "subscription.features.vpn" : "Tacaíocht seachfhreastalaí & LPF",
+   "subscription.features.vpn" : "Tacaíocht seachfhreastalaí � LPF",
    "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhtacadóra Franz san áireamh",
    "subscription.mining.experimental" : "turgnamhach",
-   "subscription.mining.headline" : "Conas a oibríonn sé seo?",
-   "subscription.mining.line1" : "Tar éis chur \"Tabhair tacaíocht le cumhacht phŕóiseála\" ar chumas, bainfidh Franz úsáid as thart ar 20-50\\% de do lárionad próiseála chun an airgeadra digiteach Monero a mhíneáil, a chothromaíonn $5 sa bhliain.",
-   "subscription.mining.line2" : "Cuirimid úsáid an láríonaid próiseála in oiriúint do d'iompar oibre ionas nach mbeidh do cheallra caite agus tú agus do ríomhaire moillithe.",
-   "subscription.mining.line3" : "Fad is go bhfuil an mhianadóir gníomhach, beidh rochtain gan teorainn agat do Phŕeimhghnéithe Taca Franz.",
+   "subscription.mining.headline" : "Cén chaoi mar a oibríonn sé seo?",
+   "subscription.mining.line1" : "Tar éis \"Tabhair tacaíocht le cumhacht phróiseála\" a chur ar chumas, bainfidh Franz úsáid as thart ar 20-50\\% de do chuid lárionad próiseála, chun an airgeadra digiteach Monero a mhíneáil, cothrom le thart ar $5 sa bhliain.",
+   "subscription.mining.line2" : "Cuirfimid úsáid an lárionaid phróiseála in oiriúint do d'iompar oibre, ionas nár caitheadh do cheallra agus níor moillíodh thú agus do ríomhaire.",
+   "subscription.mining.line3" : "Fad is a bhfuil an mhianadóir gníomhach, beidh rochtain gan teorainn agat do Phŕeimhghnéithe Taca Franz.",
    "subscription.mining.moreInformation" : "Faigh tuilleadh eolais faoin bplean seo.",
-   "subscription.paymentSessionError" : "Ní fhéadfar tús a chur leis an bhfoirm íocaíochta",
+   "subscription.paymentSessionError" : "Ní féidir cur tús leis an bhfoirm íocaíochta",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
-   "subscription.type.free" : "saor in aisce",
+   "subscription.type.free" : "saor",
    "subscription.type.mining" : "Tabhair tacaíocht do Franz le cumhacht phróiseála",
    "subscription.type.month" : "mí",
    "subscription.type.year" : "bliain",
-   "subscriptionPopup.buttonCancel" : "Cuir ar ceal",
+   "subscriptionPopup.buttonCancel" : "Cealaigh",
    "subscriptionPopup.buttonDone" : "Déanta",
    "tabs.item.deleteService" : "Scrios seirbhís",
    "tabs.item.disableAudio" : "Díchumasaigh fuaim",
@@ -186,7 +203,7 @@
    "tabs.item.enableNotification" : "Cumasaigh fógraí",
    "tabs.item.enableService" : "Cumasaigh seirbhís",
    "tabs.item.reload" : "Athlódáil",
-   "welcome.loginButton" : "Logáil isteach i do chuntas",
+   "welcome.loginButton" : "Logáil isteach do do chuntas",
    "welcome.signupButton" : "Cruthaigh cuntas nua",
    "welcome.slogan" : "Teachtaireachtaí ag obair leat"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
new file mode 100644
index 000000000..2b2154a8e
--- /dev/null
+++ b/src/i18n/locales/hr.json
@@ -0,0 +1,209 @@
+{
+   "global.api.unhealthy" : "Nije se moguće povezati na Francove on-line servise. ",
+   "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
+   "import.headline" : "Uvezite svoje Franc 4 servise. ",
+   "import.notSupportedHeadline" : "Franc 5 trenutno ne podržava taj servis",
+   "import.skip.label" : "Želim ru�no dodati ove usluge",
+   "import.submit.label" : "Uvezi servise",
+   "infobar.buttonChangelog" : "Å ta je novo?",
+   "infobar.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
+   "infobar.buttonReloadServices" : "Ponovo u�itaj servise",
+   "infobar.requiredRequestsFailed" : "Nemoguće u�itati servise i korisni�ke informacije",
+   "infobar.servicesUpdated" : "Vaši servisi su ažurirani. ",
+   "infobar.updateAvailable" : "Novo ažuriranje Franz-a je dostupno. ",
+   "invite.email.label" : "Vaša e-adresa:",
+   "invite.headline.friends" : "Pozovite 3 vaša prijatelja ili kolege",
+   "invite.name.label" : "Ime",
+   "invite.skip.label" : "Želim da ovo uradim kasnije",
+   "invite.submit.label" : "Pošalji pozivnice",
+   "login.email.label" : "Vaša e-adresa:",
+   "login.headline" : "Prijavite se",
+   "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
+   "login.link.password" : "Stvaranje nove lozinke",
+   "login.link.signup" : "Stvorite besplatan ra�un",
+   "login.password.label" : "Lozinka",
+   "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "login.submit.label" : "Prijavite se",
+   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "password.email.label" : "Vaša e-adresa",
+   "password.headline" : "Stvorite novu zaporku",
+   "password.link.login" : "Prijavite se na Vaš ra�un",
+   "password.link.signup" : "Stvorite besplatan ra�un",
+   "password.noUser" : "Ne postoji ni jedan korisnik s tom e-mail adresom",
+   "password.submit.label" : "Pošalji",
+   "password.successInfo" : "Molimo Vas da provjerite svoju e-mail adresu",
+   "pricing.headline" : "Podržite Franz aplikaciju",
+   "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
+   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
+   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "service.crashHandler.action" : "Osvježi okvir",
+   "service.crashHandler.autoReload" : "Pokušati ću automatski povratiti {ime} u {sekundi} sekundi",
+   "service.crashHandler.headline" : "O, ne! ",
+   "service.crashHandler.text" : "{name} je izazvalo grešku. ",
+   "service.disabledHandler.action" : "Omogući {name}",
+   "service.disabledHandler.headline" : "{name} je onemogućen\/o",
+   "services.getStarted" : "Zapo�nimo!",
+   "services.welcome" : "Dobrodošli u Franz",
+   "settings.account.account.editButton" : "Uredi ra�un",
+   "settings.account.accountType.basic" : "Osnovni ra�un",
+   "settings.account.accountType.premium" : "Premium ra�un",
+   "settings.account.buttonSave" : "Ažuriraj profil",
+   "settings.account.deleteAccount" : "Izbrisati ra�un",
+   "settings.account.deleteEmailSent" : "Dobili ste email s linkom putem kojeg ćete potvrditi brisanje ra�una. Vaš ra�un i podatke neće biti moguće vratiti. ",
+   "settings.account.deleteInfo" : "Ako više ne trebate Franz ra�un, ovdje možete obrisati sve vezane podatke kao i ra�un.",
+   "settings.account.headline" : "Korisni�ki ra�un",
+   "settings.account.headlineAccount" : "Informacije o ra�unu",
+   "settings.account.headlineDangerZone" : "Opasnost",
+   "settings.account.headlineInvoices" : "Fakture",
+   "settings.account.headlinePassword" : "Promijenite lozinku",
+   "settings.account.headlineProfile" : "Ažurirajte profil",
+   "settings.account.headlineSubscription" : "Vaša pretplata",
+   "settings.account.headlineUpgrade" : "Nadogradite ra�un i podržite Franc",
+   "settings.account.invoiceDownload" : "Preuzmite",
+   "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
+   "settings.account.mining.active" : "Trenutno se odvija {hashes} kalkulacija po sekundi.",
+   "settings.account.mining.cancel" : "Odustani ",
+   "settings.account.mining.moreInformation" : "Dođi do više informacija",
+   "settings.account.mining.thankyou" : "Hvala Vam što podržavate Franca s vašom procesorskom moći. ",
+   "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
+   "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
+   "settings.app.buttonClearAllCache" : "O�isti memoriju",
+   "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
+   "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.currentVersion" : "Trenutna verzija:",
+   "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
+   "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
+   "settings.app.form.beta" : "Obuhvati i beta verzije",
+   "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
+   "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "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.headline" : "Postavke",
+   "settings.app.headlineAdvanced" : "Napredne alatke",
+   "settings.app.headlineAppearance" : "Izgled",
+   "settings.app.headlineGeneral" : "Općenito",
+   "settings.app.headlineLanguage" : "Jezik",
+   "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
+   "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
+   "settings.app.updateStatusSearching" : "Traže se ažuriranja",
+   "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
+   "settings.navigation.account" : "Ra�un",
+   "settings.navigation.availableServices" : "Dostupne usluge",
+   "settings.navigation.logout" : "Odjava",
+   "settings.navigation.settings" : "Postavke",
+   "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.recipes.all" : "Sve usluge",
+   "settings.recipes.dev" : "Razvoj",
+   "settings.recipes.headline" : "Dostupne usluge",
+   "settings.recipes.missingService" : "Da li neki servis nedostaje?",
+   "settings.recipes.mostPopular" : "Najpopularniji",
+   "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite. ",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana. ",
+   "settings.searchService" : "Search service",
+   "settings.service.error.goBack" : "Nazad do servisa",
+   "settings.service.error.headline" : "Greška",
+   "settings.service.error.message" : "Nemoguće u�itati sadržaj usluge. ",
+   "settings.service.form.addServiceHeadline" : "Dodaj {ime}",
+   "settings.service.form.availableServices" : "Dostupne usluge:",
+   "settings.service.form.customUrl" : "Prilagođen server",
+   "settings.service.form.customUrlPremiumInfo" : "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium ra�un.",
+   "settings.service.form.customUrlUpgradeAccount" : "Nadogradite Vaš ra�un",
+   "settings.service.form.customUrlValidationError" : "Nije moguće odobriti prilagođeno {ime} servera.",
+   "settings.service.form.deleteButton" : "Izbriši uslugu",
+   "settings.service.form.editServiceHeadline" : "Uredite {ime}",
+   "settings.service.form.enableAudio" : "Omogućite zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableNotification" : "Omogućite obavijesti",
+   "settings.service.form.enableService" : "Omogućite usluge",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Općenito",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
+   "settings.service.form.indirectMessages" : "Prikaži zna�ku na svim novim porukuama",
+   "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti ne�ujna. ",
+   "settings.service.form.name" : "Ime",
+   "settings.service.form.saveButton" : "Sa�uvaj uslugu\/e",
+   "settings.service.form.tabHosted" : "Hostovano",
+   "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
+   "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.yourServices" : "Vaše usluge",
+   "settings.services.deletedInfo" : "Usluga je onemogućena",
+   "settings.services.discoverServices" : "Pronađite usluge",
+   "settings.services.headline" : "Vaše usluge",
+   "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "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.",
+   "settings.services.updatedInfo" : "Vaše promjene su pohranjene. ",
+   "settings.user.form.accountType.company" : "Tvrtka",
+   "settings.user.form.accountType.individual" : "Pojedinac",
+   "settings.user.form.accountType.label" : "Tip ra�una",
+   "settings.user.form.accountType.non-profit" : "Neprofitno ",
+   "settings.user.form.currentPassword" : "Trenutna lozinka:",
+   "settings.user.form.email" : "E-pošta",
+   "settings.user.form.firstname" : "Ime",
+   "settings.user.form.lastname" : "Prezime",
+   "settings.user.form.newPassword" : "Nova lozinka",
+   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.muteApp" : "Ugasi obavijesti i zvuk",
+   "sidebar.settings" : "Postavke",
+   "sidebar.unmuteApp" : "Omogući obavijesti i zvuk",
+   "signup.company.label" : "Tvrtka",
+   "signup.email.label" : "Vaša e-adresa",
+   "signup.emailDuplicate" : "Već postoji korisnik s tom e-mail adresom",
+   "signup.firstname.label" : "Ime",
+   "signup.headline" : "Prijava",
+   "signup.lastname.label" : "Prezime",
+   "signup.legal.info" : "Prilikom stvaranja Franz ra�una, slažete se sa sljedećim stavkama:",
+   "signup.legal.privacy" : "Izjava o privatnosti ",
+   "signup.legal.terms" : "Uvjeti korištenja",
+   "signup.link.login" : "Imate ra�un? Prijavite se.",
+   "signup.password.label" : "Lozinka",
+   "signup.submit.label" : "Napravite novi ra�un",
+   "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje ",
+   "subscription.features.ads" : "Bez reklama, doživotno!",
+   "subscription.features.comingSoon" : "Dolazi uskoro",
+   "subscription.features.customServices" : "Privatni servisi za Vas i Vaš tim",
+   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
+   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat ",
+   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
+   "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće: ",
+   "subscription.mining.experimental" : "Eksperimentalno",
+   "subscription.mining.headline" : "Na koji na�in ovo radi?",
+   "subscription.mining.line1" : "Omogućavanjem \" Podrška snagom procesora \", Franc će iskoristiti oko 20-50% vaših CPU resursa za Kripto valutu \" Monero \" koja košta otprilike 5$ godišnje. ",
+   "subscription.mining.line2" : "Adaptiraćemo iskorišćenost CPU resursa na osnovu vašeg rada, na taj na�in ćemo izbjeći iscrpljivanje baterije i usporavanje uređaja. ",
+   "subscription.mining.line3" : "Dok god je \" rudar \" aktivan, imaćete neograni�en pristup svim Francovim Premium zna�ajkama. ",
+   "subscription.mining.moreInformation" : "Dajte mi više informacija o ovom planu. ",
+   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
+   "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
+   "subscription.type.free" : "Slobodno",
+   "subscription.type.mining" : "Podržite Franca s procesorskim resursima",
+   "subscription.type.month" : "mjesec",
+   "subscription.type.year" : "godina",
+   "subscriptionPopup.buttonCancel" : "Odustani",
+   "subscriptionPopup.buttonDone" : "Završeno",
+   "tabs.item.deleteService" : "Izbriši servis",
+   "tabs.item.disableAudio" : "Onemogući zvuk",
+   "tabs.item.disableNotifications" : "Onemogući obavijesti",
+   "tabs.item.disableService" : "Onemogući servis",
+   "tabs.item.edit" : "Uredi",
+   "tabs.item.enableAudio" : "Uklju�i zvuk",
+   "tabs.item.enableNotification" : "Omogući obavijesti",
+   "tabs.item.enableService" : "Omogući usluge",
+   "tabs.item.reload" : "Ponovno u�itavanje",
+   "welcome.loginButton" : "Prijavite se na ra�un",
+   "welcome.signupButton" : "Stvorite novi korisni�ki ra�un",
+   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+}
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index f62c0ead9..55914919d 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Nincs kapcsolat a kiszolgálóval.",
    "import.headline" : "Importáld szolgáltatásaidat a Franz 4-ből",
    "import.notSupportedHeadline" : "Még nem támogatott szolgáltatások a Franz 5-ben",
-   "import.skip.label" : "Kézzel szeretnék szolgáltatást felvenni",
+   "import.skip.label" : "Manuálisan szeretném hozzáadni a szolgáltatásokat",
    "import.submit.label" : "Szolgáltatások importálása",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Mi változott?",
    "infobar.buttonInstallUpdate" : "Újraindítás és a frissítés telepítése",
    "infobar.buttonReloadServices" : "Szolgáltatások újratöltése",
    "infobar.requiredRequestsFailed" : "Szolgáltatások és felhasználói információk nem tölthetők be",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Nem szeretném támogatni a Franz fejlesztését.",
    "pricing.submit.label" : "Támogatni szeretném a Franz fejlesztését.",
    "pricing.support.label" : "Válaszd ki a támogatás módját",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "{name} újratöltése",
+   "service.crashHandler.autoReload" : "Megpróbáljuk automatikusan helyreállítani {name}-t {seconds} mp-en belül",
+   "service.crashHandler.headline" : "Jajj ne!",
+   "service.crashHandler.text" : "{name} hibát okozott.",
+   "service.disabledHandler.action" : "{name} engedélyezése",
+   "service.disabledHandler.headline" : "{name} letiltva",
    "services.getStarted" : "Kezdj hozzá",
    "services.welcome" : "Üdvözöl a Franz",
    "settings.account.account.editButton" : "Fiók szerkesztése",
    "settings.account.accountType.basic" : "Alap Fiók",
    "settings.account.accountType.premium" : "Prémium Támogató Fiók",
    "settings.account.buttonSave" : "Profil frissítése",
+   "settings.account.deleteAccount" : "Fiók törlése",
+   "settings.account.deleteEmailSent" : "A fiókod törléséhez egy e-mailt küldtük a törlést megerősítő linkkel. A linkre kattintást követően a fiókod és az adatait már nem állíthatók vissza többé!",
+   "settings.account.deleteInfo" : "Ha még nem szeretnéd fenntartani a Franz-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
    "settings.account.headline" : "Fiók",
    "settings.account.headlineAccount" : "Fiókinformációk",
+   "settings.account.headlineDangerZone" : "Veszélyes üzemmód",
    "settings.account.headlineInvoices" : "Számlák",
    "settings.account.headlinePassword" : "Jelszócsere",
    "settings.account.headlineProfile" : "Profil frissítése",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "A módosításokat elmentettük",
    "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",
    "settings.app.buttonInstallUpdate" : "Újraindítás és frissítések telepítése",
    "settings.app.buttonSearchForUpdate" : "Frissítések keresése",
+   "settings.app.cacheInfo" : "A Franz gyorsítótár jelenleg {space} lemezterületet használ.",
    "settings.app.currentVersion" : "Aktuális verzió:",
    "settings.app.form.autoLaunchInBackground" : "Megnyitás háttérben",
    "settings.app.form.autoLaunchOnStart" : "Franz betöltése indításkor",
    "settings.app.form.beta" : "Béta verziók keresése",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "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.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" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Letiltott szolgáltatások megjelenítése",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mutass az 'olvasatlan üzenet' jelzést amikor az értesítések le vannak tiltva.",
    "settings.app.headline" : "Beállítások",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Haladó",
+   "settings.app.headlineAppearance" : "Megjelenés",
    "settings.app.headlineGeneral" : "�ltalános",
    "settings.app.headlineLanguage" : "Nyelv",
    "settings.app.headlineUpdates" : "Frissítések",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Újraindítást igénylő módosítás",
+   "settings.app.subheadlineCache" : "Gyorsítótár",
+   "settings.app.translationHelp" : "Segíts nekünk a Franz-ot lefordítani a nyelvedre.",
    "settings.app.updateStatusAvailable" : "Frissítés elérhető, letöltés folyamatban...",
    "settings.app.updateStatusSearching" : "Frissítéseket keres",
    "settings.app.updateStatusUpToDate" : "A Franz legfrissebb verzióját használod",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Összes szolgáltatás",
    "settings.recipes.dev" : "Fejlesztés",
    "settings.recipes.headline" : "Elérhető szolgáltatások",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Hiányzik egy szolgáltatás?",
    "settings.recipes.mostPopular" : "Legnépszerűbb",
    "settings.recipes.nothingFound" : "Sajnáljuk, nincs egyezés a szolgáltatások között a keresett kifejezésre.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Szolgáltatás sikeresen hozzáadva.",
+   "settings.searchService" : "Szolgáltatások keresése",
    "settings.service.error.goBack" : "Vissza a szolgáltatásokhoz",
    "settings.service.error.headline" : "Hiba",
    "settings.service.error.message" : "Nem tölthető be a szolgáltatás receptje.",
@@ -110,24 +119,32 @@
    "settings.service.form.customUrlValidationError" : "Nem sikerült hitelesíteni az egyéni {name} szervert.",
    "settings.service.form.deleteButton" : "Szolgáltatás törlése",
    "settings.service.form.editServiceHeadline" : "{name} szerkesztése",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Hang engedélyezése",
+   "settings.service.form.enableBadge" : "Mutasd az olvasatlan jelzéseket",
    "settings.service.form.enableNotification" : "Értesítések engedélyezése",
    "settings.service.form.enableService" : "Szolgáltatás engedélyezése",
+   "settings.service.form.headlineBadges" : "Olvasatlan üzenet jelzések",
+   "settings.service.form.headlineGeneral" : "�ltalános",
+   "settings.service.form.headlineNotifications" : "Értesítések",
+   "settings.service.form.icon" : "Egyedi ikon",
+   "settings.service.form.iconDelete" : "Törlés",
+   "settings.service.form.iconUpload" : "Húzd ide a képet, vagy kattints ide",
    "settings.service.form.indirectMessageInfo" : "Értesítést kapsz minden üzenetről a csatornában, nem csak @felhasználónév, @csatorna @here és egyéb említések esetén",
    "settings.service.form.indirectMessages" : "Üzenet kitűző megjelenítése minden üzenethez",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül.",
    "settings.service.form.name" : "Név",
    "settings.service.form.saveButton" : "Szolgáltatás mentése",
    "settings.service.form.tabHosted" : "Ãœzemeltetett",
    "settings.service.form.tabOnPremise" : "Egyénileg üzemeltetett",
    "settings.service.form.team" : "Csapat",
+   "settings.service.form.useHostedService" : "A távoli {name} szolgáltatás használata",
    "settings.service.form.yourServices" : "Szolgáltatásaid",
    "settings.services.deletedInfo" : "A szolgáltatás törlésre került",
    "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.tooltip.isDisabled" : "Ez a szolgáltatás le van tiltva.",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
    "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
    "settings.services.updatedInfo" : "A módosításokat elmentettük",
    "settings.user.form.accountType.company" : "Cég",
@@ -136,26 +153,26 @@
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Jelenlegi jelszó",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.firstname" : "Keresztnév",
+   "settings.user.form.lastname" : "Vezetéknév",
    "settings.user.form.newPassword" : "Új jelszó",
    "sidebar.addNewService" : "Szolgáltatás hozzáadása",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Értesítések és hangok letiltása",
    "sidebar.settings" : "Beállítások",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Értesítések és hangok engedélyezése",
    "signup.company.label" : "Cég",
    "signup.email.label" : "Email cím",
    "signup.emailDuplicate" : "Ezzel az e-mail címmel már létezik felhasználó",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Keresztnév",
    "signup.headline" : "Regisztráció",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Családnév",
    "signup.legal.info" : "A Franz fiók létrehozásával elfogadod az",
    "signup.legal.privacy" : "Adatvédelmi Nyilatkozatot",
    "signup.legal.terms" : "Felhasználási Feltételeket",
    "signup.link.login" : "Már van fiókod? Lépj be!",
    "signup.password.label" : "Jelszó",
    "signup.submit.label" : "Fiók létrehozása",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "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.customServices" : "Privát szolgáltatások neked és a csapatodnak",
@@ -178,11 +195,11 @@
    "subscriptionPopup.buttonCancel" : "Mégsem",
    "subscriptionPopup.buttonDone" : "Kész",
    "tabs.item.deleteService" : "Szolgáltatás törlése",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Hang letiltása",
    "tabs.item.disableNotifications" : "Értesítések letiltása",
    "tabs.item.disableService" : "Szolgáltatás letiltása",
    "tabs.item.edit" : "Szerkesztés",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Hang engedélyezése",
    "tabs.item.enableNotification" : "Értesítések engedélyezése",
    "tabs.item.enableService" : "Szolgáltatás engedélyezése",
    "tabs.item.reload" : "Újratöltés",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 611cad550..f47a860b6 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -5,7 +5,7 @@
    "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
    "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
    "import.submit.label" : "Impor layanan",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Yang baru",
    "infobar.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
    "infobar.buttonReloadServices" : "Muat ulang layanan",
    "infobar.requiredRequestsFailed" : "Tidak bisa memuat layanan dan informasi pengguna",
@@ -48,8 +48,12 @@
    "settings.account.accountType.basic" : "Akun Dasar",
    "settings.account.accountType.premium" : "Akun Pendukung Premium",
    "settings.account.buttonSave" : "Perbarui profil",
+   "settings.account.deleteAccount" : "Hapus akun",
+   "settings.account.deleteEmailSent" : "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
+   "settings.account.deleteInfo" : "Jika Anda tidak membutuhkan akun Franz lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
    "settings.account.headline" : "Akun",
    "settings.account.headlineAccount" : "Informasi akun",
+   "settings.account.headlineDangerZone" : "Wilayah Berbahaya",
    "settings.account.headlineInvoices" : "Tagihan",
    "settings.account.headlinePassword" : "Ubah sandi",
    "settings.account.headlineProfile" : "Perbarui profil",
@@ -64,8 +68,10 @@
    "settings.account.successInfo" : "Perubahan Anda telah disimpan",
    "settings.account.tryReloadUserInfoRequest" : "Coba lagi",
    "settings.account.userInfoRequestFailed" : "Tidak bisa memuat informasi pengguna",
+   "settings.app.buttonClearAllCache" : "Bersihkan singgahan",
    "settings.app.buttonInstallUpdate" : "Mulai ulang dan instal versi baru",
    "settings.app.buttonSearchForUpdate" : "Periksa versi baru",
+   "settings.app.cacheInfo" : "Singgahan Franz sedang menggunakan ruang disk {size}.",
    "settings.app.currentVersion" : "Versi saat ini:",
    "settings.app.form.autoLaunchInBackground" : "Buka di latar belakang",
    "settings.app.form.autoLaunchOnStart" : "Jalankan Franz saat komputer dimulai",
@@ -76,6 +82,7 @@
    "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.headline" : "Pengaturan",
    "settings.app.headlineAdvanced" : "Tingkat Lanjut",
    "settings.app.headlineAppearance" : "Tampilan",
@@ -83,7 +90,8 @@
    "settings.app.headlineLanguage" : "Bahasa",
    "settings.app.headlineUpdates" : "Versi Baru",
    "settings.app.restartRequired" : "Perubahan membutuhkan mulai ulang",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Singgahan",
+   "settings.app.translationHelp" : "Bantu kami menerjemahkan Franz ke bahasa Anda.",
    "settings.app.updateStatusAvailable" : "Versi baru tersedia, mengunduh...",
    "settings.app.updateStatusSearching" : "Sedang mencari versi baru",
    "settings.app.updateStatusUpToDate" : "Anda sedang menggunakan versi terbaru Franz",
@@ -95,32 +103,41 @@
    "settings.recipes.all" : "Semua layanan",
    "settings.recipes.dev" : "Pengembangan",
    "settings.recipes.headline" : "Layanan tersedia",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Layanan tidak tersedia?",
    "settings.recipes.mostPopular" : "Paling populer",
    "settings.recipes.nothingFound" : "Maaf, tidak ada layanan yang cocok dengan pencarian Anda.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Layanan berhasil ditambahkan",
+   "settings.searchService" : "Cari layanan",
    "settings.service.error.goBack" : "Kembali ke layanan",
    "settings.service.error.headline" : "Kesalahan",
    "settings.service.error.message" : "Tidak dapat memuat konfigurasi layanan.",
    "settings.service.form.addServiceHeadline" : "Tambahkan {name}",
    "settings.service.form.availableServices" : "Layanan tersedia",
    "settings.service.form.customUrl" : "Server khusus",
-   "settings.service.form.customUrlPremiumInfo" : "Untuk menambahkan layanan yang dijalankan mandiri, Anda membutuhkan Franz Premium Supporter Account.",
+   "settings.service.form.customUrlPremiumInfo" : "Untuk menambahkan layanan hosted yang dijalankan mandiri, Anda membutuhkan Franz Premium Supporter Account.",
    "settings.service.form.customUrlUpgradeAccount" : "Tingkatkan akun Anda",
    "settings.service.form.customUrlValidationError" : "Tidak bisa memvalidasi server {name} khusus.",
    "settings.service.form.deleteButton" : "Hapus layanan",
    "settings.service.form.editServiceHeadline" : "Edit {name}",
    "settings.service.form.enableAudio" : "Aktifkan audio",
+   "settings.service.form.enableBadge" : "Tampilkan lencana pesan belum dibaca",
    "settings.service.form.enableNotification" : "Aktifkan pemberitahuan",
    "settings.service.form.enableService" : "Aktifkan layanan",
+   "settings.service.form.headlineBadges" : "Lencana pesan belum dibaca",
+   "settings.service.form.headlineGeneral" : "Umum",
+   "settings.service.form.headlineNotifications" : "Notifikasi",
+   "settings.service.form.icon" : "Ikon khusus",
+   "settings.service.form.iconDelete" : "Hapus",
+   "settings.service.form.iconUpload" : "Lepaskan gambar atau klik di sini",
    "settings.service.form.indirectMessageInfo" : "Anda akan diberi tahu tentang semua pesan dalam kanal, bukan hanya @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Tampilkan lencana pesan untuk semua pesan",
-   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara notifikasi dan pemutaran audio akan dibisukan",
+   "settings.service.form.isMutedInfo" : "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
    "settings.service.form.name" : "Nama",
    "settings.service.form.saveButton" : "Simpan layanan",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Hosted mandiri",
    "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Gunakan layanan hosted {name}.",
    "settings.service.form.yourServices" : "Layanan Anda",
    "settings.services.deletedInfo" : "Layanan telah dihapus",
    "settings.services.discoverServices" : "Temukan layanan",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "Nama Belakang",
    "settings.user.form.newPassword" : "Sandi baru",
    "sidebar.addNewService" : "Tambahkan layanan baru",
-   "sidebar.mute" : "Nonaktifkan audio",
+   "sidebar.muteApp" : "Nonaktifkan pemberitahuan & audio",
    "sidebar.settings" : "Pengaturan",
-   "sidebar.unmute" : "Aktifkan audio",
+   "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
    "signup.company.label" : "Perusahaan",
    "signup.email.label" : "Alamat email",
    "signup.emailDuplicate" : "Pengguna dengan alamat email ini sudah ada",
@@ -160,7 +177,7 @@
    "subscription.features.comingSoon" : "segera hadir",
    "subscription.features.customServices" : "Layanan pribadi untuk Anda dan tim Anda",
    "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi",
-   "subscription.features.onpremise" : "Layanan add-on premise\/hosten seperti HipChat",
+   "subscription.features.onpremise" : "Layanan add-on premise\/hosted seperti HipChat",
    "subscription.features.vpn" : "Dukungan proxy & VPN",
    "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
    "subscription.mining.experimental" : "eksperimental",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index ad3f9b880..1d2485b19 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -5,33 +5,33 @@
    "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
    "import.skip.label" : "Voglio aggiungere servizi manualmente",
    "import.submit.label" : "Importa servizi",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Novità",
    "infobar.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
    "infobar.buttonReloadServices" : "Ricarica servizi",
    "infobar.requiredRequestsFailed" : "Impossibile caricare servizi e info utente",
    "infobar.servicesUpdated" : "I tuoi servizi sono stati aggiornati.",
    "infobar.updateAvailable" : "È disponibile un nuovo aggiornamento di Franz.",
-   "invite.email.label" : "Indirizzo e-mail",
+   "invite.email.label" : "Indirizzo email",
    "invite.headline.friends" : "Invita 3 dei tuoi amici o colleghi",
    "invite.name.label" : "Nome",
    "invite.skip.label" : "Voglio farlo dopo",
    "invite.submit.label" : "Invia inviti",
-   "login.email.label" : "Indirizzo e-mail",
+   "login.email.label" : "Indirizzo email",
    "login.headline" : "Accedi",
-   "login.invalidCredentials" : "E-mail o password non valide",
+   "login.invalidCredentials" : "Email o password non valide",
    "login.link.password" : "Reimposta password",
    "login.link.signup" : "Crea un account gratuito",
    "login.password.label" : "Password",
    "login.serverLogout" : "Sessione scaduta, accedi di nuovo.",
    "login.submit.label" : "Accedi",
    "login.tokenExpired" : "Sessione scaduta, accedi di nuovo.",
-   "password.email.label" : "Indirizzo e-mail",
+   "password.email.label" : "Indirizzo email",
    "password.headline" : "Reimposta password",
    "password.link.login" : "Accedi al tuo account",
    "password.link.signup" : "Crea un account gratuito",
-   "password.noUser" : "Non è stato trovato nessun utente con quell'indirizzo e-mail",
+   "password.noUser" : "Non è stato trovato nessun utente con questo indirizzo email",
    "password.submit.label" : "Invia",
-   "password.successInfo" : "Controlla la tua e-mail",
+   "password.successInfo" : "Controlla la tua email",
    "pricing.headline" : "Supporta Franz",
    "pricing.link.skipPayment" : "Non voglio supportare lo sviluppo di Franz",
    "pricing.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -40,16 +40,20 @@
    "service.crashHandler.autoReload" : "Prova a ripristinare automaticamente {name} in {seconds} secondi",
    "service.crashHandler.headline" : "Oh no!",
    "service.crashHandler.text" : "{name} ha causato un errore.",
-   "service.disabledHandler.action" : "Abilita {name}",
-   "service.disabledHandler.headline" : "{name} è disabilitato",
+   "service.disabledHandler.action" : "Attiva {name}",
+   "service.disabledHandler.headline" : "{name} è disattivato",
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto in Franz",
    "settings.account.account.editButton" : "Modifica account",
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
+   "settings.account.deleteAccount" : "Elimina account",
+   "settings.account.deleteEmailSent" : "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account. I dati del tuo account non potranno essere ripristinati!",
+   "settings.account.deleteInfo" : "Se non hai più bisogno dell'account Franz, puoi eliminare il tuo account e tutti i dati relativi qui.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Informazioni account",
+   "settings.account.headlineDangerZone" : "Zona Pericolosa",
    "settings.account.headlineInvoices" : "Fatture",
    "settings.account.headlinePassword" : "Cambia password",
    "settings.account.headlineProfile" : "Aggiorna profilo",
@@ -64,18 +68,21 @@
    "settings.account.successInfo" : "Le tue modifiche sono state salvate",
    "settings.account.tryReloadUserInfoRequest" : "Riprova ancora",
    "settings.account.userInfoRequestFailed" : "Impossibile caricare informazioni utente.",
+   "settings.app.buttonClearAllCache" : "Svuota cache",
    "settings.app.buttonInstallUpdate" : "Riavvia e installa aggiornamento",
    "settings.app.buttonSearchForUpdate" : "Controlla aggiornamenti",
+   "settings.app.cacheInfo" : "Franz sta utilizzando {size} di spazio su disco.",
    "settings.app.currentVersion" : "Versione attuale:",
    "settings.app.form.autoLaunchInBackground" : "Apri in secondo piano",
-   "settings.app.form.autoLaunchOnStart" : "Apri Franz all'avvio",
+   "settings.app.form.autoLaunchOnStart" : "Esegui Franz all'avvio",
    "settings.app.form.beta" : "Includi versioni beta",
-   "settings.app.form.enableSpellchecking" : "Abilita controllo ortografico",
+   "settings.app.form.enableSpellchecking" : "Attiva controllo ortografico",
    "settings.app.form.enableSystemTray" : "Mostra Franz nell'area di notifica",
    "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 i tab disabilitati",
+   "settings.app.form.showDisabledServices" : "Mostra tab servizi disattivati",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostra badge messaggi non letti quanto le notifiche sono disattivati",
    "settings.app.headline" : "Impostazioni",
    "settings.app.headlineAdvanced" : "Avanzate",
    "settings.app.headlineAppearance" : "Aspetto",
@@ -83,9 +90,10 @@
    "settings.app.headlineLanguage" : "Lingua",
    "settings.app.headlineUpdates" : "Aggiornamenti",
    "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
    "settings.app.updateStatusAvailable" : "Aggiornamento disponibile, download in corso...",
-   "settings.app.updateStatusSearching" : "È in ricerca di un aggiornamento",
+   "settings.app.updateStatusSearching" : "Ricerca aggiornamenti...",
    "settings.app.updateStatusUpToDate" : "Stai utilizzando l'ultima versione di Franz",
    "settings.navigation.account" : "Account",
    "settings.navigation.availableServices" : "Servizi disponibili",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Tutti i servizi",
    "settings.recipes.dev" : "Sviluppo",
    "settings.recipes.headline" : "Servizi disponibili",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Richiedi un servizio",
    "settings.recipes.mostPopular" : "Più popolari",
    "settings.recipes.nothingFound" : "Ci dispiace, ma nessun servizio corrisponde alla tua ricerca.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Servizio aggiunto con successo",
+   "settings.searchService" : "Cerca servizio",
    "settings.service.error.goBack" : "Indietro ai servizi",
    "settings.service.error.headline" : "Errore",
    "settings.service.error.message" : "Impossibile caricare il servizio.",
@@ -110,17 +119,25 @@
    "settings.service.form.customUrlValidationError" : "Impossibile validare il server personalizzato {name}.",
    "settings.service.form.deleteButton" : "Elimina servizio",
    "settings.service.form.editServiceHeadline" : "Modifica {name}",
-   "settings.service.form.enableAudio" : "Abilita audio",
+   "settings.service.form.enableAudio" : "Attiva audio",
+   "settings.service.form.enableBadge" : "Mostra badge messaggi non letti",
    "settings.service.form.enableNotification" : "Attiva notifiche",
    "settings.service.form.enableService" : "Attiva servizio",
+   "settings.service.form.headlineBadges" : "Badge messaggi non letti",
+   "settings.service.form.headlineGeneral" : "Generale",
+   "settings.service.form.headlineNotifications" : "Notifiche",
+   "settings.service.form.icon" : "Icona personalizzata",
+   "settings.service.form.iconDelete" : "Elimina",
+   "settings.service.form.iconUpload" : "Trascina la tua immagine o clicca qui",
    "settings.service.form.indirectMessageInfo" : "Verrai notificato di tutti i messaggi in un canale, non solo @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostra il simbolo del messaggio per tutti i messaggi",
-   "settings.service.form.isMutedInfo" : "Quando disabilitato, tutte le notifiche sonore e le riproduzioni audio saranno disattivate",
+   "settings.service.form.isMutedInfo" : "Quando disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mute",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Salva servizio",
    "settings.service.form.tabHosted" : "Hosted",
    "settings.service.form.tabOnPremise" : "Self hosted ��",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Utilizza il servizio hostato {name}.",
    "settings.service.form.yourServices" : "I tuoi servizi",
    "settings.services.deletedInfo" : "Il servizio è stato eliminato",
    "settings.services.discoverServices" : "Scopri servizi",
@@ -135,17 +152,17 @@
    "settings.user.form.accountType.label" : "Tipo account",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
    "settings.user.form.currentPassword" : "Password attuale",
-   "settings.user.form.email" : "E-mail",
+   "settings.user.form.email" : "Email",
    "settings.user.form.firstname" : "Nome",
    "settings.user.form.lastname" : "Cognome",
    "settings.user.form.newPassword" : "Nuova password",
    "sidebar.addNewService" : "Aggiungi nuovo servizio",
-   "sidebar.mute" : "Disabilita audio",
+   "sidebar.muteApp" : "Disattiva notifiche & audio",
    "sidebar.settings" : "Impostazioni",
-   "sidebar.unmute" : "Abilita audio",
+   "sidebar.unmuteApp" : "Attiva notifiche & audio",
    "signup.company.label" : "Società",
-   "signup.email.label" : "Indirizzo e-mail",
-   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo e-mail",
+   "signup.email.label" : "Indirizzo email",
+   "signup.emailDuplicate" : "Esiste già un utente con lo stesso indirizzo email",
    "signup.firstname.label" : "Nome",
    "signup.headline" : "Iscriviti",
    "signup.lastname.label" : "Cognome",
@@ -155,19 +172,19 @@
    "signup.link.login" : "Hai già un account, accedi?",
    "signup.password.label" : "Password",
    "signup.submit.label" : "Crea un account",
-   "subscription.euTaxInfo" : "Residente nella Comunità Europea, possono essere applicate tasse locali",
+   "subscription.euTaxInfo" : "Residenti EU: possono essere applicate tasse locali",
    "subscription.features.ads" : "Nessuna pubblicità, mai!",
    "subscription.features.comingSoon" : "in arrivo",
    "subscription.features.customServices" : "Servizi privati per te e il tuo team",
    "subscription.features.encryptedSync" : "Sincronizzazione sessione crittografata",
    "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hostati come HipChat",
    "subscription.features.vpn" : "Supporto Proxy e VPN",
-   "subscription.includedFeatures" : "L'account Franz a pagamento Premium Supporter include",
+   "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
    "subscription.mining.experimental" : "sperimentale",
    "subscription.mining.headline" : "Come funziona?",
    "subscription.mining.line1" : "Attivando il \"Supporto con potenza di calcolo\", Franz utilizzerà circa il 20-50% della tua CPU per minare la criptomoneta Monero che equivale a circa 5$\/anno.",
    "subscription.mining.line2" : "Adatteremo l'utilizzo della CPU in base al carico di lavoro per non drenare la batteria e rallentare la tua macchina.",
-   "subscription.mining.line3" : "Avrai accesso illimitato a tutte le caratteristiche Premium Supporter finché che il mining sarà attivo.",
+   "subscription.mining.line3" : "Avrai accesso illimitato a tutte le caratteristiche Franz Premium Supporter finché il mining sarà attivo.",
    "subscription.mining.moreInformation" : "Ottieni maggiori informazioni su questo piano.",
    "subscription.paymentSessionError" : "Impossibile inizializzare il form del pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index e091f1f5b..3b0e3b428 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,44 +1,44 @@
 {
    "global.api.unhealthy" : "Franzオンラインサービス�接続����ん。",
-   "global.notConnectedToTheInternet" : "Internet�接続�れ����ん。",
-   "import.headline" : "Franz 4サービス�イン�ート",
-   "import.notSupportedHeadline" : "サービス�Franz 5����対応�れ����ん",
-   "import.skip.label" : "サービス�追加�後�行�",
-   "import.submit.label" : "サービス�イン�ート",
-   "infobar.buttonChangelog" : "What is new?",
+   "global.notConnectedToTheInternet" : "インター�ット�接続�れ����ん。",
+   "import.headline" : "Franz 4�サービスをイン�ート",
+   "import.notSupportedHeadline" : "Franz 5����サービス���対応�����ん",
+   "import.skip.label" : "後�手動�サービスを追加�る",
+   "import.submit.label" : "サービスをイン�ート",
+   "infobar.buttonChangelog" : "最新情報",
    "infobar.buttonInstallUpdate" : "�起動��更新をインストール�る",
-   "infobar.buttonReloadServices" : "サービス�リロード",
-   "infobar.requiredRequestsFailed" : "サービス�ユーザー情報�読�込���ん",
+   "infobar.buttonReloadServices" : "サービス��読�込�",
+   "infobar.requiredRequestsFailed" : "サービス�ユーザー情報を読�込���ん���",
    "infobar.servicesUpdated" : "サービス�更新�れ���。",
-   "infobar.updateAvailable" : "Franz�新��更新��り��。",
+   "infobar.updateAvailable" : "Franz�更新��り��。",
    "invite.email.label" : "メールアドレス",
    "invite.headline.friends" : "�����人や�僚�方を3���Franz�招待����",
    "invite.name.label" : "��",
-   "invite.skip.label" : "後��る",
+   "invite.skip.label" : "後�",
    "invite.submit.label" : "招待を�る",
    "login.email.label" : "メールアドレス",
    "login.headline" : "サインイン",
-   "login.invalidCredentials" : "メールアドレス�パスワード�誤り��り��",
+   "login.invalidCredentials" : "メールアドレス���パスワード�間������",
    "login.link.password" : "パスワードをリセット",
    "login.link.signup" : "無料アカウントを作�",
    "login.password.label" : "パスワード",
-   "login.serverLogout" : "セッション�切れ���。ログイン�直��下��。",
+   "login.serverLogout" : "セッション�期��切れ���。ログイン�直��下��。",
    "login.submit.label" : "サインイン",
-   "login.tokenExpired" : "セッション�切れ���。ログイン�直��下��。",
+   "login.tokenExpired" : "セッション�期��切れ���。ログイン�直��下��。",
    "password.email.label" : "メールアドレス",
    "password.headline" : "パスワード�リセット",
    "password.link.login" : "サインイン",
    "password.link.signup" : "無料アカウントを作�",
-   "password.noUser" : "��メールアドレス�登録�れ����ん",
+   "password.noUser" : "��メールアドレス���登録�れ����ん",
    "password.submit.label" : "�信",
    "password.successInfo" : "メールを確���下��",
    "pricing.headline" : "Franzを支��る",
-   "pricing.link.skipPayment" : "Franz�開発を支����。",
+   "pricing.link.skipPayment" : "Franz�開発を支������。",
    "pricing.submit.label" : "Franz�開発を支����。",
-   "pricing.support.label" : "プランを�択��下��",
-   "service.crashHandler.action" : "{name} をリロード",
+   "pricing.support.label" : "プランを�択������",
+   "service.crashHandler.action" : "{name}を�読�込�",
    "service.crashHandler.autoReload" : "{seconds}秒後�自動的�{name}�復旧を試���",
-   "service.crashHandler.headline" : "����!",
+   "service.crashHandler.headline" : "�����",
    "service.crashHandler.text" : "{name}�エラーを起�����。",
    "service.disabledHandler.action" : "{name}を有効��る",
    "service.disabledHandler.headline" : "{name}�無効��",
@@ -48,24 +48,30 @@
    "settings.account.accountType.basic" : "Basicアカウント",
    "settings.account.accountType.premium" : "Premium Supporterアカウント",
    "settings.account.buttonSave" : "プロフィール�更新",
+   "settings.account.deleteAccount" : "アカウントを削除",
+   "settings.account.deleteEmailSent" : "アカウント削除�確�メールを�信����。����アカウント�データ�復旧����ん�",
+   "settings.account.deleteInfo" : "今後Franz�アカウント�必���れ����ら�アカウント�関連�る情報を削除����。",
    "settings.account.headline" : "アカウント",
    "settings.account.headlineAccount" : "アカウント情報",
+   "settings.account.headlineDangerZone" : "注��",
    "settings.account.headlineInvoices" : "請求書",
    "settings.account.headlinePassword" : "パスワード�変更",
    "settings.account.headlineProfile" : "プロフィール�更新",
-   "settings.account.headlineSubscription" : "サブスクリプション内容",
+   "settings.account.headlineSubscription" : "����登録内容",
    "settings.account.headlineUpgrade" : "アカウントをアップグレード��Franzを支��る",
    "settings.account.invoiceDownload" : "ダウンロード",
    "settings.account.manageSubscription.label" : "サブスクリプション�管�",
    "settings.account.mining.active" : "1秒��り{hashes}個��ッシュを計算中��。",
-   "settings.account.mining.cancel" : "マイニングをキャンセル�る",
+   "settings.account.mining.cancel" : "マイニングをキャンセル",
    "settings.account.mining.moreInformation" : "詳細を確��る",
    "settings.account.mining.thankyou" : "�使��PC�処�能力をFranz�支��活用��頂���り��������。",
    "settings.account.successInfo" : "変更内容��存�れ���",
-   "settings.account.tryReloadUserInfoRequest" : "�試行",
+   "settings.account.tryReloadUserInfoRequest" : "も�一度試�",
    "settings.account.userInfoRequestFailed" : "ユーザ情報を読�込���ん���",
+   "settings.app.buttonClearAllCache" : "キャッシュを消去�る",
    "settings.app.buttonInstallUpdate" : "�起動��更新をインストール�る",
    "settings.app.buttonSearchForUpdate" : "更新�確�",
+   "settings.app.cacheInfo" : "�在�Franz�キャッシュ�ディスク�{size}分を使用�����。",
    "settings.app.currentVersion" : "�在��ージョン:",
    "settings.app.form.autoLaunchInBackground" : "�ックグラウンド�開�",
    "settings.app.form.autoLaunchOnStart" : "システム起動時�Franzを開�",
@@ -76,6 +82,7 @@
    "settings.app.form.minimizeToSystemTray" : "Franzをシステムトレイ�最�化�る",
    "settings.app.form.runInBackground" : "ウインドウを閉��際�Franzを�ックグラウンド�実行�����",
    "settings.app.form.showDisabledServices" : "無効化�れ�サービス�タブを表示�る",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "通知�無効時�未読メッセージ件数を表示�る",
    "settings.app.headline" : "設定",
    "settings.app.headlineAdvanced" : "詳細",
    "settings.app.headlineAppearance" : "表示スタイル",
@@ -83,7 +90,8 @@
    "settings.app.headlineLanguage" : "言語",
    "settings.app.headlineUpdates" : "æ›´æ–°",
    "settings.app.restartRequired" : "変更���起動�必���",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "キャッシュ",
+   "settings.app.translationHelp" : "Franz�翻訳作業���力を�願����。",
    "settings.app.updateStatusAvailable" : "更新�見��り���。ダウンロード�����...",
    "settings.app.updateStatusSearching" : "更新を確�中",
    "settings.app.updateStatusUpToDate" : "�使��Franz�最新��",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "����サービス",
    "settings.recipes.dev" : "開発版",
    "settings.recipes.headline" : "利用�能�サービス",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "使���サービス�一覧��り��ん�?",
    "settings.recipes.mostPopular" : "最も人気",
    "settings.recipes.nothingFound" : "����ん��検索ワード�該当�るサービス�見��り��ん���。",
    "settings.recipes.servicesSuccessfulAddedInfo" : "サービス�追加�れ���",
+   "settings.searchService" : "サービスを検索",
    "settings.service.error.goBack" : "サービス�戻る",
    "settings.service.error.headline" : "エラー",
    "settings.service.error.message" : "サービス�レシピを読�込���ん���。",
@@ -110,9 +119,16 @@
    "settings.service.form.customUrlValidationError" : "独自サー�ー{name}を検証����ん���。",
    "settings.service.form.deleteButton" : "サービス�削除",
    "settings.service.form.editServiceHeadline" : "{name}を編集",
-   "settings.service.form.enableAudio" : "オーディオ�有効化",
+   "settings.service.form.enableAudio" : "オーディオを有効��る",
+   "settings.service.form.enableBadge" : "未読件数�通知�ッジを表示�る",
    "settings.service.form.enableNotification" : "通知を有効��る",
    "settings.service.form.enableService" : "サービスを有効��る",
+   "settings.service.form.headlineBadges" : "未読件数�通知�ッジ",
+   "settings.service.form.headlineGeneral" : "一般",
+   "settings.service.form.headlineNotifications" : "通知メッセージ",
+   "settings.service.form.icon" : "カスタム アイコン",
+   "settings.service.form.iconDelete" : "削除",
+   "settings.service.form.iconUpload" : "���画�をドロップ�る��クリック��下��",
    "settings.service.form.indirectMessageInfo" : "@username�@channel�@here�������ャン�ル内�����新�メッセージ����通知�れ��。",
    "settings.service.form.indirectMessages" : "����新�メッセージ�����ッジを表示�る",
    "settings.service.form.isMutedInfo" : "無効化�れ��る場��全��通知音やオーディオ�生�無音��り��",
@@ -121,6 +137,7 @@
    "settings.service.form.tabHosted" : "ホスト",
    "settings.service.form.tabOnPremise" : "セルフホスト ��",
    "settings.service.form.team" : "�ーム",
+   "settings.service.form.useHostedService" : "ホスト�れ�サービス {name} を使用�る。",
    "settings.service.form.yourServices" : "利用中�サービス",
    "settings.services.deletedInfo" : "サービス�削除�れ���",
    "settings.services.discoverServices" : "サービスを探�",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "姓",
    "settings.user.form.newPassword" : "新��パスワード",
    "sidebar.addNewService" : "サービスを追加",
-   "sidebar.mute" : "オーディオ�無効化",
+   "sidebar.muteApp" : "通知�オーディオを無効化",
    "sidebar.settings" : "設定",
-   "sidebar.unmute" : "オーディオ�有効化",
+   "sidebar.unmuteApp" : "通知�オーディオを有効化",
    "signup.company.label" : "法人",
    "signup.email.label" : "メールアドレス",
    "signup.emailDuplicate" : "��メールアドレス�既�登録�れ����",
@@ -182,7 +199,7 @@
    "tabs.item.disableNotifications" : "通知を無効��る",
    "tabs.item.disableService" : "サービスを無効��る",
    "tabs.item.edit" : "編集",
-   "tabs.item.enableAudio" : "オーディオ�有効化",
+   "tabs.item.enableAudio" : "オーディオを有効��る",
    "tabs.item.enableNotification" : "通知を有効��る",
    "tabs.item.enableService" : "サービスを有効��る",
    "tabs.item.reload" : "�読�込�",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 30337cc61..434e885a4 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "თქვენ �რ ხ�რთ ინტერნეტთ�ნ დ�კ�ვშირებული.",
    "import.headline" : "შემ�იტ�ნე Franz 4-ის სერვისები",
    "import.notSupportedHeadline" : "სერვისები ჯერ �რ �რის მხ�რდ�ჭერილი Franz 5-ში",
-   "import.skip.label" : "მსურს სერვისების ხელით დ�მ�ტებ�",
+   "import.skip.label" : "I want to add services manually",
    "import.submit.label" : "მ�წვევის გ�გზ�ვნ�",
    "infobar.buttonChangelog" : "What is new?",
    "infobar.buttonInstallUpdate" : "გ�დ�ტვირთეთ დ� დ��ყენეთ გ�ნ�ხლებ�",
@@ -48,8 +48,12 @@
    "settings.account.accountType.basic" : "ძირით�დი �ნგ�რიში",
    "settings.account.accountType.premium" : "პრემიუმ მხ�რდ�მჭერის �ნგ�რიში",
    "settings.account.buttonSave" : "პრ�ფილის გ�ნ�ხლებ�",
+   "settings.account.deleteAccount" : "Delete account",
+   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
    "settings.account.headline" : "�ნგ�რიში",
    "settings.account.headlineAccount" : "�ნგ�რიშის ინფ�რმ�ცი�",
+   "settings.account.headlineDangerZone" : "Danger Zone",
    "settings.account.headlineInvoices" : "ინვ�ისები",
    "settings.account.headlinePassword" : "პ�რ�ლის შეცვლ�",
    "settings.account.headlineProfile" : "პრ�ფილის გ�ნ�ხლებ�",
@@ -64,8 +68,10 @@
    "settings.account.successInfo" : "თქვენი ცვლილებები შენ�ხული�",
    "settings.account.tryReloadUserInfoRequest" : "სც�დეთ ხელ�ხლ�",
    "settings.account.userInfoRequestFailed" : "მ�მხმ�რებლის ინფ�რმ�ციის ჩ�ტვირთვ� ვერ მ�ხერხდ�",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "გ�დ�ტვირთეთ დ� დ��ყენეთ გ�ნ�ხლებ�",
    "settings.app.buttonSearchForUpdate" : "გ�ნ�ხლებების შემ�წმებ�",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "�მჟ�მინდელი ვერსი�:",
    "settings.app.form.autoLaunchInBackground" : "გ�ხსენით ფ�ნზე",
    "settings.app.form.autoLaunchOnStart" : "გ�ეშვ�ს Franz სისტემის ჩ�ტვირთვის�ს",
@@ -76,6 +82,7 @@
    "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.headline" : "პ�რ�მეტრები",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -83,6 +90,7 @@
    "settings.app.headlineLanguage" : "ენ�",
    "settings.app.headlineUpdates" : "გ�ნ�ხლებები",
    "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
    "settings.app.updateStatusAvailable" : "გ�ნ�ხლებ� ხელმის�წვდ�მი�, იწყებ� გ�დმ�წერ�...",
    "settings.app.updateStatusSearching" : "მიმდინ�რე�ბს გ�ნ�ხლების ძიებ�",
@@ -99,6 +107,7 @@
    "settings.recipes.mostPopular" : "ყველ�ზე პ�პულ�რული",
    "settings.recipes.nothingFound" : "უკ�ცრ�ვ�დ, მ�გრ�მ �რცერთი სერვისი �რ შეეს�ბ�მებ� თქვენს ძიებ�ს.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "სერვისი წ�რმ�ტებით დ�ემ�ტ�",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "სერვისებში დ�ბრუნებ�",
    "settings.service.error.headline" : "შეცდ�მ�",
    "settings.service.error.message" : "სერვისის ჩ�ტვირთვ� ვერ მ�ხერხდ�.",
@@ -111,8 +120,15 @@
    "settings.service.form.deleteButton" : "სერვისის წ�შლ�",
    "settings.service.form.editServiceHeadline" : "შე�სწ�რე {name}",
    "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "შეტყ�ბინებების ჩ�რთვ�",
    "settings.service.form.enableService" : "სერვისის ჩ�რთვ�",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "მთ�ვ�რი",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "თქვენ მიიღებთ შეტყ�ბინებ�ს ყ�ველი �ხ�ლი შეტყ�ბინების�ს �რხზე, �რ�მ�რტ� @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "�ჩვენე შეტყ�ბინებების ნიშ�ნი ყ�ველი �ხ�ლი შეტყ�ბინებისთვის",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -121,6 +137,7 @@
    "settings.service.form.tabHosted" : "დ�ჰ�სტილი",
    "settings.service.form.tabOnPremise" : "თვით დ�ჰ�სტილი ��",
    "settings.service.form.team" : "გუნდი",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "თქვენი სერვისები",
    "settings.services.deletedInfo" : "სერვისი წ�იშ�ლ�",
    "settings.services.discoverServices" : "�ღმ��ჩინეთ სერვისები",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "Last Name",
    "settings.user.form.newPassword" : "�ხ�ლი პ�რ�ლი",
    "sidebar.addNewService" : "Add new service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Disable notifications & audio",
    "sidebar.settings" : "პ�რ�მეტრები",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Enable notifications & audio",
    "signup.company.label" : "კ�მპ�ნი�",
    "signup.email.label" : "მეილი",
    "signup.emailDuplicate" : "მ�მხმ�რებელი �მ მეილით უკვე �რსებ�ბს",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 70ae4467e..69ffca6e2 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -3,7 +3,7 @@
    "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
    "import.headline" : "Importeer je Franz 4 services",
    "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
-   "import.skip.label" : "Ik wil handmatig een service toevoegen",
+   "import.skip.label" : "I want to add services manually",
    "import.submit.label" : "Importeer services",
    "infobar.buttonChangelog" : "What is new?",
    "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
@@ -48,8 +48,12 @@
    "settings.account.accountType.basic" : "Basis Account",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Profiel aanpassen",
+   "settings.account.deleteAccount" : "Delete account",
+   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Account informatie",
+   "settings.account.headlineDangerZone" : "Danger Zone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
    "settings.account.headlineProfile" : "Profiel aanpassen",
@@ -64,8 +68,10 @@
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
@@ -76,6 +82,7 @@
    "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" : "Display disabled services tabs",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Show unread message badge when notifications are disabled",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Advanced",
    "settings.app.headlineAppearance" : "Appearance",
@@ -83,6 +90,7 @@
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Changes require restart",
+   "settings.app.subheadlineCache" : "Cache",
    "settings.app.translationHelp" : "Help us to translate Franz into your language.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
@@ -99,6 +107,7 @@
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Sorry, maar geen enkele service kwam overeen met je zoekterm.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Terug naar de services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon het service-recept niet laden.",
@@ -111,8 +120,15 @@
    "settings.service.form.deleteButton" : "Service verwijderen",
    "settings.service.form.editServiceHeadline" : "{name} aanpassen",
    "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Notificaties aanzetten",
    "settings.service.form.enableService" : "Service aanzetten",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Algemeen",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Je wordt verwittigd over alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichten-badge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -121,6 +137,7 @@
    "settings.service.form.tabHosted" : "Gehost",
    "settings.service.form.tabOnPremise" : "Intern gehost ��",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service werd verwijderd",
    "settings.services.discoverServices" : "Services ontdekken",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
    "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Disable notifications & audio",
    "sidebar.settings" : "Instellingen",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Enable notifications & audio",
    "signup.company.label" : "Bedrijf",
    "signup.email.label" : "E-mailadres",
    "signup.emailDuplicate" : "Er bestaat reeds een gebruiker met dat e-mailadres",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index a78a08878..499f4d784 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,21 +1,21 @@
 {
    "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
-   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
-   "import.headline" : "Importeer je Franz 4 services",
+   "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
+   "import.headline" : "Importeer uw Franz 4 services",
    "import.notSupportedHeadline" : "De volgende services worden nog niet ondersteund in Franz 5",
-   "import.skip.label" : "Ik wil handmatig een service toevoegen",
+   "import.skip.label" : "Ik wil services handmatig toevoegen",
    "import.submit.label" : "Importeer services",
-   "infobar.buttonChangelog" : "What is new?",
-   "infobar.buttonInstallUpdate" : "Start opnieuw op & installeer de update",
+   "infobar.buttonChangelog" : "Wat is er nieuw?",
+   "infobar.buttonInstallUpdate" : "Opnieuw opstarten & update installeren",
    "infobar.buttonReloadServices" : "Herlaad de services",
    "infobar.requiredRequestsFailed" : "Kan de services en gebruikers informatie niet laden",
-   "infobar.servicesUpdated" : "Je services zijn geüpdatet.",
+   "infobar.servicesUpdated" : "Je services zijn bijgewerkt.",
    "infobar.updateAvailable" : "Een nieuwe update voor Franz is beschikbaar.",
    "invite.email.label" : "E-mailadres",
    "invite.headline.friends" : "Nodig 3 van je vrienden of collega's uit",
    "invite.name.label" : "Naam",
    "invite.skip.label" : "Ik wil dit later doen",
-   "invite.submit.label" : "Verzend uitnodigingen",
+   "invite.submit.label" : "Uitnodigingen verzenden",
    "login.email.label" : "E-mailadres",
    "login.headline" : "Inloggen",
    "login.invalidCredentials" : "E-mailadres of wachtwoord ongeldig",
@@ -37,22 +37,26 @@
    "pricing.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
    "pricing.support.label" : "Selecteer je ondersteuningsplan",
    "service.crashHandler.action" : "{name} herladen",
-   "service.crashHandler.autoReload" : "Probeer {name} te herstellen over {seconds} seconden",
+   "service.crashHandler.autoReload" : "Ga proberen om {name} te herstellen over {seconds} seconden",
    "service.crashHandler.headline" : "Oh nee!",
    "service.crashHandler.text" : "{name} heeft voor een fout gezorgd.",
    "service.disabledHandler.action" : "Activeer {name}",
    "service.disabledHandler.headline" : "{name} is uitgeschakeld",
-   "services.getStarted" : "Beginnen",
+   "services.getStarted" : "Begin",
    "services.welcome" : "Welkom bij Franz",
    "settings.account.account.editButton" : "Bewerk account",
    "settings.account.accountType.basic" : "Basis Account",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Update profiel",
+   "settings.account.deleteAccount" : "Verwijder account",
+   "settings.account.deleteEmailSent" : "Je hebt een e-mail ontvangen met een link om de aanvraag tot verwijderen van het account te bevestigen. Je accountgegevens en -data kunnen niet worden teruggehaald!",
+   "settings.account.deleteInfo" : "Wanneer je je Franz account niet langer wilt gebruiken, kan je je account en alle gerelateerde data hier verwijderen.",
    "settings.account.headline" : "Account",
    "settings.account.headlineAccount" : "Account informatie",
+   "settings.account.headlineDangerZone" : "Gevarenzone",
    "settings.account.headlineInvoices" : "Facturen",
    "settings.account.headlinePassword" : "Wijzig wachtwoord",
-   "settings.account.headlineProfile" : "Update profiel",
+   "settings.account.headlineProfile" : "Profiel bijwerken",
    "settings.account.headlineSubscription" : "Je abonnement",
    "settings.account.headlineUpgrade" : "Upgrade je account & ondersteun Franz",
    "settings.account.invoiceDownload" : "Download",
@@ -64,8 +68,10 @@
    "settings.account.successInfo" : "Je wijzigingen zijn opgeslagen",
    "settings.account.tryReloadUserInfoRequest" : "Probeer opnieuw",
    "settings.account.userInfoRequestFailed" : "Kon gebruikerinformatie niet laden",
+   "settings.app.buttonClearAllCache" : "Cache legen",
    "settings.app.buttonInstallUpdate" : "Herstart & installeer update",
    "settings.app.buttonSearchForUpdate" : "Controleer op updates",
+   "settings.app.cacheInfo" : "De Franz cache gebruikt op dit moment {size} schijfruimte.",
    "settings.app.currentVersion" : "Huidige versie:",
    "settings.app.form.autoLaunchInBackground" : "Open op de achtergrond",
    "settings.app.form.autoLaunchOnStart" : "Lanceer Franz bij opstarten",
@@ -76,6 +82,7 @@
    "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" : "Laat uitgeschakelde services zien",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
    "settings.app.headline" : "Instellingen",
    "settings.app.headlineAdvanced" : "Geavanceerd",
    "settings.app.headlineAppearance" : "Weergave",
@@ -83,7 +90,8 @@
    "settings.app.headlineLanguage" : "Taal",
    "settings.app.headlineUpdates" : "Updates",
    "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
    "settings.app.updateStatusAvailable" : "Update beschikbaar, downloaden...",
    "settings.app.updateStatusSearching" : "Zoekt naar updates",
    "settings.app.updateStatusUpToDate" : "Je gebruikt de laatste versie van Franz",
@@ -95,32 +103,41 @@
    "settings.recipes.all" : "Alle services",
    "settings.recipes.dev" : "Ontwikkeling",
    "settings.recipes.headline" : "Beschikbare services",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Mist er een dienst?",
    "settings.recipes.mostPopular" : "Meest populair",
    "settings.recipes.nothingFound" : "Geen service kwam overeen met je zoekopdracht.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Service succesvol toegevoegd",
+   "settings.searchService" : "Zoek service",
    "settings.service.error.goBack" : "Terug naar services",
    "settings.service.error.headline" : "Fout",
    "settings.service.error.message" : "Kon servicerecept niet laden.",
    "settings.service.form.addServiceHeadline" : "Toevoegen {name}",
    "settings.service.form.availableServices" : "Beschikbare services",
-   "settings.service.form.customUrl" : "Custom server",
+   "settings.service.form.customUrl" : "Aangepaste server",
    "settings.service.form.customUrlPremiumInfo" : "Om zelf-gehoste services toe te kunnen voegen, heb je een Franz Premium Supporter Account nodig.",
    "settings.service.form.customUrlUpgradeAccount" : "Upgrade je account",
-   "settings.service.form.customUrlValidationError" : "Kon custom server {name} niet valideren.",
+   "settings.service.form.customUrlValidationError" : "Kon aangepaste server {name} niet valideren.",
    "settings.service.form.deleteButton" : "Verwijder service",
    "settings.service.form.editServiceHeadline" : "Bewerk {name}",
    "settings.service.form.enableAudio" : "Audio inschakelen",
+   "settings.service.form.enableBadge" : "Toon badges met ongelezen berichten",
    "settings.service.form.enableNotification" : "Meldingen inschakelen",
    "settings.service.form.enableService" : "Service inschakelen",
+   "settings.service.form.headlineBadges" : "Ongelezen berichten badges",
+   "settings.service.form.headlineGeneral" : "Algemeen",
+   "settings.service.form.headlineNotifications" : "Meldingen",
+   "settings.service.form.icon" : "Aangepast icoon",
+   "settings.service.form.iconDelete" : "Verwijderen",
+   "settings.service.form.iconUpload" : "Sleep je afbeelding, of klik hier",
    "settings.service.form.indirectMessageInfo" : "Je ontvangt meldingen van alle nieuwe berichten in een kanaal, niet alleen @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Toon berichtenbadge voor alle nieuwe berichten",
    "settings.service.form.isMutedInfo" : "Indien uitgeschakeld zullen alle meldinggeluiden en afgespeelde audio uitgeschakeld zijn",
    "settings.service.form.name" : "Naam",
    "settings.service.form.saveButton" : "Opslaan service",
    "settings.service.form.tabHosted" : "Gehost",
-   "settings.service.form.tabOnPremise" : "Zelf-gehost *",
+   "settings.service.form.tabOnPremise" : "Zelf-gehost ��",
    "settings.service.form.team" : "Team",
+   "settings.service.form.useHostedService" : "Gebruik de gehoste service {name}",
    "settings.service.form.yourServices" : "Jouw services",
    "settings.services.deletedInfo" : "Service is verwijderd",
    "settings.services.discoverServices" : "Ontdek services",
@@ -134,15 +151,15 @@
    "settings.user.form.accountType.individual" : "Individueel",
    "settings.user.form.accountType.label" : "Account type",
    "settings.user.form.accountType.non-profit" : "Non-Profit",
-   "settings.user.form.currentPassword" : "Huidig wachtwoord",
+   "settings.user.form.currentPassword" : "Huidige wachtwoord",
    "settings.user.form.email" : "E-mailadres",
    "settings.user.form.firstname" : "Voornaam",
    "settings.user.form.lastname" : "Achternaam",
    "settings.user.form.newPassword" : "Nieuw wachtwoord",
    "sidebar.addNewService" : "Service toevoegen",
-   "sidebar.mute" : "Audio uitschakelen",
+   "sidebar.muteApp" : "Uitschakelen berichten & geluid",
    "sidebar.settings" : "Instellingen",
-   "sidebar.unmute" : "Audio inschakelen",
+   "sidebar.unmuteApp" : "Inschakelen berichten & geluid",
    "signup.company.label" : "Bedrijf",
    "signup.email.label" : "E-mailadres",
    "signup.emailDuplicate" : "Er bestaat al een gebruiker met dat e-mailadres",
@@ -154,7 +171,7 @@
    "signup.legal.terms" : "Gebruiksvoorwaarden",
    "signup.link.login" : "Al een account? Log in!",
    "signup.password.label" : "Wachtwoord",
-   "signup.submit.label" : "Maak een nieuw account aan",
+   "signup.submit.label" : "Account aanmaken",
    "subscription.euTaxInfo" : "Bewoners binnen EU: lokale belasting kan van toepassing zijn",
    "subscription.features.ads" : "Geen advertenties, nooit!",
    "subscription.features.comingSoon" : "komt binnenkort",
@@ -166,7 +183,7 @@
    "subscription.mining.experimental" : "experimenteel",
    "subscription.mining.headline" : "Hoe werkt dit?",
    "subscription.mining.line1" : "Door \"Ondersteun met rekenkracht\" te activeren, zal Franz ongeveer 20-50% van je CPU gebruiken om de cryptomunt Monero te minen, wat overeenkomt met ongeveer $ 5\/jaar.",
-   "subscription.mining.line2" : "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij niet leegloopt of dat jij en je werk afgeremd wordt.",
+   "subscription.mining.line2" : "We zullen het CPU-gebruik aanpassen aan je gebruik en daarmee voorkomen dat de batterij leegloopt of dat jij en je werk worden afgeremd.",
    "subscription.mining.line3" : "Zolang de miner actief is, heb je onbeperkt toegang tot alle Franz Premium Supporter Features.",
    "subscription.mining.moreInformation" : "Verkrijg meer informatie over dit plan.",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 67657155f..85b8cf497 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
    "import.headline" : "Importuj usługi Franz 4",
    "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
-   "import.skip.label" : "Chcę ręcznie dodać usługi",
+   "import.skip.label" : "Chcę dodać usługi samodzielnie",
    "import.submit.label" : "Zaimportuj usługi",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Co nowego?",
    "infobar.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizacjÄ™",
    "infobar.buttonReloadServices" : "Załaduj ponownie usługi",
    "infobar.requiredRequestsFailed" : "Nie można załadować usług i informacji użytkownika",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Nie chcę wspierać rozwoju aplikacji Franz.",
    "pricing.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
    "pricing.support.label" : "Wybierz swój plan wsparcia",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Przeładuj {name}",
+   "service.crashHandler.autoReload" : "Próba automatycznego odnowienia {name} za {seconds} sekund\/y",
+   "service.crashHandler.headline" : "O nie!",
+   "service.crashHandler.text" : "{name} spowodował problem.",
+   "service.disabledHandler.action" : "Dostępny {name}",
+   "service.disabledHandler.headline" : "{name} jest wyłączony",
    "services.getStarted" : "Zacznij",
    "services.welcome" : "Witaj w programie Franz",
    "settings.account.account.editButton" : "Modyfikuj konta",
    "settings.account.accountType.basic" : "Podstawowe konto",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Uaktualnij profil",
+   "settings.account.deleteAccount" : "Usuń konto",
+   "settings.account.deleteEmailSent" : "Wysłaliśmy email z linkiem do potwierdzenia usunięcia konta. Konto oraz dane są usuwane trwale i nie można tego cofnąć!",
+   "settings.account.deleteInfo" : "Jeżeli nie potrzebujesz już konta Franz, możesz je usunąć oraz wszystkie dane na nim zapisane.",
    "settings.account.headline" : "Konto",
    "settings.account.headlineAccount" : "Informacje o koncie",
+   "settings.account.headlineDangerZone" : "Niebezpieczna strefa",
    "settings.account.headlineInvoices" : "Faktury",
    "settings.account.headlinePassword" : "Zmień hasło",
    "settings.account.headlineProfile" : "Uaktualnij profil",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "Twoje zmiany zostały zapisane",
    "settings.account.tryReloadUserInfoRequest" : "Spróbuj ponownie",
    "settings.account.userInfoRequestFailed" : "Nie można wczytać informacji o użytkowniku",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Uruchom ponownie i zainstaluj aktualizacjÄ™",
    "settings.app.buttonSearchForUpdate" : "Sprawdź aktualizacje",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Aktualna wersja:",
    "settings.app.form.autoLaunchInBackground" : "Otwórz w tle",
    "settings.app.form.autoLaunchOnStart" : "Uruchom Franz na poczÄ…tku",
    "settings.app.form.beta" : "Uwzględnij wersje beta",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "WÅ‚Ä…cz sprawdzanie pisowni",
    "settings.app.form.enableSystemTray" : "Pokaż Franza w tacy systemowej",
    "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" : "Display disabled services tabs",
+   "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.headline" : "Ustawienia",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Zaawansowane",
+   "settings.app.headlineAppearance" : "WyglÄ…d",
    "settings.app.headlineGeneral" : "Ogólne",
    "settings.app.headlineLanguage" : "Język",
    "settings.app.headlineUpdates" : "Aktualizacje",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Zmiany. wymagajÄ… ponownego uruchomienia",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
    "settings.app.updateStatusAvailable" : "Dostępna aktualizacja, pobieram...",
    "settings.app.updateStatusSearching" : "Szukam aktualizacji",
    "settings.app.updateStatusUpToDate" : "Używasz najnowszej wersji aplikacji Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Wszystkie usługi",
    "settings.recipes.dev" : "Rozwojowe",
    "settings.recipes.headline" : "Dostępne usługi",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Brak usługi?",
    "settings.recipes.mostPopular" : "Najpopularniejsze",
    "settings.recipes.nothingFound" : "Żadna usługa nie została znaleziona.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Usługa została dodana pomyślnie",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Wróć do usług",
    "settings.service.error.headline" : "BÅ‚Ä…d",
    "settings.service.error.message" : "Nie można wczytać przepisu usługi.",
@@ -110,39 +119,47 @@
    "settings.service.form.customUrlValidationError" : "Nie można zweryfikować spersonalizowanego {name} serwera.",
    "settings.service.form.deleteButton" : "Usuń usługę",
    "settings.service.form.editServiceHeadline" : "Edytuj {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Włącz dźwięk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Aktywuj powiadomienia",
    "settings.service.form.enableService" : "Aktywuj usługę",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Ogólne",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Będziesz informowany o wszystkich nowych wiadomościach na kanale, nie tylko @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Pokaż ikonę wiadomości dla wszystkich nowych wiadomości",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
    "settings.service.form.name" : "Nazwa",
    "settings.service.form.saveButton" : "Zapisz usługę",
    "settings.service.form.tabHosted" : "Hostowane",
    "settings.service.form.tabOnPremise" : "Hostowane lokalnie ��",
    "settings.service.form.team" : "Zespół",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Twoje usługi",
    "settings.services.deletedInfo" : "Usługa została usunięta",
    "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.tooltip.isDisabled" : "Usługa jest nieaktywna",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
    "settings.services.tooltip.notificationsDisabled" : "Powiadomienia sÄ… nieaktywne",
    "settings.services.updatedInfo" : "Zmiany zostały zapisane",
    "settings.user.form.accountType.company" : "Firma",
    "settings.user.form.accountType.individual" : "Prywatne",
    "settings.user.form.accountType.label" : "Typ konta",
-   "settings.user.form.accountType.non-profit" : "Non-Profit ",
+   "settings.user.form.accountType.non-profit" : "Non-profit",
    "settings.user.form.currentPassword" : "Obecne hasło",
    "settings.user.form.email" : "Adres email",
    "settings.user.form.firstname" : "ImiÄ™",
    "settings.user.form.lastname" : "Nazwisko",
    "settings.user.form.newPassword" : "Nowe hasło",
    "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
    "sidebar.settings" : "Ustawienia",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
    "signup.company.label" : "Firma",
    "signup.email.label" : "Adres email",
    "signup.emailDuplicate" : "Użytkownik z takim adresem email już istnieje",
@@ -155,7 +172,7 @@
    "signup.link.login" : "Masz już konto, zalogować się?",
    "signup.password.label" : "Hasło",
    "signup.submit.label" : "Stwórz konto",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "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.customServices" : "Prywatne usługi dla Ciebie i Twojego zespołu",
@@ -178,11 +195,11 @@
    "subscriptionPopup.buttonCancel" : "Anuluj",
    "subscriptionPopup.buttonDone" : "Zrobione",
    "tabs.item.deleteService" : "Usuń usługę",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Wyłącz dźwięk",
    "tabs.item.disableNotifications" : "Wyłącz powiadomienia",
    "tabs.item.disableService" : "Wyłącz usługę",
    "tabs.item.edit" : "Edytuj",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Włącz dźwięk ",
    "tabs.item.enableNotification" : "WÅ‚Ä…cz powiadomienia",
    "tabs.item.enableService" : "Aktywuj usługę",
    "tabs.item.reload" : "Przeładuj",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 5a20f387a..d32a09e48 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -5,7 +5,7 @@
    "import.notSupportedHeadline" : "Serviços ainda não suportados pelo Franz 5",
    "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "O que há de novo?",
    "infobar.buttonInstallUpdate" : "Reiniciar e instalar atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possível carregar serviços e informações do usuário",
@@ -22,7 +22,7 @@
    "login.link.password" : "Trocar a senha",
    "login.link.signup" : "Criar uma conta gratuita",
    "login.password.label" : "Senha",
-   "login.serverLogout" : "Sua sessão expirou, faça o login novamente.\",",
+   "login.serverLogout" : "Sua sessão expirou, faça o login novamente.",
    "login.submit.label" : "Login",
    "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
    "password.email.label" : "Endereço de email",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Eu não quero apoiar o desenvolvimento do Franz.",
    "pricing.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
    "pricing.support.label" : "Selecione seu plano de apoio",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Recarregar {name}",
+   "service.crashHandler.autoReload" : "Tentando restabelecer {name} automaticamente em {seconds} segundos",
+   "service.crashHandler.headline" : "Ah não!",
+   "service.crashHandler.text" : "{name} causou um erro.",
+   "service.disabledHandler.action" : "Habilitar {name}",
+   "service.disabledHandler.headline" : "{name} está desabilitado",
    "services.getStarted" : "Começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta Básica",
    "settings.account.accountType.premium" : "Conta Apoiador Premium",
    "settings.account.buttonSave" : "Atualizar perfil",
+   "settings.account.deleteAccount" : "Excluir conta",
+   "settings.account.deleteEmailSent" : "Você recebeu um e-mail com um link para confirmar a exclusão da sua conta. Sua conta e os dados não podem ser restaurados!",
+   "settings.account.deleteInfo" : "Se você não precisar de sua conta Franz por mais tempo, você pode excluir sua conta e todos os dados relacionados aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informações de conta",
+   "settings.account.headlineDangerZone" : "Zona de Perigo",
    "settings.account.headlineInvoices" : "Recibos",
    "settings.account.headlinePassword" : "Mudar senha",
    "settings.account.headlineProfile" : "Atualizar perfil",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "Suas mudanças foram salvas",
    "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",
    "settings.app.buttonInstallUpdate" : "Reiniciar & instalar atualização",
    "settings.app.buttonSearchForUpdate" : "Verificar por atualizações",
+   "settings.app.cacheInfo" : "O cache do franz está usando atualmente {size} do espaço em disco.",
    "settings.app.currentVersion" : "Versão atual:",
    "settings.app.form.autoLaunchInBackground" : "Abrir no fundo",
-   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz iniciar o sistema",
+   "settings.app.form.autoLaunchOnStart" : "Abrir o Franz ao iniciar o sistema",
    "settings.app.form.beta" : "Incluir versões beta",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "Habilitar correção ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
    "settings.app.form.language" : "Idioma",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz no fundo quando fechar a janela",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Mostrar abas de serviços desabilitados",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Mostrar o ícone da mensagem não lida quando as notificações estão desativadas",
    "settings.app.headline" : "Ajustes",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Avançado",
+   "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Reinicialização necessária",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para a sua língua.",
    "settings.app.updateStatusAvailable" : "Atualização disponível, fazendo download...",
    "settings.app.updateStatusSearching" : "Em busca de atualização",
    "settings.app.updateStatusUpToDate" : "Você está usando a última versão do Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Todos serviços",
    "settings.recipes.dev" : "Desenvolvimento ",
    "settings.recipes.headline" : "Serviços disponíveis",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Sentiu falta de um serviço?",
    "settings.recipes.mostPopular" : "Mais populares",
    "settings.recipes.nothingFound" : "Desculpe, mas nenhum serviço corresponde a sua pesquisa.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado com sucesso",
+   "settings.searchService" : "Serviço de pesquisa",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
    "settings.service.error.message" : "Não foi possível carregar a receita de serviço.",
@@ -110,25 +119,33 @@
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor personalizado {name}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
-   "settings.service.form.enableNotification" : "Ativar notificações",
-   "settings.service.form.enableService" : "Ativar serviço",
+   "settings.service.form.enableAudio" : "Habilitar áudio",
+   "settings.service.form.enableBadge" : "Mostrar aviso de mensagens não lidas",
+   "settings.service.form.enableNotification" : "Habilitar notificações",
+   "settings.service.form.enableService" : "Habilitar serviço",
+   "settings.service.form.headlineBadges" : "Mensagens não lidas",
+   "settings.service.form.headlineGeneral" : "Geral",
+   "settings.service.form.headlineNotifications" : "Notificações",
+   "settings.service.form.icon" : "�cone personalizado",
+   "settings.service.form.iconDelete" : "Excluir",
+   "settings.service.form.iconUpload" : "Solte sua imagem, ou clique aqui",
    "settings.service.form.indirectMessageInfo" : "Você será notificado por todas as mensagens em um canal, não apenas @usuário, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar avisos para todas as mensagens",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Quando desabilitado, todas as notificações sonoras e áudios são nulas",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Salvar serviço",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Auto-hospedado ��",
    "settings.service.form.team" : "Equipe",
+   "settings.service.form.useHostedService" : "Use o serviço {nome} hospedado.",
    "settings.service.form.yourServices" : "Seus serviços",
    "settings.services.deletedInfo" : "Serviço apagado",
    "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.tooltip.isDisabled" : "Serviço desativado",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
-   "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
+   "settings.services.tooltip.isDisabled" : "Serviço desabilitado",
+   "settings.services.tooltip.isMuted" : "Sem som",
+   "settings.services.tooltip.notificationsDisabled" : "Notificações desabilitadas",
    "settings.services.updatedInfo" : "Suas mudanças foram salvas",
    "settings.user.form.accountType.company" : "Empresa",
    "settings.user.form.accountType.individual" : "Individual",
@@ -140,9 +157,9 @@
    "settings.user.form.lastname" : "Sobrenome",
    "settings.user.form.newPassword" : "Nova senha",
    "sidebar.addNewService" : "Adicionar novo serviço",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Desativar notificações e áudio",
    "sidebar.settings" : "Ajustes",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Ativar notificações e áudio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Endereço de email",
    "signup.emailDuplicate" : "Um usuário com esta conta já existe",
@@ -155,7 +172,7 @@
    "signup.link.login" : "Já tem uma conta. Fazer login?",
    "signup.password.label" : "Senha",
    "signup.submit.label" : "Criar conta",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Residentes na União Européia: taxas locais serão aplicadas",
    "subscription.features.ads" : "Sem anúncios, sempre!",
    "subscription.features.comingSoon" : "em breve",
    "subscription.features.customServices" : "Serviços privados para você e sua equipe",
@@ -178,13 +195,13 @@
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Feito",
    "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Disable audio",
-   "tabs.item.disableNotifications" : "Desativar notificações",
-   "tabs.item.disableService" : "Desativar serviço",
+   "tabs.item.disableAudio" : "Desabilitar áudio",
+   "tabs.item.disableNotifications" : "Desabilitar notificações",
+   "tabs.item.disableService" : "Desabilitar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Enable audio",
-   "tabs.item.enableNotification" : "Ativar notificações",
-   "tabs.item.enableService" : "Ativar serviço",
+   "tabs.item.enableAudio" : "Habilitar áudio",
+   "tabs.item.enableNotification" : "Habilitar notificações",
+   "tabs.item.enableService" : "Habilitar o serviço",
    "tabs.item.reload" : "Recarregar",
    "welcome.loginButton" : "Fazer login na sua conta",
    "welcome.signupButton" : "Criar uma conta grátis",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index dc776c1ad..b8aec56a1 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Não estás conectado à internet.",
    "import.headline" : "Importar os teus 4 serviços Franz",
    "import.notSupportedHeadline" : "Os serviços não são suportados no Franz 5",
-   "import.skip.label" : "Quero adicionar os serviços manualmente",
+   "import.skip.label" : "Quero adicionar serviços manualmente",
    "import.submit.label" : "Importar serviços",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Novidades?",
    "infobar.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possivel carregar os serviços e informações do utilizador",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Não quero ajudar no desenvolvimento do Franz",
    "pricing.submit.label" : "Quero ajudar o desenvolvimento do Franz",
    "pricing.support.label" : "Seleciona o teu plano",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Actualizar",
+   "service.crashHandler.autoReload" : "A tentar restaurar automaticamente {name} em {seconds} seconds",
+   "service.crashHandler.headline" : "Oh não!",
+   "service.crashHandler.text" : "{name} causou um erro.",
+   "service.disabledHandler.action" : "Habilitar {name}",
+   "service.disabledHandler.headline" : "{name} está desactivado",
    "services.getStarted" : "Vamos começar",
    "services.welcome" : "Bem-vindo ao Franz",
    "settings.account.account.editButton" : "Editar conta",
    "settings.account.accountType.basic" : "Conta básica",
    "settings.account.accountType.premium" : "Conta Premium, a ajudar o Franz",
    "settings.account.buttonSave" : "Atualizar o perfil",
+   "settings.account.deleteAccount" : "Apagar conta",
+   "settings.account.deleteEmailSent" : "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não são possiveis de restaurar!",
+   "settings.account.deleteInfo" : "Se não precisa mais da sua conta Franz, pode apagar a conta e os seus dados aqui.",
    "settings.account.headline" : "Conta",
    "settings.account.headlineAccount" : "Informação da conta",
+   "settings.account.headlineDangerZone" : "Zona de perigo",
    "settings.account.headlineInvoices" : "Faturas",
    "settings.account.headlinePassword" : "Mudar password",
    "settings.account.headlineProfile" : "Actualizar o perfil",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "As tuas mudanças foram feitas com sucesso",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador.",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Reiniciar & Instalar Atualizações",
    "settings.app.buttonSearchForUpdate" : "Procurar por atualizações",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Versão atual",
    "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano",
    "settings.app.form.autoLaunchOnStart" : "Inicar o Franz quando inciar o computador",
    "settings.app.form.beta" : "Incluir versões instáveis (beta)",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "Ativar verificação ortográfica",
    "settings.app.form.enableSystemTray" : "Mostrar o Franz na bandeja do sistema",
    "settings.app.form.language" : "Idioma:",
    "settings.app.form.minimizeToSystemTray" : "Minimizar o Franz para a bandeja do sistema",
    "settings.app.form.runInBackground" : "Manter o Franz em segundo plano ao fechar a janela",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Apresentar separadores de serviços desactivados",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Apresentar icon com o número de mensagens não lidas quando as notificações estão desactivadas",
    "settings.app.headline" : "Definições",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Avançado",
+   "settings.app.headlineAppearance" : "Aparência",
    "settings.app.headlineGeneral" : "Geral",
    "settings.app.headlineLanguage" : "Idioma:",
    "settings.app.headlineUpdates" : "Atualizações",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Alterações requerem reiniciar",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Ajude a traduzir a Franz para a sua língua. ",
    "settings.app.updateStatusAvailable" : "Atualização disponivel, a descarregar...",
    "settings.app.updateStatusSearching" : "Está a procurar atualizações",
    "settings.app.updateStatusUpToDate" : "Estás a usar a última versão do Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Todos os serviços",
    "settings.recipes.dev" : "Desenvolvimento",
    "settings.recipes.headline" : "Serviços disponíveis",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "A faltar um serviço?",
    "settings.recipes.mostPopular" : "Os mais populares",
    "settings.recipes.nothingFound" : "Desculpa, mas não existe nenhum serviço com este termo.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Serviço adicionado",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Voltar aos serviços",
    "settings.service.error.headline" : "Erro",
    "settings.service.error.message" : "Não foi possível carregar a receita do serviço.",
@@ -110,24 +119,32 @@
    "settings.service.form.customUrlValidationError" : "Não foi possível validar o servidor {nome}.",
    "settings.service.form.deleteButton" : "Apagar serviço",
    "settings.service.form.editServiceHeadline" : "Editar {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Activar áudio",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Ativar notificações",
    "settings.service.form.enableService" : "Ativar serviço",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Geral",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Serás notificado sobre todas as novas mensagens de um canal, não só @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Mostrar o emblema da mensagem para todas as novas mensagens",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Quando desactivado, todo o audio das notificações estará em silêncio",
    "settings.service.form.name" : "Nome",
    "settings.service.form.saveButton" : "Guardar serviço",
    "settings.service.form.tabHosted" : "Hospedado",
    "settings.service.form.tabOnPremise" : "Hospedado por si próprio ��",
    "settings.service.form.team" : "Equipa",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Os teus serviços",
    "settings.services.deletedInfo" : "O serviço foi apagado",
    "settings.services.discoverServices" : "Descobrir serviços",
    "settings.services.headline" : "Os teus serviços",
    "settings.services.noServicesAdded" : "Ainda não adicionaste nenhum serviço.",
    "settings.services.tooltip.isDisabled" : "O serviço está desativado",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
    "settings.services.tooltip.notificationsDisabled" : "As notificações estão desabilitadas",
    "settings.services.updatedInfo" : "As alterações foram guardadas",
    "settings.user.form.accountType.company" : "Empresa",
@@ -136,26 +153,26 @@
    "settings.user.form.accountType.non-profit" : "Sem fins lucrativos",
    "settings.user.form.currentPassword" : "Password atual",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.firstname" : "Primeiro Nome",
+   "settings.user.form.lastname" : "Último Nome",
    "settings.user.form.newPassword" : "Nova password",
    "sidebar.addNewService" : "Adicionar um novo serviço",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Desactivar notificações e audio",
    "sidebar.settings" : "Definições",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Activar notificações e audio",
    "signup.company.label" : "Empresa",
    "signup.email.label" : "Endereço de e-mail",
    "signup.emailDuplicate" : "Uma conta já tem esse email associado",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Primeiro Nome",
    "signup.headline" : "Iniciar Sessão",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Último Nome",
    "signup.legal.info" : "Ao criar uma conta Franz, aceitas",
    "signup.legal.privacy" : "Declaração de privacidade",
    "signup.legal.terms" : "Termos de Serviço",
    "signup.link.login" : "Já tens uma conta?",
    "signup.password.label" : "Password",
    "signup.submit.label" : "Criar uma Conta",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Residentes EU: Taxas locais podem ser aplicadas",
    "subscription.features.ads" : "Sem anúncios, para sempre!",
    "subscription.features.comingSoon" : "Em breve!",
    "subscription.features.customServices" : "Serviços privados para ti e para os teus amigos\/colegas",
@@ -178,11 +195,11 @@
    "subscriptionPopup.buttonCancel" : "Cancelar",
    "subscriptionPopup.buttonDone" : "Concluído",
    "tabs.item.deleteService" : "Apagar serviço",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Desactivar audio",
    "tabs.item.disableNotifications" : "Desativar notificações",
    "tabs.item.disableService" : "Desativar serviço",
    "tabs.item.edit" : "Editar",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Activar áudio",
    "tabs.item.enableNotification" : "Ativar notificações",
    "tabs.item.enableService" : "Ativar serviço",
    "tabs.item.reload" : "Recarregar",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 62a8a0f84..8b1e75871 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,55 +1,59 @@
 {
    "global.api.unhealthy" : "�евозможно подключить�� к �ерви�ам Franz",
    "global.notConnectedToTheInternet" : "�ет Интернет-�оединени�",
-   "import.headline" : "Импортировать �ерви�ы Franz 4",
-   "import.notSupportedHeadline" : "Серви�ы еще не поддержаны в Franz 5",
-   "import.skip.label" : "Я хочу добавить �ерви�ы вручную",
+   "import.headline" : "Импортировать �ерви�ы из Franz 4",
+   "import.notSupportedHeadline" : "Серви�ы ещё не поддерживают�� в Franz 5",
+   "import.skip.label" : "Я хочу добавить �ерви� вручную",
    "import.submit.label" : "Импортировать �ерви�ы",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Что новенького?",
    "infobar.buttonInstallUpdate" : "Перезапу�тить и обновить",
    "infobar.buttonReloadServices" : "Перезагрузить �ерви�ы",
    "infobar.requiredRequestsFailed" : "�евозможно загрузить �ерви�ы и информацию пользовател�",
    "infobar.servicesUpdated" : "Ваши �ерви�ы были обновлены.",
    "infobar.updateAvailable" : "До�тупно обновление Franz.",
    "invite.email.label" : "Email адре�",
-   "invite.headline.friends" : "Пригла�ите 3х друзей или коллег",
+   "invite.headline.friends" : "Пригла�ите 3-х друзей или коллег",
    "invite.name.label" : "Им�",
    "invite.skip.label" : "Я �делаю �то позже",
    "invite.submit.label" : "Вы�лать приглашени�",
-   "login.email.label" : "Email адре�",
-   "login.headline" : "Реги�траци�",
+   "login.email.label" : "Email",
+   "login.headline" : "Вход",
    "login.invalidCredentials" : "�еправильный email или пароль",
    "login.link.password" : "Во��тановить пароль",
    "login.link.signup" : "Создать бе�платный аккаунт",
    "login.password.label" : "Пароль",
    "login.serverLogout" : "Се��и� у�тарела, пожалуй�та, войдите �нова.",
-   "login.submit.label" : "Реги�траци�",
+   "login.submit.label" : "Вход",
    "login.tokenExpired" : "Се��и� у�тарела, пожалуй�та, войдите �нова.",
    "password.email.label" : "Email адре�",
    "password.headline" : "Во��тановление парол�",
    "password.link.login" : "Вход",
    "password.link.signup" : "Создать аккаунт",
    "password.noUser" : "�е найдено пользовател� � таким email",
-   "password.submit.label" : "Отправить",
+   "password.submit.label" : "Во��тановить",
    "password.successInfo" : "Проверьте Ваш email",
    "pricing.headline" : "Поддержать Franz",
    "pricing.link.skipPayment" : "Я не хочу поддерживать разработку Franz.",
    "pricing.submit.label" : "Я хочу поддержать разработку Franz",
    "pricing.support.label" : "Выберите план поддержки",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Перезагрузить {name}",
+   "service.crashHandler.autoReload" : "Пытаю�ь автоматиче�ки во��тановить {name} в течение {seconds} �екунд",
+   "service.crashHandler.headline" : "О, нет!",
+   "service.crashHandler.text" : "{name} вызвало ошибку.",
+   "service.disabledHandler.action" : "Включить {name}",
+   "service.disabledHandler.headline" : "{name} выключено",
    "services.getStarted" : "�ачать работу",
    "services.welcome" : "Добро пожаловать во Franz",
    "settings.account.account.editButton" : "Редактировать аккаунт",
    "settings.account.accountType.basic" : "Базовый аккаунт",
    "settings.account.accountType.premium" : "Премиум аккаунт",
-   "settings.account.buttonSave" : "Сохранить изменени�",
+   "settings.account.buttonSave" : "Обновить профиль",
+   "settings.account.deleteAccount" : "Удалить аккаунт",
+   "settings.account.deleteEmailSent" : "Вам вы�лано пи�ьмо � ��ылкой дл� подтверждени� удалени� аккаунта. По�ле �того ваш аккаунт и данные не �могут быть во��тановлены!",
+   "settings.account.deleteInfo" : "Е�ли вам больше не нужна ваша учетна� запи�ь в Franz, вы можете удалить аккаунт и в�ю �в�занную � ней информацию.",
    "settings.account.headline" : "�ккаунт",
    "settings.account.headlineAccount" : "Информаци� аккаунта",
+   "settings.account.headlineDangerZone" : "Опа�на� Зона",
    "settings.account.headlineInvoices" : "Счета",
    "settings.account.headlinePassword" : "Сменить пароль",
    "settings.account.headlineProfile" : "Обновить профиль",
@@ -60,31 +64,35 @@
    "settings.account.mining.active" : "Вы выполн�ете {hashes} вычи�лений в �екунду.",
    "settings.account.mining.cancel" : "Отменить майнинг",
    "settings.account.mining.moreInformation" : "Больше информации",
-   "settings.account.mining.thankyou" : "Спа�ибо за поддержку Franz Вашими проце��орными мощно�т�ми.",
+   "settings.account.mining.thankyou" : "Благодарим ва� за поддержку Franz вашей вычи�лительной мощно�тью.",
    "settings.account.successInfo" : "Изменени� �охранены",
    "settings.account.tryReloadUserInfoRequest" : "Попробовать �нова",
    "settings.account.userInfoRequestFailed" : "�евозможно загрузить информацию пользовател�",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Перезапу�тить и обновить",
    "settings.app.buttonSearchForUpdate" : "Проверить обновлени�",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Текуща� вер�и�:",
    "settings.app.form.autoLaunchInBackground" : "Открывать в фоне",
    "settings.app.form.autoLaunchOnStart" : "Запу�кать Franz при �тарте",
    "settings.app.form.beta" : "Включа� бета вер�ии",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "Показывать Franz в трее",
+   "settings.app.form.enableSpellchecking" : "Включить проверку правопи�ани�",
+   "settings.app.form.enableSystemTray" : "Показывать Franz в �и�темном трее",
    "settings.app.form.language" : "Язык",
-   "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в трей",
+   "settings.app.form.minimizeToSystemTray" : "Сворачивать Franz в �и�темный трей",
    "settings.app.form.runInBackground" : "О�тавл�ть Franz в фоне при закрытии окна",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Показывать вкладки отключённых �лужб",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Показывать значок непрочитанного �ообщени� при отключённых уведомлени�х",
    "settings.app.headline" : "�а�тройки",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Дополнительно",
+   "settings.app.headlineAppearance" : "Внешний вид",
    "settings.app.headlineGeneral" : "Общие",
    "settings.app.headlineLanguage" : "Язык",
    "settings.app.headlineUpdates" : "Обновлени�",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
-   "settings.app.updateStatusAvailable" : "До�тупно обновление, загрука...",
+   "settings.app.restartRequired" : "Изменени� требуют перезагрузки приложени�",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Помогите нам переве�ти Franz на ваш �зык.",
+   "settings.app.updateStatusAvailable" : "До�тупно обновление, идёт загрузка...",
    "settings.app.updateStatusSearching" : "Пои�к обновлений",
    "settings.app.updateStatusUpToDate" : "Вы и�пользуете актуальную вер�ию Franz",
    "settings.navigation.account" : "�ккаунт",
@@ -95,39 +103,48 @@
    "settings.recipes.all" : "В�е �ерви�ы",
    "settings.recipes.dev" : "Разработка",
    "settings.recipes.headline" : "До�тупные �ерви�ы",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "�е можете найти �лужбу?",
    "settings.recipes.mostPopular" : "Попул�рные",
-   "settings.recipes.nothingFound" : "�ичего не найдено по Вашему запро�у.",
+   "settings.recipes.nothingFound" : "�ичего не найдено по вашему запро�у.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Серви� у�пешно добавлен",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Вернуть�� к �ерви�ам",
    "settings.service.error.headline" : "Ошибка",
    "settings.service.error.message" : "�евозможно загрузить рецепт �ерви�а.",
    "settings.service.form.addServiceHeadline" : "Добавление {name}",
    "settings.service.form.availableServices" : "До�тупные �ерви�ы",
    "settings.service.form.customUrl" : "�дре� �ервера",
-   "settings.service.form.customUrlPremiumInfo" : "Дл� добавни� �ерви�а на �воем хо�тинге, необходим аккаунт Franz Premium.",
+   "settings.service.form.customUrlPremiumInfo" : "Дл� добавлени� �ерви�а на �воем хо�тинге необходим аккаунт Franz Premium.",
    "settings.service.form.customUrlUpgradeAccount" : "Улучшить аккаунт",
    "settings.service.form.customUrlValidationError" : "�евозможно проверить �ервер {name}.",
    "settings.service.form.deleteButton" : "Удалить �ерви�",
    "settings.service.form.editServiceHeadline" : "Редактирование {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Включить звук",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Включить уведомлени�",
    "settings.service.form.enableService" : "Включить �ерви�",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Общие",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Вы будете получать уведомлени� дл� в�ех �ообщений, не только дл� @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показывать значок уведомлений дл� в�ех новых �ообщений",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Когда выключено, в�е звуковые уведомлени� будут отключены",
    "settings.service.form.name" : "�азвание",
-   "settings.service.form.saveButton" : "Сохранить �ерви�",
-   "settings.service.form.tabHosted" : "Hosted",
+   "settings.service.form.saveButton" : "Сохранить",
+   "settings.service.form.tabHosted" : "Размещено",
    "settings.service.form.tabOnPremise" : "Свой хо�тинг ��",
    "settings.service.form.team" : "Команда",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Ваши �ерви�ы",
    "settings.services.deletedInfo" : "Серви� удален",
    "settings.services.discoverServices" : "�айти �ерви�ы",
    "settings.services.headline" : "Ваши �ерви�ы",
-   "settings.services.noServicesAdded" : "У Ва� пока нет �ерви�ов",
+   "settings.services.noServicesAdded" : "Вы пока не добавили никаких �ерви�ов.",
    "settings.services.tooltip.isDisabled" : "Серви� отключен",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "В�е звуки отключены",
    "settings.services.tooltip.notificationsDisabled" : "Уведомлени� отключены",
    "settings.services.updatedInfo" : "Изменени� �охранены",
    "settings.user.form.accountType.company" : "Компани�",
@@ -139,52 +156,52 @@
    "settings.user.form.firstname" : "Им�",
    "settings.user.form.lastname" : "Фамили�",
    "settings.user.form.newPassword" : "�овый пароль",
-   "sidebar.addNewService" : "!!!Add new service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.addNewService" : "Добавить новый �ерви�",
+   "sidebar.muteApp" : "Отключить уведомлени� и звук",
    "sidebar.settings" : "�а�тройки",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Включить уведомлени� и звук",
    "signup.company.label" : "Организаци�",
    "signup.email.label" : "Email адре�",
-   "signup.emailDuplicate" : "Пользователь � указанным email уже �уще�твует",
+   "signup.emailDuplicate" : "Пользователь � таким email уже �уще�твует",
    "signup.firstname.label" : "Им�",
    "signup.headline" : "Реги�траци�",
    "signup.lastname.label" : "Фамили�",
-   "signup.legal.info" : "Создава� аккаунт Franz, Вы принимаете",
+   "signup.legal.info" : "Создава� аккаунт Franz, вы принимаете",
    "signup.legal.privacy" : "Политика конфиденциально�ти",
    "signup.legal.terms" : "У�лови� об�луживани�",
    "signup.link.login" : "Уже е�ть аккаунт, войти?",
    "signup.password.label" : "Пароль",
    "signup.submit.label" : "Создать аккаунт",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Резидентам ЕвроСоюза: могут примен�ть�� ме�тные налоги",
    "subscription.features.ads" : "Без рекламы, нав�егда!",
-   "subscription.features.comingSoon" : "�ледите за обновлени�ми",
-   "subscription.features.customServices" : "�а�траиваемые �ерви�ы дл� Ва� и Вашей команды",
-   "subscription.features.encryptedSync" : "Шифрованна� �инхронизаци� �е��ии",
-   "subscription.features.onpremise" : "Добавить облачные �лужбы или �лужбы �о �воим хо�тингом типа HipChat",
-   "subscription.features.vpn" : "Поддержка прок�и и VPN",
-   "subscription.includedFeatures" : "Оплаченный Franz Премиум аккаунт включает",
+   "subscription.features.comingSoon" : "�коро",
+   "subscription.features.customServices" : "�а�траиваемые �ерви�ы дл� ва� и вашей команды",
+   "subscription.features.encryptedSync" : "Шифрование �е��ий �инхронизации",
+   "subscription.features.onpremise" : "Добавление облачных �лужб или �лужб на �воём хо�тинге типа HipChat",
+   "subscription.features.vpn" : "Поддержку прок�и и VPN",
+   "subscription.includedFeatures" : "Платный аккаунт Franz Premium включает",
    "subscription.mining.experimental" : "�к�периментально",
-   "subscription.mining.headline" : "Как �то работает?\",",
-   "subscription.mining.line1" : "Включа� \"Поддерживать Franz, предо�тавл�� проце��орную мощно�ть\", Franz будет и�пользовать 20-50% проце��орного времени дл� майнинга криптовалюты Monero в примерном объеме 5$\/год.",
-   "subscription.mining.line2" : "Мы будем регулировать и�пользование проце��ора, чтобы не �адить батарею и не мешать Вашей работе",
-   "subscription.mining.line3" : "Пока разрешен майнинг, Вам будут до�туны в�е возможно�ти Franz Premium без ограничений",
+   "subscription.mining.headline" : "Как �то работает?",
+   "subscription.mining.line1" : "Включив «Поддержку � вычи�лительной мощно�тью», Franz будет и�пользовать около 20–50% вашего проце��ора, дл� майнинга криптовалюты Monero в примерном объёме $5\/год.",
+   "subscription.mining.line2" : "Мы будем регулировать и�пользование проце��ора, чтобы не разр�жать аккумул�тор и не замедл�ть работу вашего компьютера.",
+   "subscription.mining.line3" : "Пока разрешен майнинг, у ва� будет неограниченный до�туп ко в�ем функци�м Franz Premium.",
    "subscription.mining.moreInformation" : "Узнать больше об �том плане.",
    "subscription.paymentSessionError" : "�евозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
    "subscription.type.free" : "бе�платно",
-   "subscription.type.mining" : "Поддерживать Franz, предо�тавл�� проце��орную мощно�ть",
+   "subscription.type.mining" : "Поддержка Franz вычи�лительной мощно�тью",
    "subscription.type.month" : "ме��ц",
    "subscription.type.year" : "год",
    "subscriptionPopup.buttonCancel" : "Отмена",
    "subscriptionPopup.buttonDone" : "Готово",
    "tabs.item.deleteService" : "Удалить �ерви�",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Отключить звук",
    "tabs.item.disableNotifications" : "Отключить уведомлени�",
    "tabs.item.disableService" : "Отключить �ерви�",
    "tabs.item.edit" : "Редактировать",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Включить аудио",
    "tabs.item.enableNotification" : "Включить уведомлени�",
-   "tabs.item.enableService" : "Включить �ерви�",
+   "tabs.item.enableService" : "Включить �лужбу",
    "tabs.item.reload" : "Перезагрузить",
    "welcome.loginButton" : "Вход",
    "welcome.signupButton" : "Создать аккаунт",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index d8415762d..84f6e7ecc 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Nie ste pripojený k internetu",
    "import.headline" : "Importovať služby z Franz 4",
    "import.notSupportedHeadline" : "Služby zatiaľ nie sú podporované vo verzii Franz 5",
-   "import.skip.label" : "Chcem pridať služby manuálne",
+   "import.skip.label" : "Chcem pridať službu ru�ne",
    "import.submit.label" : "Importovať služby",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Čo je nové:",
    "infobar.buttonInstallUpdate" : "Reštartovať a inštalovať aktualizáciu",
    "infobar.buttonReloadServices" : "Obnoviť služby",
    "infobar.requiredRequestsFailed" : "Nie je možné na�ítať služby a informácie o užívateľovi",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Nechcem podporiť vývoj aplikácie Franz.",
    "pricing.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
    "pricing.support.label" : "Vyberte váš plán podpory",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Na�ítať znovu {name}",
+   "service.crashHandler.autoReload" : "Pokus o automatické obnovenie {name} za {seconds} sekúnd",
+   "service.crashHandler.headline" : "Ale nie!",
+   "service.crashHandler.text" : "{name} spôsobil chybu.",
+   "service.disabledHandler.action" : "Zapnúť {name}",
+   "service.disabledHandler.headline" : "{name} je vypnutý",
    "services.getStarted" : "Za�íname",
    "services.welcome" : "Víta vás Franz",
    "settings.account.account.editButton" : "Upraviť ú�et",
    "settings.account.accountType.basic" : "Základný ú�et",
    "settings.account.accountType.premium" : "Prémiový ú�et podporovateľa",
    "settings.account.buttonSave" : "Aktualizovať profil",
+   "settings.account.deleteAccount" : "Odstrániť ú�et",
+   "settings.account.deleteEmailSent" : "Na váš mail bol odoslaný email s odkazom pre potvrdenie zmazanie ú�tu. Váš ú�et a dáta potom nepôjde obnoviť!",
+   "settings.account.deleteInfo" : "Ak už nepotrebujete váš Franz ú�et, môžete tu váš ú�et, a všetky dáta v ňom, zmazať.",
    "settings.account.headline" : "Ú�et",
    "settings.account.headlineAccount" : "Informácie o ú�te",
+   "settings.account.headlineDangerZone" : "Nebezpe�ná zóna",
    "settings.account.headlineInvoices" : "Faktúry",
    "settings.account.headlinePassword" : "Zmeniť heslo",
    "settings.account.headlineProfile" : "Aktualizovať profil",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "Vaše zmeny boli uložené",
    "settings.account.tryReloadUserInfoRequest" : "Skúsiť znova",
    "settings.account.userInfoRequestFailed" : "Nebolo možné získať informácie o užívateľovi",
+   "settings.app.buttonClearAllCache" : "Vy�istiť vyrovnávaciu pamäť",
    "settings.app.buttonInstallUpdate" : "Reštart a inštalácia aktualizácií",
    "settings.app.buttonSearchForUpdate" : "Skontrolovať aktualizácie",
+   "settings.app.cacheInfo" : "Franz momentálne používa {size} miesta na disku.",
    "settings.app.currentVersion" : "Aktuálna verzia:",
    "settings.app.form.autoLaunchInBackground" : "Otvoriť na pozadí",
    "settings.app.form.autoLaunchOnStart" : "Spustiť Franz pri štarte",
    "settings.app.form.beta" : "Vrátane beta verzií",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
+   "settings.app.form.enableSpellchecking" : "Povoliť zvýraznenie preklepov",
    "settings.app.form.enableSystemTray" : "Zobrazovať Franz v systémovej lište",
    "settings.app.form.language" : "Jazyk",
    "settings.app.form.minimizeToSystemTray" : "Minimalizovať Franz do systémovej lišty",
    "settings.app.form.runInBackground" : "Ponechať Franz spustený v pozadí pri zatvorení okna",
-   "settings.app.form.showDisabledServices" : "Display disabled services tabs",
+   "settings.app.form.showDisabledServices" : "Zobraziť záložky vypnutých služieb",
+   "settings.app.form.showMessagesBadgesWhenMuted" : "Zobraziť odznak pre nepre�ítané správy ke� sú upozornenia vypnutá",
    "settings.app.headline" : "Nastavenia",
-   "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAdvanced" : "Rozšírené",
+   "settings.app.headlineAppearance" : "Vzhľad",
    "settings.app.headlineGeneral" : "Všeobecné",
    "settings.app.headlineLanguage" : "Jazyk",
    "settings.app.headlineUpdates" : "Aktualizácie",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Zmeny vyžadujú restart",
+   "settings.app.subheadlineCache" : "Vyrovnávacia pamäť",
+   "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
    "settings.app.updateStatusAvailable" : "Dostupná aktualizácia, sťahujem...",
    "settings.app.updateStatusSearching" : "Vyhľadávam aktualizácie",
    "settings.app.updateStatusUpToDate" : "Používate najnovšiu verziu Franz",
@@ -95,10 +103,11 @@
    "settings.recipes.all" : "Všetky služby",
    "settings.recipes.dev" : "Vývoj",
    "settings.recipes.headline" : "Dostupné služby",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "Chýbajúce služba?",
    "settings.recipes.mostPopular" : "Najpopulárnejšie",
    "settings.recipes.nothingFound" : "Je nám ľúto, ale žiadna služba nezodpovedala vášmu hľadanému výrazu.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Služba úspešne pridaná",
+   "settings.searchService" : "Vyhľadať službu",
    "settings.service.error.goBack" : "Späť na služby",
    "settings.service.error.headline" : "Chyba",
    "settings.service.error.message" : "Nepodarilo sa na�ítať službu.",
@@ -110,24 +119,32 @@
    "settings.service.form.customUrlValidationError" : "Nebolo možné overiť vlastný server: {name}.",
    "settings.service.form.deleteButton" : "Odstrániť službu",
    "settings.service.form.editServiceHeadline" : "Upraviť {meno}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Zapnúť zvuk",
+   "settings.service.form.enableBadge" : "Ukázať odznaky nepre�ítaných správ",
    "settings.service.form.enableNotification" : "Povoliť oznámenia",
    "settings.service.form.enableService" : "Povoliť službu",
+   "settings.service.form.headlineBadges" : "Odznaky nepre�ítaných správ",
+   "settings.service.form.headlineGeneral" : "Všeobecné",
+   "settings.service.form.headlineNotifications" : "Upozornenia",
+   "settings.service.form.icon" : "Vlastná ikona",
+   "settings.service.form.iconDelete" : "Zmazať",
+   "settings.service.form.iconUpload" : "Presuňte váš obrázok, alebo kliknite sem",
    "settings.service.form.indirectMessageInfo" : "Budete dostávať upozornenia na všetky nové správy v kanáli, nielen na @meno, @kanál, @kde, ...",
    "settings.service.form.indirectMessages" : "Zobraziť znak správy pre všetky nové správy",
-   "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
+   "settings.service.form.isMutedInfo" : "Ak je vypnuté, všetky zvuky notifikácií a iného audia budú stíšené",
    "settings.service.form.name" : "Meno",
    "settings.service.form.saveButton" : "Uložiť službu",
    "settings.service.form.tabHosted" : "Hostovaný",
    "settings.service.form.tabOnPremise" : "Vlastné hosťovanie ��",
    "settings.service.form.team" : "Tím",
+   "settings.service.form.useHostedService" : "Použite hostovanú {name} službu.",
    "settings.service.form.yourServices" : "Vaše služby",
    "settings.services.deletedInfo" : "Služba bola odstránená",
    "settings.services.discoverServices" : "Preskúmajte služby",
    "settings.services.headline" : "Vaše služby",
    "settings.services.noServicesAdded" : "Nepridali ste ešte žiadne služby",
    "settings.services.tooltip.isDisabled" : "Služba je vypnutá",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
    "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
    "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
    "settings.user.form.accountType.company" : "Spolo�nosť",
@@ -136,26 +153,26 @@
    "settings.user.form.accountType.non-profit" : "Nezisková organizácia",
    "settings.user.form.currentPassword" : "Sú�asné heslo",
    "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.firstname" : "Krstné meno",
+   "settings.user.form.lastname" : "Priezvisko",
    "settings.user.form.newPassword" : "Nové heslo",
    "sidebar.addNewService" : "Pridať novú službu",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
    "sidebar.settings" : "Nastavenia",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Zapnúť upozornenia a zvuky",
    "signup.company.label" : "Spolo�nosť",
    "signup.email.label" : "Emailová adresa",
    "signup.emailDuplicate" : "Kontakt s touto emailovou adresou už existuje",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Krstné meno",
    "signup.headline" : "Prihlásiť sa",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Priezvisko",
    "signup.legal.info" : "Vytvorením ú�tu Franz akceptujete",
    "signup.legal.privacy" : "Vyhlásenie o ochrane súkromia",
    "signup.legal.terms" : "Podmienky služby",
    "signup.link.login" : "Už máte ú�et, prihlásiť sa?",
    "signup.password.label" : "Heslo",
    "signup.submit.label" : "Vytvoriť ú�et",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Pro obyvatelé EÚ: môžu byť aplikované miestne dane",
    "subscription.features.ads" : "Žiadne reklamy, nikdy!",
    "subscription.features.comingSoon" : "už �oskoro",
    "subscription.features.customServices" : "Privátne ​​služby pre vás a váš tím",
@@ -178,11 +195,11 @@
    "subscriptionPopup.buttonCancel" : "Zrušiť",
    "subscriptionPopup.buttonDone" : "Dokon�iť",
    "tabs.item.deleteService" : "Odstrániť službu",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "Vypnúť zvuk",
    "tabs.item.disableNotifications" : "Zakázať oznámenia",
    "tabs.item.disableService" : "Vypnúť službu",
    "tabs.item.edit" : "Upraviť",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Zapnúť zvuk",
    "tabs.item.enableNotification" : "Povoliť oznámenia",
    "tabs.item.enableService" : "Povoliť službu",
    "tabs.item.reload" : "Obnoviť",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
new file mode 100644
index 000000000..4d4e20d17
--- /dev/null
+++ b/src/i18n/locales/sr.json
@@ -0,0 +1,209 @@
+{
+   "global.api.unhealthy" : "Nije moguće pristupiti Francovim on-line servisima. ",
+   "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
+   "import.headline" : "Uvezite svoje Franc4 servise",
+   "import.notSupportedHeadline" : "Servis trenutno nije podržan u Franc5",
+   "import.skip.label" : "I want to add services manually",
+   "import.submit.label" : "Uvezi servise",
+   "infobar.buttonChangelog" : "Å ta je novo? ",
+   "infobar.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje ",
+   "infobar.buttonReloadServices" : "Ponovo u�itaj servise ",
+   "infobar.requiredRequestsFailed" : "Nemoguće u�itati servise i korisni�ke informacije",
+   "infobar.servicesUpdated" : "Vaši servisi su ažurirani. ",
+   "infobar.updateAvailable" : "Novo ažuriranje Franz-a je dostupno.  ",
+   "invite.email.label" : "Vaša e-adresa",
+   "invite.headline.friends" : "Pozovite 3 vaša prijatelja ili kolege",
+   "invite.name.label" : "Ime",
+   "invite.skip.label" : "Želim da ovo uradim kasnije",
+   "invite.submit.label" : "Pošalji pozivnice",
+   "login.email.label" : "Vaša e-adresa:",
+   "login.headline" : "Prijavite se",
+   "login.invalidCredentials" : "E-mail ili lozinka nisu to�ni",
+   "login.link.password" : "Stvaranje nove lozinke",
+   "login.link.signup" : "Stvorite besplatan ra�un",
+   "login.password.label" : "Lozinka",
+   "login.serverLogout" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "login.submit.label" : "Prijavite se",
+   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
+   "password.email.label" : "Vaša e-adresa",
+   "password.headline" : "Stvorite novu zaporku",
+   "password.link.login" : "Prijavite se na Vaš ra�un",
+   "password.link.signup" : "Stvorite besplatan ra�un",
+   "password.noUser" : "Ne postoji ni jedan korisnik s tom e-mail adresom",
+   "password.submit.label" : "Pošalji",
+   "password.successInfo" : "Molimo Vas da provjerite vašu e-mail adresu",
+   "pricing.headline" : "Podržite Franz",
+   "pricing.link.skipPayment" : "Ne želim da podržim razvoj Franz-a.",
+   "pricing.submit.label" : "Želim da podržim razvoj Franz-a.",
+   "pricing.support.label" : "Izaberite vaš plan za podržavanje",
+   "service.crashHandler.action" : "Osvježi {ime}",
+   "service.crashHandler.autoReload" : "Pokušaću automatski povratiti {ime} u {sekundi} sekundi",
+   "service.crashHandler.headline" : "O, ne! ",
+   "service.crashHandler.text" : "{ime} je izazvalo grešku. ",
+   "service.disabledHandler.action" : "Omogući {ime} ",
+   "service.disabledHandler.headline" : "{ime} je onemogućen\/o",
+   "services.getStarted" : "Zapo�nimo! ",
+   "services.welcome" : "Dobrodošli u Franz",
+   "settings.account.account.editButton" : "Uredi ra�un",
+   "settings.account.accountType.basic" : "Osnovni ra�un",
+   "settings.account.accountType.premium" : "Premium ra�un",
+   "settings.account.buttonSave" : "Ažuriraj profil",
+   "settings.account.deleteAccount" : "Delete account",
+   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+   "settings.account.deleteInfo" : "If you don't need your Franz account any longer, you can delete your account and all related data here.",
+   "settings.account.headline" : "Korisni�ki nalog",
+   "settings.account.headlineAccount" : "Podaci o nalogu",
+   "settings.account.headlineDangerZone" : "Danger Zone",
+   "settings.account.headlineInvoices" : "Fakture",
+   "settings.account.headlinePassword" : "Promijenite lozinku",
+   "settings.account.headlineProfile" : "Ažurirajte profil",
+   "settings.account.headlineSubscription" : "Vaša pretplata",
+   "settings.account.headlineUpgrade" : "Nadogradite ra�un i podržite Franc",
+   "settings.account.invoiceDownload" : "Preuzmite",
+   "settings.account.manageSubscription.label" : "Upravljajte pretplatama",
+   "settings.account.mining.active" : "Trenutno se odvija {hashes} kalkulacija po sekundi. ",
+   "settings.account.mining.cancel" : "Odustani ",
+   "settings.account.mining.moreInformation" : "Dođi do više informacija",
+   "settings.account.mining.thankyou" : "Hvala Vam što podržavate Franca s vašom procesorskom moći. ",
+   "settings.account.successInfo" : "Vaše promjene su spremljene",
+   "settings.account.tryReloadUserInfoRequest" : "Pokušajte ponovno",
+   "settings.account.userInfoRequestFailed" : "Nije moguće u�itati informacije o korisniku",
+   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonInstallUpdate" : "Ponovo pokreni i instaliraj ažuriranje",
+   "settings.app.buttonSearchForUpdate" : "Potraži ažuriranja",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.currentVersion" : "Trenutna verzija:",
+   "settings.app.form.autoLaunchInBackground" : "Otvori u pozadini",
+   "settings.app.form.autoLaunchOnStart" : "Pokreni Franz sa sistemom",
+   "settings.app.form.beta" : "Obuhvati i beta verzije",
+   "settings.app.form.enableSpellchecking" : "Omogući provjeru pravopisa",
+   "settings.app.form.enableSystemTray" : "Prikaži aplikaciju u sustavskoj traci",
+   "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" : "Show unread message badge when notifications are disabled",
+   "settings.app.headline" : "Postavke",
+   "settings.app.headlineAdvanced" : "Napredne alatke",
+   "settings.app.headlineAppearance" : "Izgled",
+   "settings.app.headlineGeneral" : "Općenito",
+   "settings.app.headlineLanguage" : "Jezik",
+   "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
+   "settings.app.updateStatusAvailable" : "Nadogradnja dostupna, preuzimanje...",
+   "settings.app.updateStatusSearching" : "Traže se ažuriranja",
+   "settings.app.updateStatusUpToDate" : "Koristite najnoviju verziju Franca.",
+   "settings.navigation.account" : "Ra�un",
+   "settings.navigation.availableServices" : "Dostupne usluge",
+   "settings.navigation.logout" : "Odjava",
+   "settings.navigation.settings" : "Postavke",
+   "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.recipes.all" : "Sve usluge",
+   "settings.recipes.dev" : "Razvoj",
+   "settings.recipes.headline" : "Dostupne usluge",
+   "settings.recipes.missingService" : "Da li neki servis nedostaje?",
+   "settings.recipes.mostPopular" : "Najpopularniji",
+   "settings.recipes.nothingFound" : "Žao nam je, ali ne postoje usluge koje se poklapaju s onima koje tražite",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Usluga uspješno dodana",
+   "settings.searchService" : "Search service",
+   "settings.service.error.goBack" : "Nazad do servisa",
+   "settings.service.error.headline" : "Greška ",
+   "settings.service.error.message" : "Nemoguće u�itati sadržaj usluge",
+   "settings.service.form.addServiceHeadline" : "Dodaj {ime} ",
+   "settings.service.form.availableServices" : "Dostupne usluge",
+   "settings.service.form.customUrl" : "Prilagođen server",
+   "settings.service.form.customUrlPremiumInfo" : "Da bi ste dodali samo-hostovane usluge, potreban vam je Premium ra�un.",
+   "settings.service.form.customUrlUpgradeAccount" : "Nadogradite Vaš ra�un",
+   "settings.service.form.customUrlValidationError" : "Nije moguće odobriti prilagođeno {ime} servera.",
+   "settings.service.form.deleteButton" : "Izbriši uslugu",
+   "settings.service.form.editServiceHeadline" : "Uredite {ime}",
+   "settings.service.form.enableAudio" : "Omogućite zvuk",
+   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableNotification" : "Omogućite obavijesti",
+   "settings.service.form.enableService" : "Omogućite usluge",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Općenito",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.indirectMessageInfo" : "Vi ćete biti obavješteni o svim novim porukama na kanalu, ne samo o @imenima, kanalima, @ovdje, ...",
+   "settings.service.form.indirectMessages" : "Prikaži zna�ku na svim novim porukuama",
+   "settings.service.form.isMutedInfo" : "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti ne�ujna.",
+   "settings.service.form.name" : "Ime",
+   "settings.service.form.saveButton" : "Sa�uvaj uslugu\/e",
+   "settings.service.form.tabHosted" : "Hostovano",
+   "settings.service.form.tabOnPremise" : "Samo-hostovano ��",
+   "settings.service.form.team" : "Tim",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.yourServices" : "Vaše usluge",
+   "settings.services.deletedInfo" : "Usluga je onemogućena",
+   "settings.services.discoverServices" : "Pronađite usluge",
+   "settings.services.headline" : "Vaše usluge",
+   "settings.services.noServicesAdded" : "Još uvijek niste unijeli niti jednu uslugu.",
+   "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.",
+   "settings.services.updatedInfo" : "Vaše promjene su pohranjene.",
+   "settings.user.form.accountType.company" : "Tvrtka",
+   "settings.user.form.accountType.individual" : "Pojedinac",
+   "settings.user.form.accountType.label" : "Tip ra�una",
+   "settings.user.form.accountType.non-profit" : "Neprofitno",
+   "settings.user.form.currentPassword" : "Trenutna lozinka",
+   "settings.user.form.email" : "E-pošta",
+   "settings.user.form.firstname" : "Ime",
+   "settings.user.form.lastname" : "Prezime",
+   "settings.user.form.newPassword" : "Nova lozinka",
+   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.settings" : "Postavke",
+   "sidebar.unmuteApp" : "Enable notifications & audio",
+   "signup.company.label" : "Tvrtka",
+   "signup.email.label" : "Vaša e-adresa",
+   "signup.emailDuplicate" : "Već postoji korisnik s tom e-mail adresom",
+   "signup.firstname.label" : "Ime",
+   "signup.headline" : "Prijava",
+   "signup.lastname.label" : "Prezime",
+   "signup.legal.info" : "Prilikom stvaranja Franz ra�una, slažete se sa sljedećim stavkama",
+   "signup.legal.privacy" : "Izjava o privatnosti",
+   "signup.legal.terms" : "Uvjeti korištenja",
+   "signup.link.login" : "Imate ra�un? Prijavite se.",
+   "signup.password.label" : "Lozinka",
+   "signup.submit.label" : "Napravite novi ra�un",
+   "subscription.euTaxInfo" : "EU državljani, upozerenje: Moguće taksiranje",
+   "subscription.features.ads" : "Bez reklama, doživotno!",
+   "subscription.features.comingSoon" : "Dolazi uskoro",
+   "subscription.features.customServices" : "Privatni servisi za Vas i Vaš tim",
+   "subscription.features.encryptedSync" : "Kodirano usklađivanje sesija.",
+   "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao Å¡to ima usluga HipChat",
+   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
+   "subscription.includedFeatures" : "Plaćeni\/Premium ra�un uklju�uje sljedeće:",
+   "subscription.mining.experimental" : "Eksperimentalno",
+   "subscription.mining.headline" : "Na koji na�in ovo radi?",
+   "subscription.mining.line1" : "Omogućavanjem \" Podrška snagom procesora \", Franc će iskoristiti oko 20-50% vaših CPU resursa za Kripto valutu \" Monero \" koja košta otprilike 5$ godišnje.",
+   "subscription.mining.line2" : "Adaptiraćemo iskorišćenost CPU resursa na osnovu vašeg rada, na taj na�in ćemo izbjeći iscrpljivanje baterije i usporavanje uređaja.",
+   "subscription.mining.line3" : "Dok god je \" rudar \" aktivan, imaćete neograni�en pristup svim Francovim Premium zna�ajkama.",
+   "subscription.mining.moreInformation" : "Dajte mi više informacija o ovom planu.",
+   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
+   "subscription.submit.label" : "Želim da podržim razvoj Franca.",
+   "subscription.type.free" : "Slobodno",
+   "subscription.type.mining" : "Podržite Franca s procesorskim resursima",
+   "subscription.type.month" : "mjesec",
+   "subscription.type.year" : "godina",
+   "subscriptionPopup.buttonCancel" : "Odustani",
+   "subscriptionPopup.buttonDone" : "Završeno",
+   "tabs.item.deleteService" : "Izbriši servis",
+   "tabs.item.disableAudio" : "Onemogući zvuk",
+   "tabs.item.disableNotifications" : "Onemogući obavijesti",
+   "tabs.item.disableService" : "Onemogući servis",
+   "tabs.item.edit" : "Uredi",
+   "tabs.item.enableAudio" : "Uklju�i zvuk",
+   "tabs.item.enableNotification" : "Omogući obavijesti",
+   "tabs.item.enableService" : "Omogući usluge",
+   "tabs.item.reload" : "Ponovno u�itavanje",
+   "welcome.loginButton" : "Prijavite se na ra�un",
+   "welcome.signupButton" : "Stvorite novi korisni�ki ra�un",
+   "welcome.slogan" : "Poruke koje su stvorene za tebe"
+}
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
new file mode 100644
index 000000000..816a60793
--- /dev/null
+++ b/src/i18n/locales/tr.json
@@ -0,0 +1,209 @@
+{
+   "global.api.unhealthy" : "Franz hizmetlerine ÅŸu anda eriÅŸilemiyor.",
+   "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
+   "import.headline" : "Franz 4 servislerinizi ekleyin.",
+   "import.notSupportedHeadline" : "Servisler henüz Franz 5'te desteklenmiyor.",
+   "import.skip.label" : "Servisleri kendim eklemek istiyorum",
+   "import.submit.label" : "Servisleri içe aktar",
+   "infobar.buttonChangelog" : "Yeni ne var?",
+   "infobar.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
+   "infobar.buttonReloadServices" : "Hizmetleri yeniden yükle",
+   "infobar.requiredRequestsFailed" : "Hizmetler ve kullanıcı bilgileri yüklenemedi",
+   "infobar.servicesUpdated" : "Hizmetleriniz güncellendi.",
+   "infobar.updateAvailable" : "Yeni Franz güncellemesi mevcut",
+   "invite.email.label" : "E-posta adresi",
+   "invite.headline.friends" : "3 arkadaşını ya da çalışma arkadaşını davet et",
+   "invite.name.label" : "Ad",
+   "invite.skip.label" : "Daha sonra yapmak istiyorum",
+   "invite.submit.label" : "Davetiye gönder",
+   "login.email.label" : "E-posta adresi",
+   "login.headline" : "Oturum Aç",
+   "login.invalidCredentials" : "Yanlış parola ya da e-posta adresi",
+   "login.link.password" : "Parola sıfırla",
+   "login.link.signup" : "Kullanıcı hesabı oluştur",
+   "login.password.label" : "Parola",
+   "login.serverLogout" : "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
+   "login.submit.label" : "Oturum Aç",
+   "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
+   "password.email.label" : "E-posta adresi",
+   "password.headline" : "Parola sıfırla",
+   "password.link.login" : "Hesabına giriş yap",
+   "password.link.signup" : "Ãœcretsiz bir hesap oluÅŸtur",
+   "password.noUser" : "Bu e-posta adresinde bir kullanıcı bulunamadı",
+   "password.submit.label" : "Gönder",
+   "password.successInfo" : "E-postanızı kontrol ediniz",
+   "pricing.headline" : "Franz'ı Destekle",
+   "pricing.link.skipPayment" : "Franz'ın gelişimini desteklemek istemiyorum.",
+   "pricing.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
+   "pricing.support.label" : "Destek planınızı seçiniz",
+   "service.crashHandler.action" : "{name} yeniden yükle",
+   "service.crashHandler.autoReload" : "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
+   "service.crashHandler.headline" : "Aman Tanrım hayır!",
+   "service.crashHandler.text" : "{name} bir hataya neden oldu.",
+   "service.disabledHandler.action" : "AktifleÅŸtir {name}",
+   "service.disabledHandler.headline" : "{name} devredışı",
+   "services.getStarted" : "Haydi başlayalım",
+   "services.welcome" : "Franz'a HoÅŸgeldiniz",
+   "settings.account.account.editButton" : "Hesabı düzenle",
+   "settings.account.accountType.basic" : "Basit Hesap",
+   "settings.account.accountType.premium" : "Premium Destekçi Hesabı",
+   "settings.account.buttonSave" : "Profili güncelle",
+   "settings.account.deleteAccount" : "Hesabı sil",
+   "settings.account.deleteEmailSent" : "Hesabınızın silinmesini onaylamanız için e-posta adresinize gönderilen bağlantıya tıklayınız. Bu işlem sonrasında hesabınız ve bilgileriniz geri getirilemez!",
+   "settings.account.deleteInfo" : "Franz hesabınıza artık ihtiyaç duymuyorsanız, hesabınızı ve buradaki bütün bağlantılı bilgilerinizi silebilirsiniz.",
+   "settings.account.headline" : "Hesap",
+   "settings.account.headlineAccount" : "Hesap bilgileri",
+   "settings.account.headlineDangerZone" : "Tehlike Bölgesi",
+   "settings.account.headlineInvoices" : "Faturalar",
+   "settings.account.headlinePassword" : "Parolayı değiştir",
+   "settings.account.headlineProfile" : "Profili güncelle",
+   "settings.account.headlineSubscription" : "AboneliÄŸin",
+   "settings.account.headlineUpgrade" : "Hesabını yükselt & Franz'ı destekle",
+   "settings.account.invoiceDownload" : "Ä°ndir",
+   "settings.account.manageSubscription.label" : "Aboneliğini yönet",
+   "settings.account.mining.active" : "Şu anda saniyede {hashes} hesaplama işlemi gerçekleştiriyorsun.",
+   "settings.account.mining.cancel" : "MadenciliÄŸi iptal et",
+   "settings.account.mining.moreInformation" : "Daha fazla bilgi al",
+   "settings.account.mining.thankyou" : "Franz'ı işlem gücünle desteklediğin için teşekkürler.",
+   "settings.account.successInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
+   "settings.account.tryReloadUserInfoRequest" : "Tekrar deneyin",
+   "settings.account.userInfoRequestFailed" : "Kullanıcı bilgisi yüklenemedi.",
+   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonInstallUpdate" : "Yeniden Başlat ve Güncelleştirmeleri Kur",
+   "settings.app.buttonSearchForUpdate" : "Güncellemeleri kontrol et",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.currentVersion" : "Geçerli sürüm:",
+   "settings.app.form.autoLaunchInBackground" : "Arka planda aç",
+   "settings.app.form.autoLaunchOnStart" : "Franz'ı başlangıçta aç",
+   "settings.app.form.beta" : "Beta versiyonları dahil et",
+   "settings.app.form.enableSpellchecking" : "Yazım denetimini etkinleştir",
+   "settings.app.form.enableSystemTray" : "Franz'ı sistem tepsisinde göster",
+   "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.headline" : "Ayarlar",
+   "settings.app.headlineAdvanced" : "GeliÅŸmiÅŸ",
+   "settings.app.headlineAppearance" : "Görünüm",
+   "settings.app.headlineGeneral" : "Genel",
+   "settings.app.headlineLanguage" : "Dil",
+   "settings.app.headlineUpdates" : "Güncellemeler",
+   "settings.app.restartRequired" : "Değişiklikler yeniden başlatmayı gerektiriyor",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Franz'ı senin diline tercüme etmemiz için yardım et.",
+   "settings.app.updateStatusAvailable" : "Güncelleme mevcut, indiriliyor...",
+   "settings.app.updateStatusSearching" : "Güncellemeleri denetliyor",
+   "settings.app.updateStatusUpToDate" : "Franz'ın son versiyonunu kullanıyorsun",
+   "settings.navigation.account" : "Hesap",
+   "settings.navigation.availableServices" : "Mevcut servisler",
+   "settings.navigation.logout" : "Çıkış",
+   "settings.navigation.settings" : "Ayarlar",
+   "settings.navigation.yourServices" : "Servislerin",
+   "settings.recipes.all" : "Tüm servisler",
+   "settings.recipes.dev" : "GeliÅŸtirme",
+   "settings.recipes.headline" : "Mevcut servisler",
+   "settings.recipes.missingService" : "Aradığın servisi bulamadın mı?",
+   "settings.recipes.mostPopular" : "En popüler",
+   "settings.recipes.nothingFound" : "Aradığın terimle eşleşen servis bulunamadı.",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "Servis başarıyla eklendi",
+   "settings.searchService" : "Search service",
+   "settings.service.error.goBack" : "Servislere geri dön",
+   "settings.service.error.headline" : "Hata",
+   "settings.service.error.message" : "Servis tarifi yüklenemedi",
+   "settings.service.form.addServiceHeadline" : "{name} Ekle",
+   "settings.service.form.availableServices" : "Mevcut servisler",
+   "settings.service.form.customUrl" : "Özel sunucu",
+   "settings.service.form.customUrlPremiumInfo" : "Kendi barındırdığın servisi ekleyebilmek için Franz Premium Destek Hesabına ihtiyacın var.",
+   "settings.service.form.customUrlUpgradeAccount" : "Hesabını yükselt",
+   "settings.service.form.customUrlValidationError" : "{name} özel sunucu doğrulanamadı.",
+   "settings.service.form.deleteButton" : "Servisi sil",
+   "settings.service.form.editServiceHeadline" : "{name} düzenle",
+   "settings.service.form.enableAudio" : "Sesi etkinleÅŸtirin",
+   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableNotification" : "Bildirimleri etkinleÅŸtir",
+   "settings.service.form.enableService" : "Servisi etkinleÅŸtir",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Genel",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.indirectMessageInfo" : "Bir kanaldaki tüm yeni mesajlar hakkında size bilgi verilecektir, bunlar daihil @username, @channel, @here, ...",
+   "settings.service.form.indirectMessages" : "Mesaj rozetini tüm yeni mesajlar için göster",
+   "settings.service.form.isMutedInfo" : "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
+   "settings.service.form.name" : "Ä°sim",
+   "settings.service.form.saveButton" : "Servisi kaydet",
+   "settings.service.form.tabHosted" : "Barındırılan",
+   "settings.service.form.tabOnPremise" : "Kendi barındırılan",
+   "settings.service.form.team" : "Takım",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.yourServices" : "Servislerin",
+   "settings.services.deletedInfo" : "Servis silindi",
+   "settings.services.discoverServices" : "Servisleri keÅŸfet",
+   "settings.services.headline" : "Servislerin",
+   "settings.services.noServicesAdded" : "Henüz hiç servis eklemedin.",
+   "settings.services.tooltip.isDisabled" : "Servis devre dışı",
+   "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
+   "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
+   "settings.services.updatedInfo" : "DeÄŸiÅŸikliklerin kaydedildi",
+   "settings.user.form.accountType.company" : "Kurum",
+   "settings.user.form.accountType.individual" : "Bireysel",
+   "settings.user.form.accountType.label" : "Hesap tipi",
+   "settings.user.form.accountType.non-profit" : "Kar amacı gütmeyen",
+   "settings.user.form.currentPassword" : "Mevcut ÅŸifre",
+   "settings.user.form.email" : "E-posta",
+   "settings.user.form.firstname" : "Ad",
+   "settings.user.form.lastname" : "Soyad",
+   "settings.user.form.newPassword" : "Yeni ÅŸifre",
+   "sidebar.addNewService" : "Yeni servis ekle",
+   "sidebar.muteApp" : "Bildirimleri ve sesli uyarıları kapat",
+   "sidebar.settings" : "Ayarlar",
+   "sidebar.unmuteApp" : "Bildirimleri ve sesli uyarıları etkinleştir",
+   "signup.company.label" : "Kurum",
+   "signup.email.label" : "E-posta adresi",
+   "signup.emailDuplicate" : "Bu email adresine sahip bir kullanıcı zaten mevcut",
+   "signup.firstname.label" : "Ad",
+   "signup.headline" : "Hesap oluÅŸtur",
+   "signup.lastname.label" : "Soyad",
+   "signup.legal.info" : "Franz'ı hesabı oluşturark kabul ediyorsun",
+   "signup.legal.privacy" : "Gizlilik Sözleşmesi",
+   "signup.legal.terms" : "Kullanım Koşulları",
+   "signup.link.login" : "Mevcut hesabınla giriş yap.",
+   "signup.password.label" : "Åžifre",
+   "signup.submit.label" : "Hesap oluÅŸtur",
+   "subscription.euTaxInfo" : "AB vatandaşları: yerel satış vergileri uygulanabilir",
+   "subscription.features.ads" : "Reklam yok, asla!",
+   "subscription.features.comingSoon" : "yakında geliyor",
+   "subscription.features.customServices" : "Sen ve takımın için gizli servis",
+   "subscription.features.encryptedSync" : "Åžifreli oturum senkronizasyonu",
+   "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
+   "subscription.features.vpn" : "Proxy & VPN desteÄŸi",
+   "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
+   "subscription.mining.experimental" : "deneysel",
+   "subscription.mining.headline" : "Bu nasıl çalışır?",
+   "subscription.mining.line1" : "\"İşlem gücü ile destekleme\"'yi etkinleştirdiğinde, Franz CPU'nun %20-50'lik kısmını kriptopara Monero madenciliği için kullanacak. Yılda yaklaşık 5$'a eşdeğer.",
+   "subscription.mining.line2" : "CPU kullanımını, pilinizi bitirmemek ve makinenizi yavaşlatmamak için çalışma davranışınıza göre uyarlayacağız.",
+   "subscription.mining.line3" : "Madenci etkin olduğu sürece, tüm Franz Premium Destekçi Özelliklerine sınırsız erişime sahip olacaksınız.",
+   "subscription.mining.moreInformation" : "Bu plan hakkında daha fazla bilgi al.",
+   "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
+   "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
+   "subscription.type.free" : "ücretsiz",
+   "subscription.type.mining" : "Franz'ı işlem gücüyle destekle",
+   "subscription.type.month" : "ay",
+   "subscription.type.year" : "yıl",
+   "subscriptionPopup.buttonCancel" : "Ä°ptal",
+   "subscriptionPopup.buttonDone" : "Tamamlandı",
+   "tabs.item.deleteService" : "Servisi sil",
+   "tabs.item.disableAudio" : "Sesi kapat",
+   "tabs.item.disableNotifications" : "Bildirimleri devre dışı bırak",
+   "tabs.item.disableService" : "Servisi devre dışı bırak",
+   "tabs.item.edit" : "Düzenle",
+   "tabs.item.enableAudio" : "Sesi etkinleÅŸtir",
+   "tabs.item.enableNotification" : "Bildirimleri etkinleÅŸtir",
+   "tabs.item.enableService" : "Servisi etkinleÅŸtir",
+   "tabs.item.reload" : "Yeniden Yükle",
+   "welcome.loginButton" : "Hesabına giriş yap",
+   "welcome.signupButton" : "Ãœcretsiz hesap oluÅŸtur",
+   "welcome.slogan" : "Sizin için çalışan mesajlaşma"
+}
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 902368150..5456bea95 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -3,9 +3,9 @@
    "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
    "import.headline" : "Імпортувати ваші �ерві�и з Franz 4",
    "import.notSupportedHeadline" : "Серві�и ще не підтримують�� в Franz 5",
-   "import.skip.label" : "Я хочу додати �ерві�и вручну",
+   "import.skip.label" : "Я бажаю додати �ерві� вручну",
    "import.submit.label" : "Імпортувати �ерві�и",
-   "infobar.buttonChangelog" : "What is new?",
+   "infobar.buttonChangelog" : "Що нового?",
    "infobar.buttonInstallUpdate" : "Перезавантажити і в�тановити оновленн�",
    "infobar.buttonReloadServices" : "Перезавантажити �ерві�и",
    "infobar.requiredRequestsFailed" : "�е вдало�� завантажити �ерві�и та інформацію кори�тувача",
@@ -36,20 +36,24 @@
    "pricing.link.skipPayment" : "Я не хочу підтримувати розробку Franz.",
    "pricing.submit.label" : "Я хочу підтримати розробку Franz",
    "pricing.support.label" : "Виберіть �вій план підтримки",
-   "service.crashHandler.action" : "Reload {name}",
-   "service.crashHandler.autoReload" : "Trying to automatically restore {name} in {seconds} seconds",
-   "service.crashHandler.headline" : "Oh no!",
-   "service.crashHandler.text" : "{name} has caused an error.",
-   "service.disabledHandler.action" : "Enable {name}",
-   "service.disabledHandler.headline" : "{name} is disabled",
+   "service.crashHandler.action" : "Перезавантажити {name}",
+   "service.crashHandler.autoReload" : "Спробую автоматично відновити {name} через {seconds} �",
+   "service.crashHandler.headline" : "О, ні!",
+   "service.crashHandler.text" : "{name} призвів до помилки.",
+   "service.disabledHandler.action" : "Увімкнути {name} ",
+   "service.disabledHandler.headline" : "{name} вимкнено",
    "services.getStarted" : "Почати",
    "services.welcome" : "Ла�каво про�имо в Franz",
    "settings.account.account.editButton" : "Редагувати акаунт",
    "settings.account.accountType.basic" : "Базовий акаунт",
    "settings.account.accountType.premium" : "Преміум �каунт Прихильника",
    "settings.account.buttonSave" : "Оновити профіль",
+   "settings.account.deleteAccount" : "Видалити обліковий запи�",
+   "settings.account.deleteEmailSent" : "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
+   "settings.account.deleteInfo" : "Якщо Вам більше не потрібний обліковий запи� Franz, Ви можете його видалити і в�і �уміжні дані.",
    "settings.account.headline" : "�каунт",
    "settings.account.headlineAccount" : "Інформаці� про акаунт",
+   "settings.account.headlineDangerZone" : "�а �вій �трах і ризик",
    "settings.account.headlineInvoices" : "Інвой�и",
    "settings.account.headlinePassword" : "Змінити пароль",
    "settings.account.headlineProfile" : "Оновити профіль",
@@ -64,26 +68,30 @@
    "settings.account.successInfo" : "Ваші зміни були збережені",
    "settings.account.tryReloadUserInfoRequest" : "Спробуйте ще раз",
    "settings.account.userInfoRequestFailed" : "�е вдало�� завантажити інформацію кори�тувача",
+   "settings.app.buttonClearAllCache" : "Clear cache",
    "settings.app.buttonInstallUpdate" : "Перезавантажити і в�тановити оновленн�",
    "settings.app.buttonSearchForUpdate" : "Перевірити на�вні�ть оновлень",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
    "settings.app.currentVersion" : "Поточна вер�і�:",
    "settings.app.form.autoLaunchInBackground" : "Відкрити у фоновому режимі",
    "settings.app.form.autoLaunchOnStart" : "Запу�кати Franz на початку",
    "settings.app.form.beta" : "Включити бета-вер�ії",
-   "settings.app.form.enableSpellchecking" : "Enable spell checking",
-   "settings.app.form.enableSystemTray" : "Show Franz in system tray",
+   "settings.app.form.enableSpellchecking" : "Увімкнути перевірку орфографії",
+   "settings.app.form.enableSystemTray" : "Показувати Franz у �и�темному лотку",
    "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" : "Показувати значок непрочитаних повідомлень коли �повіщенн� вимкнені",
    "settings.app.headline" : "�алаштуванн�",
    "settings.app.headlineAdvanced" : "Advanced",
-   "settings.app.headlineAppearance" : "Appearance",
+   "settings.app.headlineAppearance" : "Вигл�д",
    "settings.app.headlineGeneral" : "Загальні",
    "settings.app.headlineLanguage" : "Мова",
    "settings.app.headlineUpdates" : "Оновленн�",
-   "settings.app.restartRequired" : "Changes require restart",
-   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
+   "settings.app.restartRequired" : "Зміни потребують перезапу�ку",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "Допоможіть перекла�ти Franz на Вашу мову.",
    "settings.app.updateStatusAvailable" : "Оновленн� до�тупне, завантаженн�...",
    "settings.app.updateStatusSearching" : "Шукає оновленн�",
    "settings.app.updateStatusUpToDate" : "Ви викори�товуєте о�танню вер�ію Franz",
@@ -95,24 +103,32 @@
    "settings.recipes.all" : "В�і �ерві�и",
    "settings.recipes.dev" : "Розробка",
    "settings.recipes.headline" : "До�тупні �ерві�и",
-   "settings.recipes.missingService" : "Missing a service?",
+   "settings.recipes.missingService" : "�е знайшли �ерві�у?",
    "settings.recipes.mostPopular" : "�айбільш попул�рні",
    "settings.recipes.nothingFound" : "Вибачте, але жоден �ерві� не відповідає пошуковому терміну.",
    "settings.recipes.servicesSuccessfulAddedInfo" : "Серві� у�пішно додано",
+   "settings.searchService" : "Search service",
    "settings.service.error.goBack" : "Повернути�ь до �ерві�ів",
    "settings.service.error.headline" : "Помилка",
    "settings.service.error.message" : "�е вдало�ь завантажити �ерверний протокол.",
    "settings.service.form.addServiceHeadline" : "Додати {name}",
    "settings.service.form.availableServices" : "До�тупні �ерві�и",
-   "settings.service.form.customUrl" : "Кори�тувацький �ервер ",
+   "settings.service.form.customUrl" : "Кори�тувацький �ервер",
    "settings.service.form.customUrlPremiumInfo" : "Щоб додати �амо�тійно розміщені �ерві�и, вам потріьно мати Преміумним �каунт Прихильника Franz.",
    "settings.service.form.customUrlUpgradeAccount" : "Оновити ваш обліковий запи�",
    "settings.service.form.customUrlValidationError" : "�е вдало�ь підтвердити вла�ний {name} �ервер.",
    "settings.service.form.deleteButton" : "Видалити �ерві�",
    "settings.service.form.editServiceHeadline" : "Редагувати {name}",
-   "settings.service.form.enableAudio" : "Enable audio",
+   "settings.service.form.enableAudio" : "Увімкнути звук",
+   "settings.service.form.enableBadge" : "Show unread message badges",
    "settings.service.form.enableNotification" : "Увімкнути �повіщенн�",
    "settings.service.form.enableService" : "Увімкнути �ерві�",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "Загальні",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
    "settings.service.form.indirectMessageInfo" : "Ви отримаєте �повіщенн� про в�і нові повідомленн� в каналі, а не лише про @username, @channel, @here, ...",
    "settings.service.form.indirectMessages" : "Показувати значок повідомленн� дл� в�іх нових повідомлень",
    "settings.service.form.isMutedInfo" : "When disabled, all notification sounds and audio playback are muted",
@@ -121,13 +137,14 @@
    "settings.service.form.tabHosted" : "Розміщений",
    "settings.service.form.tabOnPremise" : "Само�тійно розміщений ��",
    "settings.service.form.team" : "Команда",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
    "settings.service.form.yourServices" : "Ваші �ерві�и",
    "settings.services.deletedInfo" : "Серві� було видалено",
    "settings.services.discoverServices" : "Відкрийте дл� �ебе �ерві�и",
    "settings.services.headline" : "Ваші �ерві�и",
    "settings.services.noServicesAdded" : "Ви ще не додавали жодних �ерві�ів.",
    "settings.services.tooltip.isDisabled" : "Серві� відключений",
-   "settings.services.tooltip.isMuted" : "All sounds are muted",
+   "settings.services.tooltip.isMuted" : "В�і звуки вимкнено",
    "settings.services.tooltip.notificationsDisabled" : "Сповіщенн� відключені",
    "settings.services.updatedInfo" : "Ваші зміни були збережені",
    "settings.user.form.accountType.company" : "Компані�",
@@ -135,27 +152,27 @@
    "settings.user.form.accountType.label" : "Тип акаунту",
    "settings.user.form.accountType.non-profit" : "�екомерційний",
    "settings.user.form.currentPassword" : "Поточний пароль",
-   "settings.user.form.email" : "Email",
-   "settings.user.form.firstname" : "First Name",
-   "settings.user.form.lastname" : "Last Name",
+   "settings.user.form.email" : "Ел. пошта",
+   "settings.user.form.firstname" : "Ім`�",
+   "settings.user.form.lastname" : "Прізвище",
    "settings.user.form.newPassword" : "�овий пароль",
-   "sidebar.addNewService" : "Add new service",
-   "sidebar.mute" : "Disable audio",
+   "sidebar.addNewService" : "Додати новий �ерві�",
+   "sidebar.muteApp" : "Вимкнути �повіщенн� та звуки",
    "sidebar.settings" : "�алаштуванн�",
-   "sidebar.unmute" : "Enable audio",
+   "sidebar.unmuteApp" : "Увімкнути �повіщенн� та звуки",
    "signup.company.label" : "Компані�",
    "signup.email.label" : "Email адре�а",
    "signup.emailDuplicate" : "Кори�тувач із цією email адре�ою вже і�нує",
-   "signup.firstname.label" : "First Name",
+   "signup.firstname.label" : "Ім`�",
    "signup.headline" : "Увійти",
-   "signup.lastname.label" : "Last Name",
+   "signup.lastname.label" : "Прізвище",
    "signup.legal.info" : "Створенн�м акаунту Franz ви приймаєте",
    "signup.legal.privacy" : "За�ва про конфіденційні�ть",
    "signup.legal.terms" : "Умови викори�танн�",
    "signup.link.login" : "У ва� вже є обліковий запи�, увійти?",
    "signup.password.label" : "Пароль",
    "signup.submit.label" : "Створити акаунт",
-   "subscription.euTaxInfo" : "EU residents: local sales tax may apply",
+   "subscription.euTaxInfo" : "Дл� жителів ЄС: можуть за�то�овувати�� податки",
    "subscription.features.ads" : "Жодної реклами!",
    "subscription.features.comingSoon" : "очікуйте незабаром",
    "subscription.features.customServices" : "Приватні �ерві�и дл� ва� і вашої команди",
@@ -178,13 +195,13 @@
    "subscriptionPopup.buttonCancel" : "Відмінити",
    "subscriptionPopup.buttonDone" : "Готово",
    "tabs.item.deleteService" : "Видалити �ерві�",
-   "tabs.item.disableAudio" : "Disable audio",
+   "tabs.item.disableAudio" : "відключити звук",
    "tabs.item.disableNotifications" : "Вимкнути �повіщенн�",
    "tabs.item.disableService" : "Вимкнути �ерві�",
    "tabs.item.edit" : "Редагувати",
-   "tabs.item.enableAudio" : "Enable audio",
+   "tabs.item.enableAudio" : "Увімкнути звук",
    "tabs.item.enableNotification" : "Увімкнути �повіщенн�",
-   "tabs.item.enableService" : "Увімкнути �ерві�",
+   "tabs.item.enableService" : "Увімкнути �лужбу",
    "tabs.item.reload" : "Перезавантажити",
    "welcome.loginButton" : "Увійдіть до �вого акаунту",
    "welcome.signupButton" : "Створити безплатний акаунт",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
new file mode 100644
index 000000000..12f1035bf
--- /dev/null
+++ b/src/i18n/locales/zh-TW.json
@@ -0,0 +1,209 @@
+{
+   "global.api.unhealthy" : "無法連線至Franz的伺�器。",
+   "global.notConnectedToTheInternet" : "你沒有連上網路。",
+   "import.headline" : "匯入Franz 4的�務",
+   "import.notSupportedHeadline" : "Franz 5尚未支�此�務",
+   "import.skip.label" : "手動添加�務",
+   "import.submit.label" : "匯入�務",
+   "infobar.buttonChangelog" : "有什麼新功能呢?",
+   "infobar.buttonInstallUpdate" : "�新啟動並安�更新",
+   "infobar.buttonReloadServices" : "�新載入�務",
+   "infobar.requiredRequestsFailed" : "無法載入�務和使用者資訊",
+   "infobar.servicesUpdated" : "你的�務已經被更新",
+   "infobar.updateAvailable" : "Franz有�用的更新",
+   "invite.email.label" : "電�郵件地�",
+   "invite.headline.friends" : "邀請3�你的朋�或�事",
+   "invite.name.label" : "�稱",
+   "invite.skip.label" : "我想�後��",
+   "invite.submit.label" : "�出邀請",
+   "login.email.label" : "電�郵件地�",
+   "login.headline" : "登入",
+   "login.invalidCredentials" : "電�郵件或密碼有誤",
+   "login.link.password" : "�設密碼",
+   "login.link.signup" : "建立�費帳號",
+   "login.password.label" : "密碼",
+   "login.serverLogout" : "您的登入期間已�期，請�新登錄",
+   "login.submit.label" : "登入",
+   "login.tokenExpired" : "您的登入已�期，請�新登入。",
+   "password.email.label" : "電�郵件地�",
+   "password.headline" : "�設密碼",
+   "password.link.login" : "登入您的帳號",
+   "password.link.signup" : "建立�費帳號",
+   "password.noUser" : "找�到該電�郵件地�的用戶",
+   "password.submit.label" : "�出",
+   "password.successInfo" : "請檢查您的電�郵件",
+   "pricing.headline" : "支�Franz",
+   "pricing.link.skipPayment" : "我�想支�Franz的開發。",
+   "pricing.submit.label" : "我想支�Franz的開發。",
+   "pricing.support.label" : "�擇您支�的計畫",
+   "service.crashHandler.action" : "�新載入{name}",
+   "service.crashHandler.autoReload" : "嘗試在{seconds}秒內自動�復{name}",
+   "service.crashHandler.headline" : "噢�!",
+   "service.crashHandler.text" : "{name}導致了一個錯誤。",
+   "service.disabledHandler.action" : "啟用{name}",
+   "service.disabledHandler.headline" : "{name}已�用",
+   "services.getStarted" : "開始",
+   "services.welcome" : "歡迎使用Franz",
+   "settings.account.account.editButton" : "編輯帳號",
+   "settings.account.accountType.basic" : "基礎帳號",
+   "settings.account.accountType.premium" : "高級支�者帳戶",
+   "settings.account.buttonSave" : "更新簡介",
+   "settings.account.deleteAccount" : "移除帳號",
+   "settings.account.deleteEmailSent" : "移除帳號之確�電郵已�出。你的帳號�相關資料將無法�復�",
+   "settings.account.deleteInfo" : "如果��需�你的帳號了，你�以在這裡刪除帳號和相關資料",
+   "settings.account.headline" : "帳號",
+   "settings.account.headlineAccount" : "帳戶資訊",
+   "settings.account.headlineDangerZone" : "�險地帶",
+   "settings.account.headlineInvoices" : "帳單",
+   "settings.account.headlinePassword" : "變更密碼",
+   "settings.account.headlineProfile" : "更新簡介",
+   "settings.account.headlineSubscription" : "您的訂閱",
+   "settings.account.headlineUpgrade" : "�級您的帳戶&支�Franz",
+   "settings.account.invoiceDownload" : "下載",
+   "settings.account.manageSubscription.label" : "管�您的訂閱",
+   "settings.account.mining.active" : "您�在�秒正在執行{hashes}計算。",
+   "settings.account.mining.cancel" : "�消挖掘",
+   "settings.account.mining.moreInformation" : "�得更多資訊",
+   "settings.account.mining.thankyou" : "感�用你的處�能力支�Franz。",
+   "settings.account.successInfo" : "您的更變已經被儲存",
+   "settings.account.tryReloadUserInfoRequest" : "�試一次",
+   "settings.account.userInfoRequestFailed" : "無法載入使用者資訊。",
+   "settings.app.buttonClearAllCache" : "Clear cache",
+   "settings.app.buttonInstallUpdate" : "�新啟動並安�更新",
+   "settings.app.buttonSearchForUpdate" : "檢查更新",
+   "settings.app.cacheInfo" : "Franz cache is currently using {size} of disk space.",
+   "settings.app.currentVersion" : "目�的版本",
+   "settings.app.form.autoLaunchInBackground" : "在背景開啟",
+   "settings.app.form.autoLaunchOnStart" : "開機時啟動Franz",
+   "settings.app.form.beta" : "包�測試版",
+   "settings.app.form.enableSpellchecking" : "啟用拼字檢查",
+   "settings.app.form.enableSystemTray" : "顯示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.headline" : "設定",
+   "settings.app.headlineAdvanced" : "進階",
+   "settings.app.headlineAppearance" : "外觀",
+   "settings.app.headlineGeneral" : "一般",
+   "settings.app.headlineLanguage" : "語言",
+   "settings.app.headlineUpdates" : "æ›´æ–°",
+   "settings.app.restartRequired" : "需��啟以更變",
+   "settings.app.subheadlineCache" : "Cache",
+   "settings.app.translationHelp" : "幫助我們將Franz翻譯�您的語言。",
+   "settings.app.updateStatusAvailable" : "有�用更新，下載中...",
+   "settings.app.updateStatusSearching" : "正在�尋更新",
+   "settings.app.updateStatusUpToDate" : "您正在使用最新版本的Franz",
+   "settings.navigation.account" : "帳號",
+   "settings.navigation.availableServices" : "�使用的�務",
+   "settings.navigation.logout" : "登出",
+   "settings.navigation.settings" : "設定",
+   "settings.navigation.yourServices" : "您的�務",
+   "settings.recipes.all" : "所有�務",
+   "settings.recipes.dev" : "開發",
+   "settings.recipes.headline" : "�使用的�務",
+   "settings.recipes.missingService" : "缺少�務?",
+   "settings.recipes.mostPopular" : "最熱門",
+   "settings.recipes.nothingFound" : "很抱歉，沒有與您的�尋字詞符�的�務",
+   "settings.recipes.servicesSuccessfulAddedInfo" : "�務已�功新增。",
+   "settings.searchService" : "Search service",
+   "settings.service.error.goBack" : "返回�務",
+   "settings.service.error.headline" : "錯誤",
+   "settings.service.error.message" : "無法載入�務命令。",
+   "settings.service.form.addServiceHeadline" : "新增{name}",
+   "settings.service.form.availableServices" : "�使用的�務",
+   "settings.service.form.customUrl" : "自訂伺�器",
+   "settings.service.form.customUrlPremiumInfo" : "�添加自己託管的�務，您需�一個Franz �外支�者帳戶。",
+   "settings.service.form.customUrlUpgradeAccount" : "�級您的帳戶",
+   "settings.service.form.customUrlValidationError" : "無法驗證自定義{name}�務器。",
+   "settings.service.form.deleteButton" : "刪除�務",
+   "settings.service.form.editServiceHeadline" : "編輯{�稱}",
+   "settings.service.form.enableAudio" : "啟用音訊",
+   "settings.service.form.enableBadge" : "Show unread message badges",
+   "settings.service.form.enableNotification" : "啟用通知",
+   "settings.service.form.enableService" : "啟用�務",
+   "settings.service.form.headlineBadges" : "Unread message badges",
+   "settings.service.form.headlineGeneral" : "一般",
+   "settings.service.form.headlineNotifications" : "Notifications",
+   "settings.service.form.icon" : "Custom icon",
+   "settings.service.form.iconDelete" : "Delete",
+   "settings.service.form.iconUpload" : "Drop your image, or click here",
+   "settings.service.form.indirectMessageInfo" : "您將收到有關頻�中所有新消�的通知，而�僅僅是@username，@channel，@here，...",
+   "settings.service.form.indirectMessages" : "顯示所有新消�的消�標誌",
+   "settings.service.form.isMutedInfo" : "�用時，所有通知�和�音播放都將�音",
+   "settings.service.form.name" : "�稱",
+   "settings.service.form.saveButton" : "�存�務",
+   "settings.service.form.tabHosted" : "託管",
+   "settings.service.form.tabOnPremise" : "自我託管��",
+   "settings.service.form.team" : "團隊",
+   "settings.service.form.useHostedService" : "Use the hosted {name} service.",
+   "settings.service.form.yourServices" : "您的�務",
+   "settings.services.deletedInfo" : "已刪除�務",
+   "settings.services.discoverServices" : "發��務",
+   "settings.services.headline" : "您的�務",
+   "settings.services.noServicesAdded" : "你尚未新增任何�務",
+   "settings.services.tooltip.isDisabled" : "�務已�用",
+   "settings.services.tooltip.isMuted" : "所有的�音都是�音",
+   "settings.services.tooltip.notificationsDisabled" : "通知已�用",
+   "settings.services.updatedInfo" : "你的更變已經儲存",
+   "settings.user.form.accountType.company" : "公�",
+   "settings.user.form.accountType.individual" : "個人",
+   "settings.user.form.accountType.label" : "帳戶類型",
+   "settings.user.form.accountType.non-profit" : "�盈利",
+   "settings.user.form.currentPassword" : "目�密碼",
+   "settings.user.form.email" : "電�郵件",
+   "settings.user.form.firstname" : "�",
+   "settings.user.form.lastname" : "姓",
+   "settings.user.form.newPassword" : "新密碼",
+   "sidebar.addNewService" : "新增新的�務",
+   "sidebar.muteApp" : "關閉通知和通知音效",
+   "sidebar.settings" : "設定",
+   "sidebar.unmuteApp" : "開啟通知和通知音效",
+   "signup.company.label" : "公�",
+   "signup.email.label" : "電�郵件地�",
+   "signup.emailDuplicate" : "該使用者的電�郵件��已存在",
+   "signup.firstname.label" : "�",
+   "signup.headline" : "註冊",
+   "signup.lastname.label" : "姓",
+   "signup.legal.info" : "你接���創建一個Franz帳戶",
+   "signup.legal.privacy" : "隱��明",
+   "signup.legal.terms" : "�務�款",
+   "signup.link.login" : "已經有一個帳戶，登入？",
+   "signup.password.label" : "密碼",
+   "signup.submit.label" : "建立帳號",
+   "subscription.euTaxInfo" : "�盟居民：�能採用當地銷售稅",
+   "subscription.features.ads" : "無廣告，永�!",
+   "subscription.features.comingSoon" : "�將推出",
+   "subscription.features.customServices" : "為您和您的團隊�供�人�務",
+   "subscription.features.encryptedSync" : "加密的會話�步",
+   "subscription.features.onpremise" : "添加本地\/託管�務如HipChat",
+   "subscription.features.vpn" : "代�和VPN支�",
+   "subscription.includedFeatures" : "包�高級Franz付費帳戶",
+   "subscription.mining.experimental" : "實驗性",
+   "subscription.mining.headline" : "這是怎麼�作的？",
+   "subscription.mining.line1" : "��啟用「具有處�能力的支��，Franz將使用大約20-50%的CPU來挖掘加密貨幣Monero，大約相當於�年5美元。",
+   "subscription.mining.line2" : "我們將根據您的使用情形調整CPU使用率，以��耗盡電池，�低您和機器的性能。",
+   "subscription.mining.line3" : "��礦工處於活動狀態，您就�以無�制地使用所有的Franz 高級支�者的功能。",
+   "subscription.mining.moreInformation" : "�得有關此計劃的更多資訊。",
+   "subscription.paymentSessionError" : "無法�始化付款表單",
+   "subscription.submit.label" : "我想支�Franz的開發",
+   "subscription.type.free" : "自由",
+   "subscription.type.mining" : "用進程處�權�支�Franz",
+   "subscription.type.month" : "月",
+   "subscription.type.year" : "å¹´",
+   "subscriptionPopup.buttonCancel" : "�消",
+   "subscriptionPopup.buttonDone" : "完�",
+   "tabs.item.deleteService" : "刪除�務",
+   "tabs.item.disableAudio" : "�用音訊",
+   "tabs.item.disableNotifications" : "�用通知",
+   "tabs.item.disableService" : "關閉�務",
+   "tabs.item.edit" : "編輯",
+   "tabs.item.enableAudio" : "啟用音訊",
+   "tabs.item.enableNotification" : "啟用通知",
+   "tabs.item.enableService" : "啟用�務",
+   "tabs.item.reload" : "�新載入",
+   "welcome.loginButton" : "登入您的帳戶",
+   "welcome.signupButton" : "建立�費帳號",
+   "welcome.slogan" : "為你通信"
+}
diff --git a/src/index.html b/src/index.html
index 05a93e37b..9e5acd705 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,6 +23,24 @@
         s.async = true;
         s.setAttribute('src', lrHost + '/livereload.js');
         document.body.appendChild(s);
+
+        s.onload = () => {
+          console.log('livereload loaded');
+          const originalReloadBehaviour = window._onLiveReloadFileChanged;
+
+          window._onLiveReloadFileChanged = (file) => {
+            if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/')) {
+              originalReloadBehaviour(file);
+            } else {              
+              if (file.path.includes('/build/webview/')) {
+                console.log('Livereload: Reloading all webvies');
+                const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
+              } else {
+                console.log('Livereload: skip reload as only main process files have changed');
+              }
+            }
+          }
+        }
       })();
     }
   </script>
diff --git a/src/index.js b/src/index.js
index 6a08e5e5a..f82bb3590 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,6 +8,7 @@ import { isDevMode, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
+import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
@@ -26,14 +27,24 @@ if (isWindows) {
 }
 
 // Force single window
-const isSecondInstance = app.makeSingleInstance(() => {
+const isSecondInstance = app.makeSingleInstance((argv) => {
   if (mainWindow) {
     if (mainWindow.isMinimized()) mainWindow.restore();
     mainWindow.focus();
+
+    if (process.platform === 'win32') {
+      // Keep only command line / deep linked arguments
+      const url = argv.slice(1);
+
+      if (url) {
+        handleDeepLink(mainWindow, url.toString());
+      }
+    }
   }
 });
 
 if (isSecondInstance) {
+  console.log('An instance of Franz is already running. Exiting...');
   app.exit();
 }
 
@@ -176,3 +187,15 @@ app.on('activate', () => {
     mainWindow.show();
   }
 });
+
+app.on('will-finish-launching', () => {
+  // Protocol handler for osx
+  app.on('open-url', (event, url) => {
+    event.preventDefault();
+    console.log(`open-url event: ${url}`);
+    handleDeepLink(mainWindow, url);
+  });
+});
+
+// Register App URL
+app.setAsDefaultProtocolClient('franz');
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 6624ab75e..d01666d49 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -167,7 +167,7 @@ export default class FranzMenu {
             label: 'Settings',
             accelerator: 'CmdOrCtrl+,',
             click: () => {
-              this.actions.ui.openSettings({ path: '' });
+              this.actions.ui.openSettings({ path: 'app' });
             },
           },
           {
@@ -249,7 +249,7 @@ export default class FranzMenu {
   }
 
   @computed get serviceTpl() {
-    const services = this.stores.services.enabled;
+    const services = this.stores.services.allDisplayed;
 
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 9971df77c..1fc23ac89 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,10 +1,11 @@
 import emailParser from 'address-rfc2822';
+import semver from 'semver';
 
 export default class Recipe {
   id = '';
   name = '';
   description = '';
-  version = '1.0';
+  version = '';
   path = '';
 
   serviceURL = '';
@@ -15,6 +16,7 @@ export default class Recipe {
   hasTeamId = false;
   hasPredefinedUrl = false;
   hasCustomUrl = false;
+  hasHostedOption = false;
   urlInputPrefix = '';
   urlInputSuffix = '';
 
@@ -30,6 +32,10 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
+    if (!semver.valid(data.version)) {
+      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    }
+
     this.id = data.id || this.id;
     this.name = data.name || this.name;
     this.rawAuthor = data.author || this.author;
@@ -45,6 +51,7 @@ export default class Recipe {
     this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
     this.hasPredefinedUrl = data.config.hasPredefinedUrl || this.hasPredefinedUrl;
     this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
+    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
 
     this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
     this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
diff --git a/src/models/Service.js b/src/models/Service.js
index 958e4b11e..423510c7d 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -22,8 +22,10 @@ export default class Service {
   @observable team = '';
   @observable customUrl = '';
   @observable isNotificationEnabled = true;
+  @observable isBadgeEnabled = true;
   @observable isIndirectMessageBadgeEnabled = true;
-  @observable customIconUrl = '';
+  @observable iconUrl = '';
+  @observable hasCustomUploadedIcon = false;
   @observable hasCrashed = false;
 
   constructor(data, recipe) {
@@ -41,7 +43,8 @@ export default class Service {
     this.name = data.name || this.name;
     this.team = data.team || this.team;
     this.customUrl = data.customUrl || this.customUrl;
-    this.customIconUrl = data.customIconUrl || this.customIconUrl;
+    // this.customIconUrl = data.customIconUrl || this.customIconUrl;
+    this.iconUrl = data.iconUrl || this.iconUrl;
 
     this.order = data.order !== undefined
       ? data.order : this.order;
@@ -52,11 +55,16 @@ export default class Service {
     this.isNotificationEnabled = data.isNotificationEnabled !== undefined
       ? data.isNotificationEnabled : this.isNotificationEnabled;
 
+    this.isBadgeEnabled = data.isBadgeEnabled !== undefined
+      ? data.isBadgeEnabled : this.isBadgeEnabled;
+
     this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
       ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
 
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
+    this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
+
     this.recipe = recipe;
 
     autorun(() => {
@@ -93,15 +101,15 @@ export default class Service {
   }
 
   @computed get icon() {
-    if (this.hasCustomIcon) {
-      return this.customIconUrl;
+    if (this.iconUrl) {
+      return this.iconUrl;
     }
 
     return path.join(this.recipe.path, 'icon.svg');
   }
 
   @computed get hasCustomIcon() {
-    return (this.customIconUrl !== '');
+    return Boolean(this.iconUrl);
   }
 
   @computed get iconPNG() {
diff --git a/src/models/Settings.js b/src/models/Settings.js
index 3b352f9aa..ca44da258 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -1,4 +1,4 @@
-import { observable } from 'mobx';
+import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
@@ -8,6 +8,7 @@ export default class Settings {
   @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
   @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
   @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
+  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
   @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
   @observable locale = DEFAULT_APP_SETTINGS.locale;
   @observable beta = DEFAULT_APP_SETTINGS.beta;
@@ -16,4 +17,8 @@ export default class Settings {
   constructor(data) {
     Object.assign(this, data);
   }
+
+  update(data) {
+    extendObservable(this, data);
+  }
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 0b7c60bce..e33f50f05 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -1,10 +1,11 @@
 import { remote, ipcRenderer, shell } from 'electron';
-import { action, observable } from 'mobx';
+import { action, computed, observable } from 'mobx';
 import moment from 'moment';
 import key from 'keymaster';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
 import idleTimer from '@paulcbetts/system-idle-time';
 import AutoLaunch from 'auto-launch';
+import prettyBytes from 'pretty-bytes';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -14,7 +15,10 @@ import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
-const { app, powerMonitor } = remote;
+import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
+
+const { app } = remote;
+
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
@@ -30,6 +34,8 @@ export default class AppStore extends Store {
   };
 
   @observable healthCheckRequest = new Request(this.api.app, 'health');
+  @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
+  @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
 
   @observable autoLaunchOnStart = true;
 
@@ -45,7 +51,9 @@ export default class AppStore extends Store {
   miner = null;
   @observable minerHashrate = 0.0;
 
-  @observable isSystemMuted = false;
+  @observable isSystemMuteOverridden = false;
+
+  @observable isClearingAllCache = false;
 
   constructor(...args) {
     super(...args);
@@ -61,12 +69,14 @@ export default class AppStore extends Store {
     this.actions.app.healthCheck.listen(this._healthCheck.bind(this));
     this.actions.app.muteApp.listen(this._muteApp.bind(this));
     this.actions.app.toggleMuteApp.listen(this._toggleMuteApp.bind(this));
+    this.actions.app.clearAllCache.listen(this._clearAllCache.bind(this));
 
     this.registerReactions([
       this._offlineCheck.bind(this),
       this._setLocale.bind(this),
       this._handleMiner.bind(this),
       this._handleMinerThrottle.bind(this),
+      this._muteAppHandler.bind(this),
     ]);
   }
 
@@ -115,15 +125,31 @@ export default class AppStore extends Store {
       }
     });
 
+    // Handle deep linking (franz://)
+    ipcRenderer.on('navigateFromDeepLink', (event, data) => {
+      const { url } = data;
+      if (!url) return;
+
+      this.stores.router.push(data.url);
+    });
+
+    const TIMEOUT = 5000;
     // Check system idle time every minute
     setInterval(() => {
       this.idleTime = idleTimer.getIdleTime();
-    }, 60000);
+    }, TIMEOUT);
 
     // Reload all services after a healthy nap
-    powerMonitor.on('resume', () => {
-      setTimeout(window.location.reload, 5000);
-    });
+    // Alternative solution for powerMonitor as the resume event is not fired
+    // More information: https://github.com/electron/electron/issues/1615
+    let lastTime = (new Date()).getTime();
+    setInterval(() => {
+      const currentTime = (new Date()).getTime();
+      if (currentTime > (lastTime + TIMEOUT + 2000)) {
+        this._reactivateServices();
+      }
+      lastTime = currentTime;
+    }, TIMEOUT);
 
     // Set active the next service
     key(
@@ -137,7 +163,7 @@ export default class AppStore extends Store {
         this.actions.service.setActivePrev();
       });
 
-    // Global Mute 
+    // Global Mute
     key(
       '⌘+shift+m ctrl+shift+m', () => {
         this.actions.app.toggleMuteApp();
@@ -148,8 +174,14 @@ export default class AppStore extends Store {
     this._healthCheck();
   }
 
+  @computed get cacheSize() {
+    return prettyBytes(this.getAppCacheSizeRequest.execute().result || 0);
+  }
+
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
+    if (this.stores.settings.all.isAppMuted) return;
+
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
       if (serviceId) {
@@ -160,6 +192,11 @@ export default class AppStore extends Store {
         });
 
         this.actions.service.setActive({ serviceId });
+
+        if (!isMac) {
+          const mainWindow = remote.getCurrentWindow();
+          mainWindow.restore();
+        }
       }
     };
   }
@@ -217,7 +254,9 @@ export default class AppStore extends Store {
     this.healthCheckRequest.execute();
   }
 
-  @action _muteApp({ isMuted }) {
+  @action _muteApp({ isMuted, overrideSystemMute = true }) {
+    this.isSystemMuteOverriden = overrideSystemMute;
+
     this.actions.settings.update({
       settings: {
         isAppMuted: isMuted,
@@ -229,6 +268,23 @@ export default class AppStore extends Store {
     this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
   }
 
+  @action async _clearAllCache() {
+    this.isClearingAllCache = true;
+    const clearAppCache = this.clearAppCacheRequest.execute();
+    const allServiceIds = await getServiceIdsFromPartitions();
+    const allOrphanedServiceIds = allServiceIds.filter(id => !this.stores.services.all.find(s => id.replace('service-', '') === s.id));
+
+    await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
+
+    await Promise.all(this.stores.services.all.map(s => this.actions.service.clearCache({ serviceId: s.id })));
+
+    await clearAppCache._promise;
+
+    this.getAppCacheSizeRequest.execute();
+
+    this.isClearingAllCache = false;
+  }
+
   // Reactions
   _offlineCheck() {
     if (!this.isOnline) {
@@ -245,8 +301,10 @@ export default class AppStore extends Store {
   _setLocale() {
     const locale = this.stores.settings.all.locale;
 
-    if (locale && locale !== this.locale) {
+    if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
+    } else if (!locale) {
+      this.locale = this._getDefaultLocale();
     }
   }
 
@@ -271,6 +329,10 @@ export default class AppStore extends Store {
       locale = defaultLocale;
     }
 
+    if (!locale) {
+      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
+    }
+
     return locale;
   }
 
@@ -296,6 +358,14 @@ export default class AppStore extends Store {
     }
   }
 
+  _muteAppHandler() {
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    if (!showMessageBadgesEvenWhenMuted) {
+      this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 });
+    }
+  }
+
   // Helpers
   async _appStartsCounter() {
     // we need to wait until the settings request is resolved
@@ -325,7 +395,23 @@ export default class AppStore extends Store {
     return autoLauncher.isEnabled() || false;
   }
 
+  _reactivateServices(retryCount = 0) {
+    if (!this.isOnline) {
+      console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
+      setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
+    } else {
+      console.debug('reactivateServices: reload all services');
+      this.actions.service.reloadAll();
+    }
+  }
+
   _systemDND() {
-    this.isSystemMuted = getDoNotDisturb();
+    const dnd = getDoNotDisturb();
+    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+      this.actions.app.muteApp({
+        isMuted: dnd,
+        overrideSystemMute: false,
+      });
+    }
   }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 22c376c06..20e07e540 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -16,6 +16,7 @@ export default class ServicesStore extends Store {
   @observable updateServiceRequest = new Request(this.api.services, 'update');
   @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
   @observable deleteServiceRequest = new Request(this.api.services, 'delete');
+  @observable clearCacheRequest = new Request(this.api.services, 'clearCache');
 
   @observable filterNeedle = null;
 
@@ -31,6 +32,7 @@ export default class ServicesStore extends Store {
     this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
     this.actions.service.updateService.listen(this._updateService.bind(this));
     this.actions.service.deleteService.listen(this._deleteService.bind(this));
+    this.actions.service.clearCache.listen(this._clearCache.bind(this));
     this.actions.service.setWebviewReference.listen(this._setWebviewReference.bind(this));
     this.actions.service.focusService.listen(this._focusService.bind(this));
     this.actions.service.focusActiveService.listen(this._focusActiveService.bind(this));
@@ -172,9 +174,29 @@ export default class ServicesStore extends Store {
     const data = this._cleanUpTeamIdAndCustomUrl(service.recipe.id, serviceData);
     const request = this.updateServiceRequest.execute(serviceId, data);
 
+    const newData = serviceData;
+    if (serviceData.iconFile) {
+      await request._promise;
+
+      newData.iconUrl = request.result.data.iconUrl;
+      newData.hasCustomUploadedIcon = true;
+    }
+
     this.allServicesRequest.patch((result) => {
       if (!result) return;
-      Object.assign(result.find(c => c.id === serviceId), serviceData);
+
+      // patch custom icon deletion
+      if (data.customIcon === 'delete') {
+        newData.iconUrl = '';
+        newData.hasCustomUploadedIcon = false;
+      }
+
+      // patch custom icon url
+      if (data.customIconUrl) {
+        newData.iconUrl = data.customIconUrl;
+      }
+
+      Object.assign(result.find(c => c.id === serviceId), newData);
     });
 
     await request._promise;
@@ -205,6 +227,13 @@ export default class ServicesStore extends Store {
     gaEvent('Service', 'delete', service.recipe.id);
   }
 
+  @action async _clearCache({ serviceId }) {
+    this.clearCacheRequest.reset();
+    const request = this.clearCacheRequest.execute(serviceId);
+    await request._promise;
+    gaEvent('Service', 'clear cache');
+  }
+
   @action _setActive({ serviceId }) {
     const service = this.one(serviceId);
 
@@ -297,7 +326,7 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
         Object.assign(options, {
           silent: true,
         });
@@ -316,7 +345,7 @@ export default class ServicesStore extends Store {
       }
     } else if (channel === 'avatar') {
       const url = args[0];
-      if (service.customIconUrl !== url) {
+      if (service.iconUrl !== url && !service.hasCustomUploadedIcon) {
         service.customIconUrl = url;
 
         this.actions.service.updateService({
@@ -327,6 +356,10 @@ export default class ServicesStore extends Store {
           redirect: false,
         });
       }
+    } else if (channel === 'new-window') {
+      const url = args[0];
+
+      this.actions.app.openExternalUrl({ url });
     }
   }
 
@@ -368,7 +401,7 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
     service.resetMessageCount();
 
-    service.webview.reload();
+    service.webview.loadURL(service.url);
   }
 
   @action _reloadActive() {
@@ -488,19 +521,27 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const unreadDirectMessageCount = this.enabled
+    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    const unreadDirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
       .map(s => s.unreadDirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    const unreadIndirectMessageCount = this.enabled
-      .filter(s => s.isIndirectMessageBadgeEnabled)
+    const unreadIndirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled))
       .map(s => s.unreadIndirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    this.actions.app.setBadge({
-      unreadDirectMessageCount,
-      unreadIndirectMessageCount,
-    });
+    // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
+    if (showMessageBadgesEvenWhenMuted) {
+      console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount);
+      this.actions.app.setBadge({
+        unreadDirectMessageCount,
+        unreadIndirectMessageCount,
+      });
+    }
   }
 
   _logoutReaction() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 30058f41d..da99a720f 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -5,6 +5,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
+import SettingsModel from '../models/Settings';
 
 export default class SettingsStore extends Store {
   @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
@@ -25,7 +26,7 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
-    return this.allSettingsRequest.result || {};
+    return new SettingsModel(this.allSettingsRequest.result);
   }
 
   @action async _update({ settings }) {
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index cb45b88b5..5e9cc9ba7 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,4 +1,4 @@
-import { action, observable } from 'mobx';
+import { action, observable, computed } from 'mobx';
 
 import Store from './lib/Store';
 
@@ -14,6 +14,12 @@ export default class UIStore extends Store {
     this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
   }
 
+  @computed get showMessageBadgesEvenWhenMuted() {
+    const settings = this.stores.settings.all;
+
+    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+  }
+
   // Actions
   @action _openSettings({ path = '/settings' }) {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 1cb2ecac3..09000dcdb 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -26,6 +26,7 @@ export default class UserStore extends Store {
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
   @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+  @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
   @observable isImportLegacyServicesExecuting = false;
   @observable isImportLegacyServicesCompleted = false;
@@ -57,6 +58,7 @@ export default class UserStore extends Store {
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.user.importLegacyServices.listen(this._importLegacyServices.bind(this));
+    this.actions.user.delete.listen(this._delete.bind(this));
 
     // Reactions
     this.registerReactions([
@@ -212,6 +214,10 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesCompleted = true;
   }
 
+  @action async _delete() {
+    this.deleteAccountRequest.execute();
+  }
+
   // This is a mobx autorun which forces the user to login if not authenticated
   _requireAuthenticatedUser = () => {
     if (this.isTokenExpired) {
diff --git a/src/styles/button.scss b/src/styles/button.scss
index 75d2cb1d4..8d2adbbcc 100644
--- a/src/styles/button.scss
+++ b/src/styles/button.scss
@@ -48,6 +48,18 @@
     }
   }
 
+  &.franz-form__button--warning {
+    background: $theme-brand-warning;
+
+    &:hover {
+      background: darken($theme-brand-warning, 5%);
+    }
+
+    &:active {
+      background: lighten($theme-brand-warning, 5%);
+    }
+  }
+
   &.franz-form__button--inverted {
     background: none;
     padding: 10px 20px;
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss
index aa3c8594b..47dfea2c4 100644
--- a/src/styles/content-tabs.scss
+++ b/src/styles/content-tabs.scss
@@ -12,15 +12,17 @@
       flex: 1;
       // border: 1px solid $theme-gray-lightest;
       color: $theme-gray-dark;
-      background: $theme-gray-lightest;
-      border-bottom: 1px solid $theme-gray-lighter;
-      box-shadow: inset 0px -3px 10px rgba(black, 0.05);
-      transition: all $theme-transition-time;
+      background: linear-gradient($theme-gray-lightest 80%, darken($theme-gray-lightest, 3%));
+      border-right: 1px solid $theme-gray-lighter;
+      transition: background $theme-transition-time;
+
+      &:last-of-type {
+        border-right: 0;
+      }
 
       &.is-active {
         background: $theme-brand-primary;
         color: #FFF;
-        border-bottom: 1px solid $theme-brand-primary;
         box-shadow: none;
       }
     }
diff --git a/src/styles/image-upload.scss b/src/styles/image-upload.scss
new file mode 100644
index 000000000..06176a7af
--- /dev/null
+++ b/src/styles/image-upload.scss
@@ -0,0 +1,91 @@
+.image-upload {
+  position: absolute;
+  width: 140px;
+  height: 140px;
+  border: 1px solid $theme-gray-lighter;
+  border-radius: $theme-border-radius-small;
+  background: $theme-gray-lightest;
+  overflow: hidden;
+  margin-top: 5px;
+
+  &__preview,
+  &__action {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+  }
+
+  &__preview {
+    z-index: 1;
+    background-size: cover;
+    background-size: 100%;
+    background-repeat: no-repeat;
+    background-position: center center;
+    border-radius: 3px;
+  }
+
+  &__action {
+    position: relative;
+    z-index: 10;
+    opacity: 0;
+    transition: opacity 0.5s;
+    display: flex;
+    justify-content: center;
+
+    &-background {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: rgba($theme-gray, 0.7);
+      z-index: 10;
+    }
+
+    button {
+      position: relative;
+      z-index: 100;
+      color: #FFF;
+
+      .mdi {
+        color: #FFF;
+      }
+    }
+  }
+
+  &__dropzone {
+    text-align: center;
+    border-radius: 5px;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+
+  &__dropzone, 
+  button {
+    .mdi {
+      margin-bottom: 5px;
+    }
+
+    p {
+      font-size: 10px;
+      line-height: 10px;
+    }
+  }
+
+  &:hover {
+    .image-upload__action {
+      opacity: 1;
+    }
+  }
+}
+
+.image-upload-wrapper {
+  .mdi {
+    font-size: 40px;
+    color: $theme-gray-light;
+  }
+}
\ No newline at end of file
diff --git a/src/styles/input.scss b/src/styles/input.scss
index 814dce5f8..7042f56e8 100644
--- a/src/styles/input.scss
+++ b/src/styles/input.scss
@@ -47,6 +47,10 @@
     padding: 8px;
     // font-size: 18px;
     color: $theme-gray;
+
+    &::placeholder {
+      color: lighten($theme-gray-light, 10%);
+    }
   }
 
   .franz-form__input-prefix,
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 0a082729c..261396f6f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -35,3 +35,4 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './button.scss';
 @import './searchInput.scss';
 @import './select.scss';
+@import './image-upload.scss';
diff --git a/src/styles/searchInput.scss b/src/styles/searchInput.scss
index 28ff09fc4..633a31e09 100644
--- a/src/styles/searchInput.scss
+++ b/src/styles/searchInput.scss
@@ -1,4 +1,20 @@
 .search-input {
   width: 100%;
   height: auto;
+  display: flex;
+  align-items: center;
+  padding: 0 10px;
+  border-radius: 30px;
+  background: $theme-gray-lightest;
+  padding: 5px 10px;
+  @extend %headline;
+  color: $theme-gray-light;
+
+  input {
+    padding-left: 10px;
+    background: none;
+    border: 0;
+    flex: 1;
+    color: $theme-gray-light;
+  }
 }
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 282c15121..9f6cfc772 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -24,6 +24,7 @@
       display: inline-flex;
       width: 0px;
       height: 0px;
+      background: $theme-gray-lighter;
     }
 
     &.is-active {
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 6e93094b4..2182c9b5f 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -111,6 +111,26 @@
     &::-webkit-scrollbar-thumb:window-inactive {
         background: none;
     }
+    
+    .service-flex-grid {
+      display: flex;
+    }
+
+    .service-name {
+      flex: 1px;
+    }
+
+    .service-icon {
+      width: 140px;
+      float: right;
+      margin-top: 30px;
+      margin-left: 40px;
+
+      label {
+        font-weight: bold;
+        letter-spacing: -0.1px;
+      }
+    }
   }
 
   .settings__close {
@@ -129,30 +149,28 @@
     }
   }
 
-  .settings__search-header {
-    display: flex;
-    align-items: center;
-    padding: 0 10px;
-    border-radius: $theme-border-radius;
-    transition: background $theme-transition-time;
-    @extend %headline;
-    font-size: 22px;
-
-    &:hover {
-      background: darken($theme-gray-lighter, 5%);
-    }
+  .search-input {
+    margin-bottom: 30px;
+  }
 
-    input {
-      padding-left: 10px;
-      background: none;
-      border: 0;
-      flex: 1;
-      @extend %headline;
-    }
+  &__options {
+    margin-top: 20px;
+    flex: 1;
   }
 
-  .settings__options {
-    margin-top: 30px;
+  &__settings-group {
+    margin-top: 10px;
+
+    h3 {
+      font-weight: bold;
+      margin: 25px 0 15px;
+      color: $theme-gray-light;
+      letter-spacing: -0.1px;
+
+      &:first-of-type {
+        margin-top: 0;
+      }
+    }
   }
 
   .settings__message {
@@ -173,10 +191,6 @@
     margin: -10px 0 20px 55px;;
     font-size: 12px;
     color: $theme-gray-light;
-
-    &:last-of-type {
-      margin-bottom: 30px;
-    }
   }
 
   .settings__controls {
@@ -281,6 +295,10 @@
       margin-left: auto;
     }
 
+    .franz-form__button {
+      white-space: nowrap;
+    }
+
     div {
       height: auto;
     }
@@ -308,12 +326,6 @@
     }
   }
 
-  // @include element(add-service-teaser) {
-  //   height: auto;
-  //   margin-top: 20px;
-  //   display: block;
-  //   text-align: center;
-  // }
   .emoji {
     display: block;
     font-size: 40px;
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
index 3ffc53558..ac48aabd6 100644
--- a/src/styles/tabs.scss
+++ b/src/styles/tabs.scss
@@ -78,6 +78,26 @@
     }
   }
 
+  .tab-item__info-badge {
+    width: 17px;
+    height: 17px;
+    background: $theme-gray-light;
+    color: $theme-gray-lighter;
+    border-radius: 20px;
+    padding: 0px 5px;
+    font-size: 11px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &.is-indirect {
+      padding-top: 0px;
+    }
+  }
+
   &.is-reordering {
     z-index: 99999;
   }
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss
index 5365921fb..46299b966 100644
--- a/src/styles/welcome.scss
+++ b/src/styles/welcome.scss
@@ -58,17 +58,25 @@
     }
 
     &__featured-services {
-      margin-top: 150px;
       text-align: center;
-      margin-top: 80px;
+      width: 480px;
+      margin: 80px auto 0 auto;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background: #FFF;
+      border-radius: 6px;
+      padding: 20px 20px 5px;
     }
 
     &__featured-service {
       width: 35px;
-      margin-right: 30px;
+      height: 35px;
+      margin: 0 10px 15px;
+      transition: 0.5s filter, 0.5s opacity;
 
-      &:last-of-type {
-        margin-right: 0;
+      img {
+        width: 35px;
       }
     }
   }
diff --git a/src/webview/ime.js b/src/webview/ime.js
deleted file mode 100644
index 43df6267c..000000000
--- a/src/webview/ime.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const { ipcRenderer } = require('electron');
-const { claimDocumentFocus } = require('../helpers/webview-ime-focus-helpers');
-
-ipcRenderer.on('claim-document-focus', claimDocumentFocus);
-
-window.addEventListener('DOMContentLoaded', () => {
-  if (document.querySelector('[autofocus]')) {
-    ipcRenderer.sendToHost('autofocus');
-  }
-});
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 048beea69..be29142af 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -40,8 +40,8 @@ class RecipeWebview {
       && this.countCache.indirect === indirect) return;
 
     const count = {
-      direct,
-      indirect,
+      direct: direct > 0 ? direct : 0,
+      indirect: indirect > 0 ? indirect : 0,
     };
 
     ipcRenderer.sendToHost('messages', count);
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 4f602bfdb..2020bbdc6 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -16,7 +16,9 @@ class Notification {
     }));
 
     ipcRenderer.once(`notification-onclick:${this.notificationId}`, () => {
-      this.onclick();
+      if (typeof this.onclick === 'function') {
+        this.onclick();
+      }
     });
   }
 
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index c877132b1..d9e021e6d 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -1,13 +1,12 @@
 import { ipcRenderer } from 'electron';
+import { ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 import path from 'path';
 
+import { isDevMode } from '../environment';
 import RecipeWebview from './lib/RecipeWebview';
 
-import Spellchecker from './spellchecker.js';
-import './notifications.js';
-import './ime.js';
-
-const spellchecker = new Spellchecker();
+import Spellchecker from './spellchecker';
+import './notifications';
 
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
@@ -21,20 +20,34 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   }
 });
 
+const spellchecker = new Spellchecker();
+spellchecker.initialize();
+
+const contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
+
+new ContextMenuListener((info) => { // eslint-disable-line
+  contextMenuBuilder.showPopupMenu(info);
+});
+
 ipcRenderer.on('settings-update', (e, data) => {
-  if (data.enableSpellchecking) {
-    if (!spellchecker.isEnabled) {
-      spellchecker.enable();
-
-      // TODO: this does not work yet, needs more testing
-      // if (data.spellcheckingLanguage !== 'auto') {
-      //   console.log('set spellchecking language to', data.spellcheckingLanguage);
-      //   spellchecker.switchLanguage(data.spellcheckingLanguage);
-      // }
-    }
-  }
+  console.log('settings-update', data);
+  spellchecker.toggleSpellchecker(data.enableSpellchecking);
 });
 
+// initSpellche
+
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
 }, false);
+
+// Patching window.open
+const originalWindowOpen = window.open;
+
+window.open = (url, frameName, features) => {
+  // We need to differentiate if the link should be opened in a popup or in the systems default browser 
+  if (!frameName && !features) {
+    return ipcRenderer.sendToHost('new-window', url);
+  }
+
+  return originalWindowOpen(url, frameName, features);
+};
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 5beb77e03..a504a4039 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,30 +1,63 @@
-import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
+import { SpellCheckHandler } from 'electron-spellchecker';
 
 import { isMac } from '../environment';
 
 export default class Spellchecker {
-  isEnabled = false;
-  spellchecker = null;
+  isInitialized = false;
+  handler = null;
+  initRetries = 0;
+  DOMCheckInterval = null;
+
+  get inputs() {
+    return document.querySelectorAll('input[type="text"], [contenteditable="true"], textarea');
+  }
+
+  initialize() {
+    this.handler = new SpellCheckHandler();
 
-  enable() {
-    this.spellchecker = new SpellCheckHandler();
     if (!isMac) {
-      this.spellchecker.attachToInput();
-      this.spellchecker.switchLanguage(navigator.language);
+      this.attach();
+    } else {
+      this.isInitialized = true;
+    }
+  }
+
+  attach() {
+    let initFailed = false;
+
+    if (this.initRetries > 3) {
+      console.error('Could not initialize spellchecker');
+      return;
     }
 
-    const contextMenuBuilder = new ContextMenuBuilder(this.spellchecker);
+    try {
+      this.handler.attachToInput();
+      this.handler.switchLanguage(navigator.language);
+    } catch (err) {
+      initFailed = true;
+      this.initRetries = +1;
+      setTimeout(() => { this.attach(); console.warn('Spellchecker init failed, trying again in 5s'); }, 5000);
+    }
 
-    new ContextMenuListener((info) => { // eslint-disable-line
-      contextMenuBuilder.showPopupMenu(info);
+    if (!initFailed) {
+      this.isInitialized = true;
+    }
+  }
+
+  toggleSpellchecker(enable = false) {
+    this.inputs.forEach((input) => {
+      input.setAttribute('spellcheck', enable);
     });
+
+    this.intervalHandler(enable);
   }
 
-  // TODO: this does not work yet, needs more testing
-  // switchLanguage(language) {
-  //   if (language !== 'auto') {
-  //     this.spellchecker.switchLanguage(language);
-  //   }
-  // }
+  intervalHandler(enable) {
+    clearInterval(this.DOMCheckInterval);
+
+    if (enable) {
+      this.DOMCheckInterval = setInterval(() => this.toggleSpellchecker(enable), 30000);
+    }
+  }
 }
 
diff --git a/yarn.lock b/yarn.lock
index 6c3f807a4..58befebf1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -39,7 +39,7 @@
     rimraf "^2.4.0"
     underscore "^1.6.0"
 
-"@paulcbetts/spellchecker@^4.0.5":
+"@paulcbetts/spellchecker@^4.0.6":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@paulcbetts/spellchecker/-/spellchecker-4.0.6.tgz#79ef1f9c19c5a3156921ccaa9ffdc3efbbee47e3"
   dependencies:
@@ -333,10 +333,18 @@ async@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
+async@~0.1.22:
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.1.22.tgz#0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+attr-accept@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.0.tgz#b5cd35227f163935a8f1de10ed3eba16941f6be6"
+
 "auto-launch@https://github.com/meetfranz/node-auto-launch.git":
   version "5.0.1"
   resolved "https://github.com/meetfranz/node-auto-launch.git#b90a0470467eb84435e6554ae9db1e2c6db79e61"
@@ -1303,6 +1311,10 @@ capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
 
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1779,6 +1791,12 @@ dotenv@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
 
+du@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/du/-/du-0.1.0.tgz#f26e340a09c7bc5b6fd69af6dbadea60fa8c6f4d"
+  dependencies:
+    async "~0.1.22"
+
 duplexer2@0.0.2, duplexer2@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -2013,12 +2031,12 @@ electron-remote@^1.1.1:
     rxjs "^5.0.0-beta.12"
     xmlhttprequest "^1.8.0"
 
-electron-spellchecker@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/electron-spellchecker/-/electron-spellchecker-1.2.0.tgz#f6306afd4078244c1e6311370667d95b873fbcbb"
+electron-spellchecker@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/electron-spellchecker/-/electron-spellchecker-1.1.2.tgz#5fbe1e65d246b77e6e7433ee2387d9d26010f7a8"
   dependencies:
     "@paulcbetts/cld" "^2.4.6"
-    "@paulcbetts/spellchecker" "^4.0.5"
+    "@paulcbetts/spellchecker" "^4.0.6"
     bcp47 "^1.1.2"
     debug "^2.6.3"
     electron-remote "^1.1.1"
@@ -2724,6 +2742,16 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -2974,6 +3002,29 @@ gulp-babel@^6.1.2:
     through2 "^2.0.0"
     vinyl-sourcemaps-apply "^0.2.0"
 
+gulp-cli@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.2.2.tgz#7392def6316c6e7939a4f296f3f540151ae3a275"
+  dependencies:
+    archy "^1.0.0"
+    chalk "^1.1.0"
+    fancy-log "^1.1.0"
+    gulplog "^1.0.0"
+    interpret "^1.0.0"
+    liftoff "^2.1.0"
+    lodash.isfunction "^3.0.8"
+    lodash.isplainobject "^4.0.4"
+    lodash.isstring "^4.0.1"
+    lodash.sortby "^4.5.0"
+    matchdep "^1.0.0"
+    mute-stdout "^1.0.0"
+    pretty-hrtime "^1.0.0"
+    semver-greatest-satisfied-range "^1.0.0"
+    tildify "^1.0.0"
+    v8flags "^2.0.9"
+    wreck "^6.3.0"
+    yargs "^3.28.0"
+
 gulp-cli@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88"
@@ -3095,6 +3146,15 @@ har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
+har-validator@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  dependencies:
+    chalk "^1.1.1"
+    commander "^2.9.0"
+    is-my-json-valid "^2.12.4"
+    pinkie-promise "^2.0.0"
+
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -3410,6 +3470,15 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-my-json-valid@^2.12.4:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -3468,6 +3537,10 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -3663,6 +3736,10 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
 jsonwebtoken@^7.4.1:
   version "7.4.3"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz#77f5021de058b605a1783fa1283e99812e645638"
@@ -3768,7 +3845,7 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-liftoff@^2.3.0:
+liftoff@^2.1.0, liftoff@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
   dependencies:
@@ -4204,9 +4281,9 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
-mobx-react-form@1.24.0:
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.24.0.tgz#bc9fbd652e65fb1f2b51917865d465fcaab7f0d9"
+mobx-react-form@^1.32.2:
+  version "1.32.2"
+  resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.32.2.tgz#5610dd0e4fab006acf2daf1becbedecad182a5a0"
   dependencies:
     lodash "^4.16.2"
 
@@ -4331,7 +4408,7 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-sass@^4.2.0, node-sass@^4.5.3:
+node-sass@^4.2.0:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
   dependencies:
@@ -4354,6 +4431,30 @@ node-sass@^4.2.0, node-sass@^4.5.3:
     sass-graph "^2.1.1"
     stdout-stream "^1.4.0"
 
+node-sass@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.3.2"
+    node-gyp "^3.3.1"
+    npmlog "^4.0.0"
+    request "~2.79.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
 node-watch@^0.3.4:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.3.5.tgz#a07f253a4f538de9d4ca522dd7f1996eeec0d97e"
@@ -4808,6 +4909,10 @@ pretty-bytes@^1.0.2, pretty-bytes@^1.0.4:
     get-stdin "^4.0.1"
     meow "^3.1.0"
 
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -4884,6 +4989,10 @@ q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
+qs@~6.3.0:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@@ -4940,6 +5049,13 @@ react-dom@^15.4.1:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-dropzone@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-4.2.1.tgz#695e80bd0b065f1181e69f2d0f6d1d5cc72664c9"
+  dependencies:
+    attr-accept "^1.0.3"
+    prop-types "^15.5.7"
+
 react-electron-web-view@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/react-electron-web-view/-/react-electron-web-view-2.0.1.tgz#984b7bbbeb77e35bcca921dc50120fc8f2b0f27d"
@@ -5228,6 +5344,31 @@ request@2, request@^2.45.0, request@^2.54.0, request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@~2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -5331,7 +5472,7 @@ sanitize-filename@^1.6.0, sanitize-filename@^1.6.1:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sass-graph@^2.1.1:
+sass-graph@^2.1.1, sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
   dependencies:
@@ -5901,6 +6042,12 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+"true-case-path@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
+  dependencies:
+    glob "^6.0.4"
+
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -5917,6 +6064,10 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tunnel-agent@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -6276,7 +6427,7 @@ xmlhttprequest@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"