26 files changed, 569 insertions, 230 deletions

diff --git a/package.json b/package.json
index abb7dca68..888cb5e0e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdium",
   "desktopName": "ferdium.desktop",
   "appId": "org.ferdium.ferdium-app",
-  "version": "6.7.4-nightly.2",
+  "version": "6.7.5-nightly.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
   "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)",
   "license": "Apache-2.0",
@@ -163,7 +163,7 @@
     "chalk": "5.3.0",
     "concurrently": "8.2.2",
     "cross-env": "7.0.3",
-    "electron": "30.0.2",
+    "electron": "30.0.6",
     "electron-builder": "24.13.3",
     "esbuild": "0.16.17",
     "esbuild-plugin-copy": "2.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 20737139d..934011d21 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,7 +40,7 @@ dependencies:
     version: 5.1.0
   '@electron/remote':
     specifier: 2.1.2
-    version: 2.1.2(electron@30.0.2)
+    version: 2.1.2(electron@30.0.6)
   '@emotion/react':
     specifier: 11.11.4
     version: 11.11.4(@types/react@18.2.77)(react@18.2.0)
@@ -70,7 +70,7 @@ dependencies:
     version: 7.4.0(history@5.3.0)(mobx@6.12.3)(path-to-regexp@6.2.2)
   '@syed_umair/electron-process-manager':
     specifier: 1.1.0
-    version: 1.1.0(electron@30.0.2)
+    version: 1.1.0(electron@30.0.6)
   auto-launch:
     specifier: 5.0.6
     version: 5.0.6
@@ -352,8 +352,8 @@ devDependencies:
     specifier: 7.0.3
     version: 7.0.3
   electron:
-    specifier: 30.0.2
-    version: 30.0.2
+    specifier: 30.0.6
+    version: 30.0.6
   electron-builder:
     specifier: 24.13.3
     version: 24.13.3(electron-builder-squirrel-windows@24.13.3)
@@ -646,7 +646,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.24.5
-      picocolors: 1.0.0
+      picocolors: 1.0.1
 
   /@babel/compat-data@7.22.20:
     resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==}
@@ -908,7 +908,7 @@ packages:
       '@babel/helper-validator-identifier': 7.24.5
       chalk: 2.4.2
       js-tokens: 4.0.0
-      picocolors: 1.0.0
+      picocolors: 1.0.1
 
   /@babel/parser@7.23.5:
     resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==}
@@ -1494,12 +1494,12 @@ packages:
       - supports-color
     dev: true
 
-  /@electron/remote@2.1.2(electron@30.0.2):
+  /@electron/remote@2.1.2(electron@30.0.6):
     resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==}
     peerDependencies:
       electron: '>= 13.0.0'
     dependencies:
-      electron: 30.0.2
+      electron: 30.0.6
     dev: false
 
   /@electron/universal@1.5.1:
@@ -3024,12 +3024,12 @@ packages:
       path-to-regexp: 6.2.2
     dev: false
 
-  /@syed_umair/electron-process-manager@1.1.0(electron@30.0.2):
+  /@syed_umair/electron-process-manager@1.1.0(electron@30.0.6):
     resolution: {integrity: sha512-rbDJ1GQ51DcsP+354WpI/3xWOra1HH4cT1jA0maK8VJogn7s5BiMO2XkSBaCoeMCvTIIwx7Y6dgUHpfnL2M6wg==}
     peerDependencies:
       electron: '>=21'
     dependencies:
-      electron: 30.0.2
+      electron: 30.0.6
       electron-process-reporter: 1.4.0
     dev: false
 
@@ -4722,7 +4722,7 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001615
+      caniuse-lite: 1.0.30001620
       electron-to-chromium: 1.4.710
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
@@ -4973,8 +4973,8 @@ packages:
     resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
     dev: false
 
-  /caniuse-lite@1.0.30001615:
-    resolution: {integrity: sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==}
+  /caniuse-lite@1.0.30001620:
+    resolution: {integrity: sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==}
 
   /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
@@ -6217,8 +6217,8 @@ packages:
       mkdirp: 0.5.6
     dev: false
 
-  /electron@30.0.2:
-    resolution: {integrity: sha512-zv7T+GG89J/hyWVkQsLH4Y/rVEfqJG5M/wOBIGNaDdqd8UV9/YZPdS7CuFeaIj0H9LhCt95xkIQNpYB/3svOkQ==}
+  /electron@30.0.6:
+    resolution: {integrity: sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
     requiresBuild: true
@@ -11322,6 +11322,9 @@ packages:
   /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
+  /picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
+
   /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
diff --git a/recipes b/recipes
-Subproject 7ab6497fbd7bc64c3f2b17b587d273c9bbd155c
+Subproject dd668a67d84ee37cc8a9d39aea2e7b17ef93f31
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index b5dd499ab..5434880dc 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -12,6 +12,7 @@ import {
   statSync,
   writeFileSync,
 } from 'fs-extra';
+import ms from 'ms';
 import tar from 'tar';
 
 import RecipeModel, { type IRecipe } from '../../models/Recipe';
@@ -460,7 +461,7 @@ export default class ServerApi {
     }
     debug(archivePath);
 
-    await sleep(10);
+    await sleep(ms('10ms'));
 
     await tar.x({
       file: archivePath,
@@ -471,14 +472,21 @@ export default class ServerApi {
       onwarn: x => debug('warn', recipeId, x),
     });
 
-    await sleep(10);
+    await sleep(ms('10ms'));
 
-    const { id } = readJsonSync(join(recipeTempDirectory, 'package.json'));
+    const { id, defaultIcon } = readJsonSync(
+      join(recipeTempDirectory, 'package.json'),
+    );
     const recipeDirectory = join(recipesDirectory, id);
     copySync(recipeTempDirectory, recipeDirectory);
     removeSync(recipeTempDirectory);
     removeSync(join(recipesDirectory, recipeId, 'recipe.tar.gz'));
 
+    // TODO: This is a temporary fix to remove svg icons from the user AppData. This should be removed after versions of all recipes have been bumped up
+    if (defaultIcon) {
+      removeSync(join(recipeDirectory, 'icon.svg'));
+    }
+
     return id;
   }
 
diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx
index 0e999506a..94c0b7e7f 100644
--- a/src/components/services/tabs/TabItem.tsx
+++ b/src/components/services/tabs/TabItem.tsx
@@ -364,10 +364,10 @@ class TabItem extends Component<IProps, IState> {
         role="presentation"
         onContextMenu={() => menu.popup()}
         data-tooltip-id="tooltip-sidebar-button"
-        data-tooltip-content={`${service.name} ${acceleratorString(
-          shortcutIndex,
-          cmdOrCtrlShortcutKey(false),
-        )}`}
+        data-tooltip-content={`${service.name} ${acceleratorString({
+          index: shortcutIndex,
+          keyCombo: cmdOrCtrlShortcutKey(false),
+        })}`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />
         {showServiceNameSetting && (
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index c3e8d46a0..2900aa2af 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -1,5 +1,6 @@
 import { systemPreferences } from '@electron/remote';
 import { mdiGithub, mdiOpenInNew, mdiPowerPlug } from '@mdi/js';
+import { ipcRenderer } from 'electron';
 import { noop } from 'lodash';
 import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
@@ -191,6 +192,14 @@ const messages = defineMessages({
     id: 'settings.app.subheadlineCache',
     defaultMessage: 'Cache',
   },
+  subheadlineUserAgent: {
+    id: 'settings.app.subheadlineUserAgent',
+    defaultMessage: 'User Agent',
+  },
+  subheadlineDownloads: {
+    id: 'settings.app.subheadlineDownloads',
+    defaultMessage: 'Downloads',
+  },
   cacheInfo: {
     id: 'settings.app.cacheInfo',
     defaultMessage: 'Ferdium cache is currently using {size} of disk space.',
@@ -281,6 +290,10 @@ const messages = defineMessages({
     id: 'settings.app.buttonOpenFerdiumCertsFolder',
     defaultMessage: 'Open certificates folder',
   },
+  buttonOpenFolderSelector: {
+    id: 'settings.app.buttonOpenFolderSelector',
+    defaultMessage: 'Open folder selector',
+  },
 });
 
 const Hr = (): ReactElement => (
@@ -1034,49 +1047,87 @@ class EditSettingsForm extends Component<IProps, IState> {
 
                 <Hr />
 
-                <Input
-                  placeholder="User Agent"
-                  onChange={e => this.submit(e)}
-                  {...form.$('userAgentPref').bind()}
-                />
-                <p className="settings__help">
-                  {intl.formatMessage(globalMessages.userAgentHelp)}
-                </p>
-                <p className="settings__help">
-                  {intl.formatMessage(messages.appRestartRequired)}
-                </p>
+                <div className="settings__settings-group">
+                  <H3>{intl.formatMessage(messages.subheadlineDownloads)}</H3>
+
+                  <Input
+                    placeholder="Default download folder"
+                    onChange={e => {
+                      this.submit(e);
+                    }}
+                    {...form.$('downloadFolderPath').bind()}
+                  />
+
+                  <Button
+                    buttonType="secondary"
+                    label={intl.formatMessage(
+                      messages.buttonOpenFolderSelector,
+                    )}
+                    className="settings__open-settings-cache-button"
+                    onClick={e => {
+                      ipcRenderer
+                        .invoke('download-folder-select')
+                        .then(path => {
+                          if (path) {
+                            form.$('downloadFolderPath').set(path);
+                            this.submit(e);
+                          }
+                        })
+                        .catch(console.error);
+                    }}
+                    disabled={isClearingAllCache}
+                    loaded={!isClearingAllCache}
+                  />
+                </div>
 
                 <Hr />
 
                 <div className="settings__settings-group">
-                  <H3>{intl.formatMessage(messages.subheadlineCache)}</H3>
-                  <p>
-                    {intl.formatMessage(messages.cacheInfo, {
-                      size: cacheSize,
-                    })}
+                  <Input
+                    placeholder="User Agent"
+                    onChange={e => this.submit(e)}
+                    {...form.$('userAgentPref').bind()}
+                  />
+
+                  <p className="settings__help">
+                    {intl.formatMessage(globalMessages.userAgentHelp)}
                   </p>
-                  {notCleared && (
-                    <p>{intl.formatMessage(messages.cacheNotCleared)}</p>
-                  )}
+                  <p className="settings__help">
+                    {intl.formatMessage(messages.appRestartRequired)}
+                  </p>
+
+                  <Hr />
+
                   <div className="settings__settings-group">
-                    <div className="settings__open-settings-cache-container">
-                      <Button
-                        buttonType="secondary"
-                        label={intl.formatMessage(globalMessages.clearCache)}
-                        className="settings__open-settings-cache-button"
-                        onClick={() => {
-                          onClearAllCache();
-                          this.onClearCacheClicked();
-                        }}
-                        disabled={isClearingAllCache}
-                        loaded={!isClearingAllCache}
-                      />
-                      <Button
-                        buttonType="secondary"
-                        label="Open Process Manager"
-                        className="settings__open-settings-cache-button"
-                        onClick={openProcessManager}
-                      />
+                    <H3>{intl.formatMessage(messages.subheadlineCache)}</H3>
+                    <p>
+                      {intl.formatMessage(messages.cacheInfo, {
+                        size: cacheSize,
+                      })}
+                    </p>
+                    {notCleared && (
+                      <p>{intl.formatMessage(messages.cacheNotCleared)}</p>
+                    )}
+                    <div className="settings__settings-group">
+                      <div className="settings__open-settings-cache-container">
+                        <Button
+                          buttonType="secondary"
+                          label={intl.formatMessage(globalMessages.clearCache)}
+                          className="settings__open-settings-cache-button"
+                          onClick={() => {
+                            onClearAllCache();
+                            this.onClearCacheClicked();
+                          }}
+                          disabled={isClearingAllCache}
+                          loaded={!isClearingAllCache}
+                        />
+                        <Button
+                          buttonType="secondary"
+                          label="Open Process Manager"
+                          className="settings__open-settings-cache-button"
+                          onClick={openProcessManager}
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
diff --git a/src/config.ts b/src/config.ts
index 348b4b85d..0034b00a6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -401,6 +401,7 @@ export const DEFAULT_APP_SETTINGS = {
   automaticUpdates: true,
   universalDarkMode: true,
   userAgentPref: '',
+  downloadFolderPath: '',
   adaptableDarkMode: true,
   accentColor: DEFAULT_ACCENT_COLOR,
   progressbarAccentColor: DEFAULT_ACCENT_COLOR,
diff --git a/src/containers/auth/SetupAssistantScreen.tsx b/src/containers/auth/SetupAssistantScreen.tsx
index d15b4e6e1..b73b5705d 100644
--- a/src/containers/auth/SetupAssistantScreen.tsx
+++ b/src/containers/auth/SetupAssistantScreen.tsx
@@ -1,4 +1,5 @@
 import { inject, observer } from 'mobx-react';
+import ms from 'ms';
 import { Component, type ReactElement } from 'react';
 import type { StoresProps } from '../../@types/ferdium-components.types';
 import type { ILegacyServices } from '../../@types/legacy-types';
@@ -83,11 +84,11 @@ class SetupAssistantScreen extends Component<IProps, IState> {
       });
 
       // eslint-disable-next-line no-await-in-loop
-      await sleep(100);
+      await sleep(ms('100ms'));
     }
 
     this.setState({ isSettingUpServices: false });
-    await sleep(100);
+    await sleep(ms('100ms'));
     router.push('/');
   }
 
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index fdd9bd8bc..31e8d6484 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -341,6 +341,32 @@ const messages = defineMessages({
     id: 'settings.app.form.keepAllWorkspacesLoaded',
     defaultMessage: 'Keep all workspaces loaded',
   },
+  downloadFolderPath: {
+    id: 'settings.app.form.downloadFolderPath',
+    defaultMessage:
+      'Default download folder (leave blank to be prompted for each download)',
+  },
+  restartDialogTitle: {
+    id: 'settings.app.restart.restartDialogTitle',
+    defaultMessage: 'Ferdium - Relaunch Application',
+  },
+  restartNow: {
+    id: 'settings.app.restart.restartNow',
+    defaultMessage: 'Restart now',
+  },
+  restartLater: {
+    id: 'settings.app.restart.restartLater',
+    defaultMessage: 'Restart later',
+  },
+  restartDialogMessage: {
+    id: 'settings.app.restart.restartDialogMessage',
+    defaultMessage: 'Do you want to relaunch Ferdium?',
+  },
+  restartDialogDetail: {
+    id: 'settings.app.restart.restartDialogDetail',
+    defaultMessage:
+      'You made a change that requires a restart. This will close Ferdium and restart it.',
+  },
 });
 
 interface EditSettingsScreenProps extends StoresProps, WrappedComponentProps {}
@@ -364,6 +390,7 @@ class EditSettingsScreen extends Component<
   }
 
   onSubmit(settingsData) {
+    const { intl } = this.props;
     const { todos, workspaces } = this.props.stores;
     const {
       app,
@@ -386,97 +413,130 @@ class EditSettingsScreen extends Component<
 
     debug(`Updating settings store with data: ${settingsData}`);
 
+    const { app: currentSettings } = this.props.stores.settings.all;
+
+    const newSettings = {
+      runInBackground: Boolean(settingsData.runInBackground),
+      enableSystemTray: Boolean(settingsData.enableSystemTray),
+      reloadAfterResume: Boolean(settingsData.reloadAfterResume),
+      reloadAfterResumeTime: Number(settingsData.reloadAfterResumeTime),
+      startMinimized: Boolean(settingsData.startMinimized),
+      confirmOnQuit: Boolean(settingsData.confirmOnQuit),
+      minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray),
+      closeToSystemTray: Boolean(settingsData.closeToSystemTray),
+      privateNotifications: Boolean(settingsData.privateNotifications),
+      clipboardNotifications: Boolean(settingsData.clipboardNotifications),
+      notifyTaskBarOnMessage: Boolean(settingsData.notifyTaskBarOnMessage),
+      isTwoFactorAutoCatcherEnabled: Boolean(
+        settingsData.isTwoFactorAutoCatcherEnabled,
+      ),
+      twoFactorAutoCatcherMatcher: settingsData.twoFactorAutoCatcherMatcher,
+      navigationBarBehaviour: settingsData.navigationBarBehaviour,
+      webRTCIPHandlingPolicy: settingsData.webRTCIPHandlingPolicy,
+      searchEngine: settingsData.searchEngine,
+      translatorEngine: settingsData.translatorEngine,
+      translatorLanguage: settingsData.translatorLanguage,
+      sentry: Boolean(settingsData.sentry),
+      hibernateOnStartup: Boolean(settingsData.hibernateOnStartup),
+      hibernationStrategy: Number(settingsData.hibernationStrategy),
+      wakeUpStrategy: Number(settingsData.wakeUpStrategy),
+      wakeUpHibernationStrategy: Number(settingsData.wakeUpHibernationStrategy),
+      wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
+      predefinedTodoServer: settingsData.predefinedTodoServer,
+      customTodoServer: settingsData.customTodoServer,
+      isLockingFeatureEnabled: Boolean(settingsData.isLockingFeatureEnabled),
+      lockedPassword: useOriginalPassword
+        ? this.props.stores.settings.all.app.lockedPassword
+        : hash(String(settingsData.lockedPassword)),
+      useTouchIdToUnlock: Boolean(settingsData.useTouchIdToUnlock),
+      inactivityLock: Number(settingsData.inactivityLock),
+      scheduledDNDEnabled: Boolean(settingsData.scheduledDNDEnabled),
+      scheduledDNDStart: settingsData.scheduledDNDStart,
+      scheduledDNDEnd: settingsData.scheduledDNDEnd,
+      enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration),
+      downloadFolderPath: String(settingsData.downloadFolderPath),
+      enableGlobalHideShortcut: Boolean(settingsData.enableGlobalHideShortcut),
+      showDisabledServices: Boolean(settingsData.showDisabledServices),
+      showServiceName: Boolean(settingsData.showServiceName),
+      darkMode: Boolean(settingsData.darkMode),
+      adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
+      universalDarkMode: Boolean(settingsData.universalDarkMode),
+      splitMode: Boolean(settingsData.splitMode),
+      splitColumns: Number(settingsData.splitColumns),
+      serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
+      sidebarServicesLocation: Number(settingsData.sidebarServicesLocation),
+      iconSize: Number(settingsData.iconSize),
+      enableLongPressServiceHint: Boolean(
+        settingsData.enableLongPressServiceHint,
+      ),
+      useHorizontalStyle: Boolean(settingsData.useHorizontalStyle),
+      hideCollapseButton: Boolean(settingsData.hideCollapseButton),
+      hideRecipesButton: Boolean(settingsData.hideRecipesButton),
+      hideSplitModeButton: Boolean(settingsData.hideSplitModeButton),
+      useGrayscaleServices: Boolean(settingsData.useGrayscaleServices),
+      grayscaleServicesDim: Number(settingsData.grayscaleServicesDim),
+      hideWorkspacesButton: Boolean(settingsData.hideWorkspacesButton),
+      hideNotificationsButton: Boolean(settingsData.hideNotificationsButton),
+      hideSettingsButton: Boolean(settingsData.hideSettingsButton),
+      hideDownloadButton: Boolean(settingsData.hideDownloadButton),
+      alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
+      hideAllServicesWorkspace: Boolean(settingsData.hideAllServicesWorkspace),
+      accentColor: settingsData.accentColor,
+      progressbarAccentColor: settingsData.progressbarAccentColor,
+      showMessageBadgeWhenMuted: Boolean(
+        settingsData.showMessageBadgeWhenMuted,
+      ),
+      showDragArea: Boolean(settingsData.showDragArea),
+      enableSpellchecking: Boolean(settingsData.enableSpellchecking),
+      enableTranslator: Boolean(settingsData.enableTranslator),
+      useSelfSignedCertificates: Boolean(
+        settingsData.useSelfSignedCertificates,
+      ),
+      spellcheckerLanguage: settingsData.spellcheckerLanguage,
+      userAgentPref: settingsData.userAgentPref,
+      beta: Boolean(settingsData.beta), // we need this info in the main process as well
+      automaticUpdates: Boolean(settingsData.automaticUpdates), // we need this info in the main process as well
+      locale: settingsData.locale, // we need this info in the main process as well
+    };
+
+    const requiredRestartKeys = [
+      'webRTCIPHandlingPolicy',
+      'sentry',
+      'searchEngine',
+      'enableSpellchecking',
+      'spellcheckerLanguage',
+      'enableGlobalHideShortcut',
+      // 'userAgentPref', // TODO: this is an input field, so it changes on every key stroke
+    ];
+
+    // Check if any of the keys that require a restart have changed
+    const requiresRestart = requiredRestartKeys.some(
+      key => newSettings[key] !== currentSettings[key],
+    );
+
+    if (requiresRestart) {
+      debug('Settings require restart');
+
+      const options: Electron.MessageBoxOptions = {
+        type: 'warning',
+        buttons: [
+          intl.formatMessage(messages.restartNow),
+          intl.formatMessage(messages.restartLater),
+        ],
+        defaultId: 0,
+        cancelId: 1,
+        title: intl.formatMessage(messages.restartDialogTitle),
+        message: intl.formatMessage(messages.restartDialogMessage),
+        detail: intl.formatMessage(messages.restartDialogDetail),
+      };
+
+      ipcRenderer.send('relaunch-app', options);
+    }
+
     settings.update({
       type: 'app',
       // TODO: The conversions might not be necessary once we convert to typescript
-      data: {
-        runInBackground: Boolean(settingsData.runInBackground),
-        enableSystemTray: Boolean(settingsData.enableSystemTray),
-        reloadAfterResume: Boolean(settingsData.reloadAfterResume),
-        reloadAfterResumeTime: Number(settingsData.reloadAfterResumeTime),
-        startMinimized: Boolean(settingsData.startMinimized),
-        confirmOnQuit: Boolean(settingsData.confirmOnQuit),
-        minimizeToSystemTray: Boolean(settingsData.minimizeToSystemTray),
-        closeToSystemTray: Boolean(settingsData.closeToSystemTray),
-        privateNotifications: Boolean(settingsData.privateNotifications),
-        clipboardNotifications: Boolean(settingsData.clipboardNotifications),
-        notifyTaskBarOnMessage: Boolean(settingsData.notifyTaskBarOnMessage),
-        isTwoFactorAutoCatcherEnabled: Boolean(
-          settingsData.isTwoFactorAutoCatcherEnabled,
-        ),
-        twoFactorAutoCatcherMatcher: settingsData.twoFactorAutoCatcherMatcher,
-        navigationBarBehaviour: settingsData.navigationBarBehaviour,
-        webRTCIPHandlingPolicy: settingsData.webRTCIPHandlingPolicy,
-        searchEngine: settingsData.searchEngine,
-        translatorEngine: settingsData.translatorEngine,
-        translatorLanguage: settingsData.translatorLanguage,
-        sentry: Boolean(settingsData.sentry),
-        hibernateOnStartup: Boolean(settingsData.hibernateOnStartup),
-        hibernationStrategy: Number(settingsData.hibernationStrategy),
-        wakeUpStrategy: Number(settingsData.wakeUpStrategy),
-        wakeUpHibernationStrategy: Number(
-          settingsData.wakeUpHibernationStrategy,
-        ),
-        wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
-        predefinedTodoServer: settingsData.predefinedTodoServer,
-        customTodoServer: settingsData.customTodoServer,
-        isLockingFeatureEnabled: Boolean(settingsData.isLockingFeatureEnabled),
-        lockedPassword: useOriginalPassword
-          ? this.props.stores.settings.all.app.lockedPassword
-          : hash(String(settingsData.lockedPassword)),
-        useTouchIdToUnlock: Boolean(settingsData.useTouchIdToUnlock),
-        inactivityLock: Number(settingsData.inactivityLock),
-        scheduledDNDEnabled: Boolean(settingsData.scheduledDNDEnabled),
-        scheduledDNDStart: settingsData.scheduledDNDStart,
-        scheduledDNDEnd: settingsData.scheduledDNDEnd,
-        enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration),
-        enableGlobalHideShortcut: Boolean(
-          settingsData.enableGlobalHideShortcut,
-        ),
-        showDisabledServices: Boolean(settingsData.showDisabledServices),
-        showServiceName: Boolean(settingsData.showServiceName),
-        darkMode: Boolean(settingsData.darkMode),
-        adaptableDarkMode: Boolean(settingsData.adaptableDarkMode),
-        universalDarkMode: Boolean(settingsData.universalDarkMode),
-        splitMode: Boolean(settingsData.splitMode),
-        splitColumns: Number(settingsData.splitColumns),
-        serviceRibbonWidth: Number(settingsData.serviceRibbonWidth),
-        sidebarServicesLocation: Number(settingsData.sidebarServicesLocation),
-        iconSize: Number(settingsData.iconSize),
-        enableLongPressServiceHint: Boolean(
-          settingsData.enableLongPressServiceHint,
-        ),
-        useHorizontalStyle: Boolean(settingsData.useHorizontalStyle),
-        hideCollapseButton: Boolean(settingsData.hideCollapseButton),
-        hideRecipesButton: Boolean(settingsData.hideRecipesButton),
-        hideSplitModeButton: Boolean(settingsData.hideSplitModeButton),
-        useGrayscaleServices: Boolean(settingsData.useGrayscaleServices),
-        grayscaleServicesDim: Number(settingsData.grayscaleServicesDim),
-        hideWorkspacesButton: Boolean(settingsData.hideWorkspacesButton),
-        hideNotificationsButton: Boolean(settingsData.hideNotificationsButton),
-        hideSettingsButton: Boolean(settingsData.hideSettingsButton),
-        hideDownloadButton: Boolean(settingsData.hideDownloadButton),
-        alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces),
-        hideAllServicesWorkspace: Boolean(
-          settingsData.hideAllServicesWorkspace,
-        ),
-        accentColor: settingsData.accentColor,
-        progressbarAccentColor: settingsData.progressbarAccentColor,
-        showMessageBadgeWhenMuted: Boolean(
-          settingsData.showMessageBadgeWhenMuted,
-        ),
-        showDragArea: Boolean(settingsData.showDragArea),
-        enableSpellchecking: Boolean(settingsData.enableSpellchecking),
-        enableTranslator: Boolean(settingsData.enableTranslator),
-        useSelfSignedCertificates: Boolean(
-          settingsData.useSelfSignedCertificates,
-        ),
-        spellcheckerLanguage: settingsData.spellcheckerLanguage,
-        userAgentPref: settingsData.userAgentPref,
-        beta: Boolean(settingsData.beta), // we need this info in the main process as well
-        automaticUpdates: Boolean(settingsData.automaticUpdates), // we need this info in the main process as well
-        locale: settingsData.locale, // we need this info in the main process as well
-      },
+      data: newSettings,
     });
 
     user.update({
@@ -982,6 +1042,14 @@ class EditSettingsScreen extends Component<
           default: DEFAULT_APP_SETTINGS.userAgentPref,
           placeholder: defaultUserAgent(),
         },
+        downloadFolderPath: {
+          label: intl.formatMessage(messages.downloadFolderPath),
+          value: ifUndefined<string>(
+            settings.all.app.downloadFolderPath,
+            DEFAULT_APP_SETTINGS.downloadFolderPath,
+          ),
+          default: DEFAULT_APP_SETTINGS.userAgentPref,
+        },
         darkMode: {
           label: intl.formatMessage(messages.darkMode),
           value: ifUndefined<boolean>(
diff --git a/src/electron/ipc-api/dnd.ts b/src/electron/ipc-api/dnd.ts
index 30ace7c84..280521a9f 100644
--- a/src/electron/ipc-api/dnd.ts
+++ b/src/electron/ipc-api/dnd.ts
@@ -8,7 +8,6 @@ export default async () => {
     if (!isMac) {
       return false;
     }
-
     const { getDoNotDisturb } = await import('macos-notification-state');
 
     if (!getDoNotDisturb) {
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index d749cb889..a306ba68d 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -52,4 +52,14 @@ export default (params: { mainWindow: BrowserWindow }) => {
       }
     },
   );
+
+  ipcMain.handle('download-folder-select', async () => {
+    const result = await dialog.showOpenDialog(params.mainWindow, {
+      properties: ['openDirectory'],
+    });
+
+    if (result.canceled) return null;
+
+    return result.filePaths[0];
+  });
 };
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
index 01a18ffb0..23851edf6 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
@@ -125,10 +125,10 @@ class WorkspaceDrawerItem extends Component<IProps> {
         }}
         onKeyDown={noop}
         data-tooltip-id="tooltip-workspaces-drawer"
-        data-tooltip-content={acceleratorString(
-          shortcutIndex,
-          `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`,
-        )}
+        data-tooltip-content={acceleratorString({
+          index: shortcutIndex,
+          keyCombo: `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`,
+        })}
       >
         <span
           className={classnames([
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index d2d317586..50ab8d4ce 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -16,6 +16,7 @@
   "feature.publishDebugInfo.info": "Die Veröffentlichung deiner Debug-Informationen hilft uns, Probleme und Fehler in Ferdium zu finden. Indem du deine Debug-Informationen veröffentlichst, akzeptierst du die Datenschutzbestimmungen und Nutzungsbedingungen vom Ferdium Debugger",
   "feature.publishDebugInfo.privacy": "Datenschutzrichtlinien",
   "feature.publishDebugInfo.publish": "Akzeptieren und Veröffentlichen",
+  "feature.publishDebugInfo.published": "Ihr Debug-Protokoll wurde veröffentlicht und ist nun verfügbar unter",
   "feature.publishDebugInfo.terms": "Nutzungsbedingungen",
   "feature.publishDebugInfo.title": "Debug-Informationen veröffentlichen",
   "feature.quickSwitch.info": "Wähle einen Dienst mit TAB, ↑ und ↓. Um einen Dienst zu öffnen, drücke ENTER.",
@@ -24,6 +25,7 @@
   "global.api.unhealthy": "Verbindung zu {serverNameParse} Online-Diensten kann nicht hergestellt werden",
   "global.cancel": "Abbrechen",
   "global.clearCache": "Cache leeren",
+  "global.downloads": "Downloads",
   "global.edit": "Bearbeiten",
   "global.no": "Nein",
   "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
@@ -122,6 +124,7 @@
   "menu.view.back": "Zurück",
   "menu.view.forward": "Vorwärts",
   "menu.view.lockFerdium": "Ferdium sperren",
+  "menu.view.openProcessManager": "Prozessverwaltung öffnen",
   "menu.view.openQuickSwitch": "Quick Switch öffnen",
   "menu.view.reloadFerdium": "Ferdium neu laden",
   "menu.view.reloadService": "Dienst neu laden",
@@ -161,6 +164,8 @@
   "service.errorHandler.headline": "Oh nein!",
   "service.errorHandler.message": "Fehler",
   "service.errorHandler.text": "{name} konnte nicht geladen werden.",
+  "service.screenshare.cancel": "Abbrechen",
+  "service.screenshare.loading": "Bildschirme und Fenster werden geladen",
   "service.webviewLoader.loading": "{service} wird geladen",
   "services.getStarted": "Los geht's",
   "services.login": "Bitte anmelden, um Ferdium nutzen zu können.",
@@ -189,6 +194,7 @@
   "settings.app.buttonOpenFerdiumCertsFolder": "Ordner „Zertifikate” öffnen",
   "settings.app.buttonOpenFerdiumProfileFolder": "Profilordner anzeigen",
   "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Rezeptordner öffnen",
+  "settings.app.buttonOpenFolderSelector": "Ordnerauswahl öffnen",
   "settings.app.buttonOpenImportExport": "Importieren/Exportieren",
   "settings.app.buttonSearchForUpdate": "Nach Aktualisierungen suchen",
   "settings.app.buttonShowChangelog": "Änderungen zeigen",
@@ -208,6 +214,7 @@
   "settings.app.form.confirmOnQuit": "Beim Beenden von Ferdium bestätigen",
   "settings.app.form.customTodoServer": "Eigener Todo Server",
   "settings.app.form.darkMode": "Dark Mode aktivieren",
+  "settings.app.form.downloadFolderPath": "Standard-Download-Ordner (leer lassen, um bei jedem Download gefragt zu werden)",
   "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableGlobalHideShortcut": "Allgemeine Verknüpfung zum Ausblenden von Ferdium aktivieren",
   "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
@@ -220,7 +227,9 @@
   "settings.app.form.grayscaleServicesDim": "Graustufen Dimmwert",
   "settings.app.form.hibernateOnStartup": "Dienste beim Start in den Ruhezustand versetzen",
   "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
+  "settings.app.form.hideAllServicesWorkspace": "Arbeitsbereich „Alle Dienste“ ausblenden",
   "settings.app.form.hideCollapseButton": "Schaltfläche „Ausklappen” ausblenden",
+  "settings.app.form.hideDownloadButton": "Schaltfläche „Downloads“ ausblenden",
   "settings.app.form.hideNotificationsButton": "Schaltfläche „Benachrichtigungen und Töne” ausblenden",
   "settings.app.form.hideRecipesButton": "Schaltfläche „Neuen Dienst hinzufügen” ausblenden",
   "settings.app.form.hideSettingsButton": "Schaltfläche „Einstellungen” ausblenden",
@@ -278,10 +287,16 @@
   "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdium alle deine Dienste im Hintergrund, sodass diese bereit sind, wenn du sie verwenden möchtest. \"Service Hibernation\" wird deine Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu sparen oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
   "settings.app.inactivityLockInfo": "Minuten der Inaktivität, nach denen Ferdium automatisch sperren soll. Verwenden Sie 0, um dies zu deaktivieren",
   "settings.app.infoOpenCertificatesFolder": "Um ein Zertifikat zu installieren, klicken Sie auf die Schaltfläche unten, um den Zertifikatsordner zu öffnen, und kopieren Sie es in den Ordner. Danach können Sie den Dienst aktualisieren (STRG/CMD + R). Zum Entfernen/Deinstallieren löschen Sie einfach die Zertifikatsdatei und starten Ferdium neu.",
+  "settings.app.lockInfo": "Die Passwortsperre ermöglicht es Ihnen, Ihre Nachrichten zu schützen.\nWenn Sie die Passwortsperre verwenden, werden Sie bei jedem Start von Ferdium aufgefordert, Ihr Passwort einzugeben, oder Sie sperren Ferdium selbst, indem Sie das Schlosssymbol in der unteren linken Ecke oder das Tastaturkürzel {lockShortcut} verwenden.",
   "settings.app.lockedPassword": "Passwort",
   "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdium neu installieren.",
   "settings.app.overallTheme": "Allgemeines Farbschema",
   "settings.app.progressbarTheme": "Farbschema der Fortschrittsanzeige",
+  "settings.app.restart.restartDialogDetail": "Sie haben eine Änderung vorgenommen, die einen Neustart erfordert. Dadurch wird Ferdium geschlossen und neu gestartet.",
+  "settings.app.restart.restartDialogMessage": "Möchten Sie Ferdium erneut starten?",
+  "settings.app.restart.restartDialogTitle": "Ferdium - Anwendung neu starten",
+  "settings.app.restart.restartLater": "Später neu starten",
+  "settings.app.restart.restartNow": "Jetzt neu starten",
   "settings.app.restartRequired": "Änderungen werden erst nach einem Neustart wirksam",
   "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdium erhalten möchtest.",
   "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
@@ -298,8 +313,11 @@
   "settings.app.sentryInfo": "Das Senden von Telemetriedaten ermöglicht es uns, Fehler in Ferdium zu finden - es werden keine persönlichen Informationen wie Ihre Nachrichtendaten gesendet!",
   "settings.app.serverHelp": "Verbunden mit dem Server unter {serverURL}",
   "settings.app.servicesUpdateStatusUpToDate": "Ihre Dienste sind auf dem neuesten Stand",
+  "settings.app.spellCheckerLanguageInfo": "Ferdium verwendet die in Ihrem Mac eingebaute Rechtschreibprüfung, um auf Tippfehler zu prüfen. Wenn Sie die Sprachen, die die Rechtschreibprüfung prüft, ändern möchten, können Sie dies in den Systemeinstellungen Ihres Macs tun.",
   "settings.app.subheadlineCache": "Cache",
+  "settings.app.subheadlineDownloads": "Downloads",
   "settings.app.subheadlineFerdiumProfile": "Ferdium Profil",
+  "settings.app.subheadlineUserAgent": "Browserkennung",
   "settings.app.todoServerInfo": "Dieser Server wird für die \"Ferdium Todo\"-Funktion verwendet.",
   "settings.app.translationHelp": "Hilf uns, Ferdium in Deine Sprache zu übersetzen.",
   "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
@@ -329,6 +347,8 @@
   "settings.recipes.missingService": "Fehlt ein Dienst?",
   "settings.recipes.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdium hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdium.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
+  "settings.releasenotes.connectionError": "Bei der Verbindung zu Github ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
+  "settings.releasenotes.connectionErrorPageMissing": "Bei der Verbindung zu Github ist ein Fehler aufgetreten, die gesuchte Seite ist nicht vorhanden.",
   "settings.releasenotes.headline": "Neuigkeiten",
   "settings.searchService": "Dienst suchen",
   "settings.service.error.goBack": "Zurück zu den Diensten",
@@ -385,6 +405,7 @@
   "settings.service.form.tabOnPremise": "Selbst gehostet ⭐️",
   "settings.service.form.team": "Team",
   "settings.service.form.trapLinkClicks": "URLs in Ferdium öffnen",
+  "settings.service.form.useFavicon": "Favicon des Dienstes anstelle des Standard- oder benutzerdefinierten Symbols verwenden",
   "settings.service.form.useHostedService": "Hosted {name} verwenden.",
   "settings.service.form.yourServices": "Deine Dienste",
   "settings.service.reloadRequired": "Änderungen werden erst nach einem Neuladen des Dienstes wirksam",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 3947b2e5f..cb0f4369c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -194,6 +194,7 @@
   "settings.app.buttonOpenFerdiumCertsFolder": "Open certificates folder",
   "settings.app.buttonOpenFerdiumProfileFolder": "Open Profile folder",
   "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFolderSelector": "Open folder selector",
   "settings.app.buttonOpenImportExport": "Import / Export",
   "settings.app.buttonSearchForUpdate": "Check for updates",
   "settings.app.buttonShowChangelog": "Show changelog",
@@ -213,6 +214,7 @@
   "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdium",
   "settings.app.form.customTodoServer": "Custom Todo Server",
   "settings.app.form.darkMode": "Enable Dark Mode",
+  "settings.app.form.downloadFolderPath": "Default download folder (leave blank to be prompted for each download)",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableGlobalHideShortcut": "Enable Global shortcut to hide Ferdium",
   "settings.app.form.enableLock": "Enable Password Lock",
@@ -290,6 +292,11 @@
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdium.",
   "settings.app.overallTheme": "Overall Theme",
   "settings.app.progressbarTheme": "Progressbar Theme",
+  "settings.app.restart.restartDialogDetail": "You made a change that requires a restart. This will close Ferdium and restart it.",
+  "settings.app.restart.restartDialogMessage": "Do you want to relaunch Ferdium?",
+  "settings.app.restart.restartDialogTitle": "Ferdium - Relaunch Application",
+  "settings.app.restart.restartLater": "Restart later",
+  "settings.app.restart.restartNow": "Restart now",
   "settings.app.restartRequired": "Changes require restart",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdium.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
@@ -308,7 +315,9 @@
   "settings.app.servicesUpdateStatusUpToDate": "Your services are up-to-date",
   "settings.app.spellCheckerLanguageInfo": "Ferdium uses your Mac's built-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
   "settings.app.subheadlineCache": "Cache",
+  "settings.app.subheadlineDownloads": "Downloads",
   "settings.app.subheadlineFerdiumProfile": "Ferdium Profile",
+  "settings.app.subheadlineUserAgent": "User Agent",
   "settings.app.todoServerInfo": "This server will be used for the \"Ferdium Todo\" feature.",
   "settings.app.translationHelp": "Help us to translate Ferdium into your language.",
   "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 6484d9524..8e3bb4e92 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -9,11 +9,14 @@
   "connectionLostBanner.cta": "Ricarica Servizio",
   "connectionLostBanner.informationLink": "Cos'è successo?",
   "connectionLostBanner.message": "Oh no! Ferdium ha perso la connessione con {name}.",
+  "downloadManager.empty": "La tua lista di download è vuota.",
+  "downloadManager.headline": "Gestione Download",
   "feature.basicAuth.signIn": "Accedi",
   "feature.publishDebugInfo.error": "Si è verificato un errore durante il tentativo di pubblicare le informazioni di debug. Riprova più tardi o vedi la console per maggiori informazioni.",
   "feature.publishDebugInfo.info": "Pubblicare le informazioni di debug ci aiuta a trovare problemi ed errori in Ferdium. Pubblicando le informazioni di debug accetti l'informativa sulla privacy e i termini di servizio di Ferdium Debugger",
   "feature.publishDebugInfo.privacy": "Informativa sulla privacy",
   "feature.publishDebugInfo.publish": "Accetta e pubblica",
+  "feature.publishDebugInfo.published": "Il tuo log di debug è stato pubblicato ed è disponibile a",
   "feature.publishDebugInfo.terms": "Termini di Servizio",
   "feature.publishDebugInfo.title": "Pubblica le informazioni di debug",
   "feature.quickSwitch.info": "Seleziona un servizio con TAB, ↑ e ↓. Apri un servizio con INVIO.",
@@ -21,6 +24,8 @@
   "feature.quickSwitch.title": "Cambio Veloce",
   "global.api.unhealthy": "Impossibile connettersi ai servizi online di {serverNameParse}",
   "global.cancel": "Annulla",
+  "global.clearCache": "Svuota la cache",
+  "global.downloads": "Downloads",
   "global.edit": "Modifica",
   "global.no": "No",
   "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
@@ -119,6 +124,7 @@
   "menu.view.back": "Indietro",
   "menu.view.forward": "Avanti",
   "menu.view.lockFerdium": "Blocca Ferdium",
+  "menu.view.openProcessManager": "Apri Gestione Processi",
   "menu.view.openQuickSwitch": "Apri Cambio Rapido",
   "menu.view.reloadFerdium": "Ricarica Ferdium",
   "menu.view.reloadService": "Ricarica Servizio",
@@ -158,6 +164,8 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Errore",
   "service.errorHandler.text": "{name} non si è caricato correttamente.",
+  "service.screenshare.cancel": "Annulla",
+  "service.screenshare.loading": "Caricamento schermi e finestre",
   "service.webviewLoader.loading": "Caricamento {service}",
   "services.getStarted": "Iniziamo",
   "services.login": "Effettua il login per utlizzare Ferdium.",
@@ -183,8 +191,10 @@
   "settings.account.yourLicense": "La tua licenza Ferdium:",
   "settings.app.accentColorInfo": "Scrivi la tua scelta di colore in un formato compatibile con CSS. (Predefinito: {defaultAccentColor} o cancella il campo di input)",
   "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
+  "settings.app.buttonOpenFerdiumCertsFolder": "Apri la cartella dei certificati",
   "settings.app.buttonOpenFerdiumProfileFolder": "Apri cartella del profilo utente",
   "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Apri cartella ricette dei servizi",
+  "settings.app.buttonOpenFolderSelector": "Apri esplora risorse",
   "settings.app.buttonOpenImportExport": "Importa / Esporta",
   "settings.app.buttonSearchForUpdate": "Controlla aggiornamenti",
   "settings.app.buttonShowChangelog": "Visualizza le modifiche",
@@ -204,6 +214,7 @@
   "settings.app.form.confirmOnQuit": "Conferma quando esci da Ferdium",
   "settings.app.form.customTodoServer": "Server Todo personalizzato",
   "settings.app.form.darkMode": "Attiva la modalità scura",
+  "settings.app.form.downloadFolderPath": "Cartella predefinita per i download (lasciare vuoto per selezionarla a ogni download)",
   "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
   "settings.app.form.enableGlobalHideShortcut": "Abilita la combinazione di tasti (shortcut) per nascondere Ferdium",
   "settings.app.form.enableLock": "Abilita blocco con password",
@@ -216,7 +227,9 @@
   "settings.app.form.grayscaleServicesDim": "Livello di luminosità della scala di grigi",
   "settings.app.form.hibernateOnStartup": "Mantieni i servizi in ibernazione all'avvio",
   "settings.app.form.hibernationStrategy": "Strategia di ibernazione",
+  "settings.app.form.hideAllServicesWorkspace": "Nascondi spazio di lavoro \"Tutti i servizi\"",
   "settings.app.form.hideCollapseButton": "Nascondi il pulsante comprimi",
+  "settings.app.form.hideDownloadButton": "Nascondi il pulsante Scarica",
   "settings.app.form.hideNotificationsButton": "Nascondi il pulsante Notifiche & Suono",
   "settings.app.form.hideRecipesButton": "Nascondi il punsate aggiungi servizio",
   "settings.app.form.hideSettingsButton": "Nascondi il pulsante delle impostazioni",
@@ -224,6 +237,7 @@
   "settings.app.form.hideWorkspacesButton": "Nascondi barra di trascinamento",
   "settings.app.form.iconSize": "Dimensione icone servizi",
   "settings.app.form.inactivityLock": "Blocca dopo inattività",
+  "settings.app.form.isTwoFactorAutoCatcherEnabled": "Cattura automaticamente i codici a due fattori dalle notifiche (Es: messaggi Android) e copia negli appunti",
   "settings.app.form.keepAllWorkspacesLoaded": "Mantieni tutti i workspace caricati",
   "settings.app.form.language": "Lingua",
   "settings.app.form.lockPassword": "Password",
@@ -253,9 +267,11 @@
   "settings.app.form.startMinimized": "Avvio ridotto a icona",
   "settings.app.form.translatorEngine": "Motore di traduzione",
   "settings.app.form.translatorLanguage": "Lingua predefinita del traduttore",
+  "settings.app.form.twoFactorAutoCatcherMatcher": "Parole/espressioni separate da virgole e case-sensitive per catturare i codici a due fattori. Es.: token, code, sms, verify",
   "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
   "settings.app.form.useGrayscaleServices": "Visualizza le icon dei servizi con scala di grigi",
   "settings.app.form.useHorizontalStyle": "Usa stile orizzontale",
+  "settings.app.form.useSelfSignedCertificates": "Usa certificati auto-firmati",
   "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdium",
   "settings.app.form.wakeUpHibernationSplay": "Esegui cicli di ibernato/risveglio per ridurre il carico",
   "settings.app.form.wakeUpHibernationStrategy": "Strategia di ibernazione dopo il risveglio automatico",
@@ -270,10 +286,17 @@
   "settings.app.headlineUpdates": "Aggiornamenti",
   "settings.app.hibernateInfo": "Per impostazione predefinita, Ferdium manterrà tutti i servizi aperti e caricati in background in modo che siano pronti quando si desidera utilizzarli. Il servizio Hibernation sospenderà i servizi dopo un tempo specificato. Questo è utile per risparmiare RAM o per evitare che i servizi rallentino il computer.",
   "settings.app.inactivityLockInfo": "Minuti di inattività oltre i quali Ferdium si bloccherà automaticamente, 0 per disabilitare",
+  "settings.app.infoOpenCertificatesFolder": "Per installare un certificato, fai clic sul pulsante qui sotto per aprire la cartella dei certificati e copialo nella cartella. Dopo di che è possibile aggiornare il servizio (CTRL/CMD + R). Per rimuovere/disinstallare, basta eliminare il file del certificato e riavviare Ferdium.",
+  "settings.app.lockInfo": "Password Lock ti permette di mantenere i tuoi messaggi protetti. Usando Password Lock, ti verrà richiesto di inserire la tua password ogni volta che avvii Ferdium o di bloccare Ferdium stesso usando il simbolo del lucchetto nell'angolo in basso a sinistra o la scorciatoia {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Assicurati di impostare una password che ricordi.\nSe perdi questa password, dovrai reinstallare Ferdium.",
   "settings.app.overallTheme": "Tema Globale",
   "settings.app.progressbarTheme": "Colore della barra di avanzamento",
+  "settings.app.restart.restartDialogDetail": "Hai fatto un cambiamento che richiede un riavvio. Questo chiuderà Ferdium e lo riavvierà.",
+  "settings.app.restart.restartDialogMessage": "Vuoi riavviare Ferdium?",
+  "settings.app.restart.restartDialogTitle": "Ferdium - Riavvia Applicazione",
+  "settings.app.restart.restartLater": "Riavvia più tardi",
+  "settings.app.restart.restartNow": "Riavvia ora",
   "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
   "settings.app.scheduledDNDInfo": "I Do-not-Disturb pianificati consentono di definire un periodo di tempo nel quale le notifiche da Ferdium saranno disabilitate.",
   "settings.app.scheduledDNDTimeInfo": "Ora in formato 24 ore. L'ora di fine può essere prima dell'ora di inizio (ad esempio inizio 17:00, fine 09:00) per abilitare Do-not-Disturb durante la notte.",
@@ -289,14 +312,19 @@
   "settings.app.sectionUpdates": "Impostazioni Aggiornamenti App",
   "settings.app.sentryInfo": "L'invio dei dati di telemetria ci permette di trovare errori in Ferdium - non invieremo nessuna informazione personale relativa ai tuoi messaggi!",
   "settings.app.serverHelp": "Connesso al server a {serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "I tuoi servizi sono aggiornati",
+  "settings.app.spellCheckerLanguageInfo": "Ferdium utilizza il controllo ortografico del tuo Mac per verificare la presenza di errori. Se si desidera modificare le lingue del controllo ortografico, è possibile farlo nelle preferenze di sistema del vostro Mac.",
   "settings.app.subheadlineCache": "Cache",
+  "settings.app.subheadlineDownloads": "Downloads",
   "settings.app.subheadlineFerdiumProfile": "Profilo Ferdium",
+  "settings.app.subheadlineUserAgent": "User Agent",
   "settings.app.todoServerInfo": "Questo server sarà utilizzato per la funzione \"Ferdium Todo\".",
   "settings.app.translationHelp": "Aiutaci a tradurre Ferdium nella tua lingua.",
   "settings.app.universalDarkModeInfo": "La modalità 'Dark Mode' universale cerca di generare dinamicamente uno stile di visualizzazione a sfondo scuro per quei servizi che non lo supportano nativamente.",
   "settings.app.updateStatusAvailable": "Aggiornamento disponibile, download in corso...",
   "settings.app.updateStatusSearching": "Ricerca aggiornamenti...",
   "settings.app.updateStatusUpToDate": "Stai utilizzando l'ultima versione di Ferdium",
+  "settings.app.warningSelfSignedCertificates": "ATTENZIONE: Abilita questa funzione solo se sai cosa stai facendo. Abilitare la funzione è un rischio per la sicurezza e dovrebbe essere utilizzato solo a fini di prova.",
   "settings.invite.headline": "Invita Amici",
   "settings.navigation.account": "Profilo",
   "settings.navigation.availableServices": "Servizi disponibili",
@@ -319,6 +347,8 @@
   "settings.recipes.missingService": "Manca un servizio?",
   "settings.recipes.nothingFound": "Non è stato trovato alcun servizio corrispondente alla ricerca impostata. Ricorda che anche se non esiste un servizio specifico, potrebbe essere possibile usare la funzionalità \"Sito Custom\". Inoltre potrebbe essere che sul sito web di Ferdium siano mostrati più servizi di quanti disponibili nella applicazione correntemente in uso. Nel caso, per accedere a questi servizi, è possibile aggiornare Ferdium.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
+  "settings.releasenotes.connectionError": "Si è verificato un errore durante la connessione a Github, riprova più tardi.",
+  "settings.releasenotes.connectionErrorPageMissing": "Si è verificato un errore durante la connessione a Github, la pagina che stai cercando non esiste.",
   "settings.releasenotes.headline": "Note di rilascio",
   "settings.searchService": "Cerca servizio",
   "settings.service.error.goBack": "Torna ai servizi",
@@ -375,6 +405,7 @@
   "settings.service.form.tabOnPremise": "Auto Hosted",
   "settings.service.form.team": "Gruppo",
   "settings.service.form.trapLinkClicks": "Apri url con Ferdium",
+  "settings.service.form.useFavicon": "Utilizza la favicon del servizio al posto dell'icona predefinita oppure un'icona personalizzata",
   "settings.service.form.useHostedService": "Utilizza il servizio personalizzato {name}.",
   "settings.service.form.yourServices": "I tuoi servizi",
   "settings.service.reloadRequired": "Le modifiche richiedo il reload del servizio",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index e6ee0e35f..24ca894ee 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -159,6 +159,7 @@
   "service.errorHandler.headline": "О, нет!",
   "service.errorHandler.message": "Ошибка",
   "service.errorHandler.text": "{name} не смог загрузиться.",
+  "service.screenshare.cancel": "Отмена",
   "service.webviewLoader.loading": "Загрузка {service}",
   "services.getStarted": "Начать работу",
   "services.login": "Пожалуйста, войдите, чтобы использовать Ferdium.",
@@ -214,6 +215,7 @@
   "settings.app.form.enableTodos": "Включить задания Ferdium",
   "settings.app.form.hibernateOnStartup": "Оставлять сервисы в состоянии глубокого сна во время запуска",
   "settings.app.form.hibernationStrategy": "Стратегия гибернации",
+  "settings.app.form.hideCollapseButton": "Скрыть кнопку \"Свернуть\"",
   "settings.app.form.hideDownloadButton": "Скрыть кнопку \"Загрузки\"",
   "settings.app.form.hideNotificationsButton": "Скрыть кнопки уведомлений и звука",
   "settings.app.form.hideSettingsButton": "Скрыть кнопку настроек",
@@ -244,6 +246,7 @@
   "settings.app.form.splitMode": "Включить раздельный режим просмотра",
   "settings.app.form.startMinimized": "Запускать свернутым",
   "settings.app.form.universalDarkMode": "Включить универсальный темный режим",
+  "settings.app.form.useSelfSignedCertificates": "Принимать самоподписные сертификаты",
   "settings.app.form.useTouchIdToUnlock": "Разрешить разблокировку Ferdium по TouchID",
   "settings.app.form.wakeUpHibernationSplay": "Чередование циклов cна/пробуждения для уменьшения нагрузки",
   "settings.app.form.wakeUpHibernationStrategy": "Действия после автоматического просыпания",
@@ -261,10 +264,15 @@
   "settings.app.lockedPasswordInfo": "Пожалуйста, убедитесь, что установлен пароль, который вы запомните.\nЕсли вы потеряете этот пароль, вам придется переустановить Ferdium.",
   "settings.app.overallTheme": "Общая тема",
   "settings.app.progressbarTheme": "Тема Прогресса",
+  "settings.app.restart.restartDialogMessage": "Вы хотите перезапустить Ferdium?",
+  "settings.app.restart.restartDialogTitle": "Ferdium - Перезапуск приложения",
+  "settings.app.restart.restartLater": "Перезапустить позже",
+  "settings.app.restart.restartNow": "Перезапустить сейчас",
   "settings.app.restartRequired": "Изменения требуют перезагрузки приложения",
   "settings.app.scheduledDNDInfo": "Запланированный режим \"не беспокоить\" позволяет вам определить период времени, в течение которого вы не желаете получать уведомления от Ferdium.",
   "settings.app.scheduledDNDTimeInfo": "Время в 24-часовом формате. Время окончания может быть раньше времени начала (например, начало 17:00, конец 09:00), чтобы включить ночной режим \"не беспокоить\".",
   "settings.app.sectionAdvanced": "Расширенные настройки",
+  "settings.app.sectionHibernation": "Гибернация",
   "settings.app.sectionLanguage": "Настройка языка",
   "settings.app.sectionPrivacy": "Настройки конфиденциальности",
   "settings.app.sectionServiceIconsSettings": "Настройки значков сервиса",
@@ -274,6 +282,7 @@
   "settings.app.serverHelp": "Подключен к серверу {serverURL}",
   "settings.app.servicesUpdateStatusUpToDate": "Ваши сервисы актуальны",
   "settings.app.subheadlineCache": "Кэш",
+  "settings.app.subheadlineDownloads": "Загрузки",
   "settings.app.subheadlineFerdiumProfile": "Профиль Ferdium",
   "settings.app.todoServerInfo": "Этот сервер будет использоваться для функции задач \"Ferdium Todo\".",
   "settings.app.translationHelp": "Помогите нам перевести Ferdium на ваш язык.",
@@ -303,6 +312,8 @@
   "settings.recipes.missingService": "Не можете найти сервис?",
   "settings.recipes.nothingFound": "Извините, но сервис не соответствует вашему поисковому запросу - но вы все еще можете добавить его, используя опцию \"Пользовательский сайт\". Пожалуйста, обратите внимание, что на сайте может отображаться больше служб, которые могли быть добавлены в новых версиях Ferdium. Для получения новых сервисов, пожалуйста, обновите Ferdium до актуальной версии.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
+  "settings.releasenotes.connectionError": "Произошла ошибка при подключении к Github, пожалуйста, повторите попытку позже.",
+  "settings.releasenotes.connectionErrorPageMissing": "Произошла ошибка при подключении к Github, страница, которую вы ищете, отсутствует.",
   "settings.releasenotes.headline": "Информация о выпуске",
   "settings.searchService": "Найти сервис",
   "settings.service.error.goBack": "Вернуться к сервисам",
@@ -324,6 +335,7 @@
   "settings.service.form.enableNotification": "Включить уведомления",
   "settings.service.form.enableService": "Включить сервис",
   "settings.service.form.enableWakeUp": "Включить пробуждение",
+  "settings.service.form.headlineAppearance": "Оформление",
   "settings.service.form.headlineBadges": "Значки непрочитанных сообщений",
   "settings.service.form.headlineDarkReaderSettings": "Настройки тёмного чтения",
   "settings.service.form.headlineGeneral": "Общие",
@@ -440,6 +452,7 @@
   "validation.minLength": "Кількість символів в {field} повина бути не меньше {length}",
   "validation.oneRequired": "Необходим как минимум один",
   "validation.required": "{field} необходимо",
+  "validation.url": "{field} не является действительным URL",
   "webControls.back": "Назад",
   "webControls.forward": "Переслать",
   "webControls.goHome": "Домой",
diff --git a/src/index.ts b/src/index.ts
index cccf0ef66..a602c994e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -245,6 +245,18 @@ const createWindow = () => {
         openExternalUrl(url);
         return { action: 'deny' };
       });
+
+      // Handle will download event from main process (prevent download dialog)
+      contents.session.on('will-download', (_e, item) => {
+        const downloadFolderPath = retrieveSettingValue(
+          'downloadFolderPath',
+          DEFAULT_APP_SETTINGS.downloadFolderPath,
+        ) as string;
+
+        if (downloadFolderPath !== '') {
+          item.setSavePath(join(downloadFolderPath, item.getFilename()));
+        }
+      });
     }
   });
 
@@ -393,7 +405,8 @@ const createWindow = () => {
   });
 
   if (isMac) {
-    import('./electron/macOSPermissions').then(macOSPermissions => {
+    // Note: Do not remove the extension. See https://github.com/ferdium/ferdium-app/issues/1755 for explanation
+    import('./electron/macOSPermissions.js').then(macOSPermissions => {
       const { askFormacOSPermissions } = macOSPermissions;
 
       setTimeout(() => askFormacOSPermissions(mainWindow!), ms('30s'));
@@ -782,3 +795,15 @@ app.on(
     callback(checkIfCertIsPresent(certificate.data));
   },
 );
+
+ipcMain.on('relaunch-app', async (_, options) => {
+  // Ask user to confirm
+  const result = await dialog.showMessageBox(mainWindow!, options);
+
+  if (result.response === options.cancelId) {
+    return;
+  }
+
+  app.relaunch();
+  app.quit();
+});
diff --git a/src/jsUtils.ts b/src/jsUtils.ts
index 0befb8d56..145875cfa 100644
--- a/src/jsUtils.ts
+++ b/src/jsUtils.ts
@@ -28,12 +28,21 @@ export const safeParseInt = (text?: string | number | null) => {
   return Math.max(adjustedNumber, 0);
 };
 
-export const acceleratorString = (
-  index: number,
-  keyCombo: string,
-  prefix: string = '(',
-  suffix: string = ')',
-) => (index <= 10 ? `${prefix}${keyCombo}+${index % 10}${suffix}` : '');
+interface IAcceleratorString {
+  keyCombo: string;
+  index: number;
+  prefix?: string;
+  suffix?: string;
+  maxIndex?: number;
+}
+export const acceleratorString = ({
+  index,
+  keyCombo,
+  prefix = '(',
+  suffix = ')',
+  maxIndex = 9,
+}: IAcceleratorString) =>
+  index <= maxIndex ? `${prefix}${keyCombo}+${index % 10}${suffix}` : '';
 
 export const removeNewLines = (input: string): string =>
   input.replaceAll(/\r?\n|\r/g, '');
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index bb8eead3a..8fd8e0a73 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -496,7 +496,15 @@ function titleBarTemplateFactory(
         },
         {
           label: intl.formatMessage(menuItems.zoomIn),
-          accelerator: `${cmdOrCtrlShortcutKey()}+plus`,
+          // TODO: Modify this logic once https://github.com/electron/electron/issues/40674 is fixed
+          // This is a workaround for the issue where the zoom in shortcut is not working
+          // This makes sure the accelerator is not registered
+          accelerator: isWindows
+            ? `${cmdOrCtrlShortcutKey()}++`
+            : `${cmdOrCtrlShortcutKey()}+Plus`,
+          registerAccelerator: !!isMac,
+          acceleratorWorksWhenHidden: !!isMac,
+          // ---------------------------
           click() {
             const activeService = getActiveService();
             if (!activeService) {
@@ -1134,7 +1142,12 @@ class FranzMenu implements StoresProps {
     for (const [i, service] of services.allDisplayed.entries()) {
       menu.push({
         label: this._getServiceName(service),
-        accelerator: acceleratorString(i + 1, cmdOrCtrlShortcutKey(), '', ''),
+        accelerator: acceleratorString({
+          index: i + 1,
+          keyCombo: cmdOrCtrlShortcutKey(),
+          prefix: '',
+          suffix: '',
+        }),
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 11eb1884f..87043693b 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -26,6 +26,7 @@ interface RecipeData {
     message?: string;
     allowFavoritesDelineationInUnreadCount?: boolean;
   };
+  defaultIcon: string;
 }
 
 export interface IRecipe {
@@ -49,6 +50,7 @@ export interface IRecipe {
   path: string;
   partition: string;
   local: boolean;
+  defaultIcon: string;
 
   readonly overrideUserAgent?: () => string;
 
@@ -76,6 +78,8 @@ export default class Recipe implements IRecipe {
 
   version = '';
 
+  defaultIcon = '';
+
   // Removing this specific type will cause a typescript error
   // even while it's the exact same as the interface
   aliases: string[] = [];
@@ -135,6 +139,7 @@ export default class Recipe implements IRecipe {
     // from the recipe
     this.id = ifUndefined<string>(data.id, this.id);
     this.name = ifUndefined<string>(data.name, this.name);
+    this.defaultIcon = ifUndefined<string>(data.defaultIcon, this.defaultIcon);
     this.version = ifUndefined<string>(data.version, this.version);
     this.aliases = ifUndefined<string[]>(data.aliases, this.aliases);
     this.serviceURL = ifUndefined<string>(
diff --git a/src/models/Service.ts b/src/models/Service.ts
index 525661172..ae04b8b58 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -7,6 +7,7 @@ import type ElectronWebView from 'react-electron-web-view';
 import { v4 as uuidV4 } from 'uuid';
 import { needsToken } from '../api/apiBase';
 import { DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } from '../config';
+import { isMac } from '../environment';
 import { todosStore } from '../features/todos';
 import { getFaviconUrl } from '../helpers/favicon-helpers';
 import { isValidExternalURL, normalizedUrl } from '../helpers/url-helpers';
@@ -377,6 +378,10 @@ export default class Service {
       return this.iconUrl;
     }
 
+    if (this.recipe.defaultIcon) {
+      return this.recipe.defaultIcon;
+    }
+
     return join(this.recipe.path, 'icon.svg');
   }
 
@@ -532,6 +537,18 @@ export default class Service {
     });
 
     if (webviewWebContents) {
+      // TODO: Modify this logic once https://github.com/electron/electron/issues/40674 is fixed
+      // This is a workaround for the issue where the zoom in shortcut is not working
+      if (!isMac) {
+        webviewWebContents.on('before-input-event', (event, input) => {
+          if (input.control && input.key === '+' && input.type === 'keyDown') {
+            event.preventDefault();
+            const currentZoom = this.webview?.getZoomLevel();
+            this.webview?.setZoomLevel(currentZoom + 0.5);
+          }
+        });
+      }
+
       webviewWebContents.session.on('will-download', (event, item) => {
         event.preventDefault();
 
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 9f2cfeca3..58c6b2a87 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -917,12 +917,13 @@ export default class ServicesStore extends TypedStore {
 
         if (service.isNotificationEnabled) {
           let title: string;
-          options.icon = service.iconUrl;
           if (this.stores.settings.all.app.privateNotifications === true) {
             // Remove message data from notification in private mode
             options.body = '';
+            options.icon = service.icon;
             title = `Notification from ${service.name}`;
           } else {
+            options.icon = options.icon || service.icon;
             options.body = typeof options.body === 'string' ? options.body : '';
             title =
               typeof args[0].title === 'string' ? args[0].title : service.name;
diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts
index 0a8b9c57b..d92e18aa9 100644
--- a/src/webview/contextMenuBuilder.ts
+++ b/src/webview/contextMenuBuilder.ts
@@ -130,8 +130,8 @@ interface ContextMenuStringTable {
     translatorLanguage: string;
   }) => string;
   openLinkUrl: () => string;
-  openLinkInFerdiumUrl: () => string;
   openInBrowser: () => string;
+  openInFerdium: () => string;
   copyLinkUrl: () => string;
   copyImageUrl: () => string;
   copyImage: () => string;
@@ -158,8 +158,8 @@ const contextMenuStringTable: ContextMenuStringTable = {
     `Translate to ${translatorLanguage}`,
   translateLanguage: ({ translatorLanguage }) => `${translatorLanguage}`,
   openLinkUrl: () => 'Open Link',
-  openLinkInFerdiumUrl: () => 'Open Link in Ferdium',
   openInBrowser: () => 'Open in Browser',
+  openInFerdium: () => 'Open in Ferdium',
   copyLinkUrl: () => 'Copy Link',
   copyImageUrl: () => 'Copy Image Address',
   copyImage: () => 'Copy Image',
@@ -299,10 +299,13 @@ export class ContextMenuBuilder {
     this.addPastePlain(menu, menuInfo);
     this.addInspectElement(menu, menuInfo);
     this.processMenu(menu);
-
+    this.addSeparator(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -340,16 +343,8 @@ export class ContextMenuBuilder {
       },
     });
 
-    const openInFerdiumLink = new MenuItem({
-      label: this.stringTable.openLinkInFerdiumUrl(),
-      click: () => {
-        window.location.href = menuInfo.linkURL;
-      },
-    });
-
     menu.append(copyLink);
     menu.append(openLink);
-    menu.append(openInFerdiumLink);
 
     if (this.isSrcUrlValid(menuInfo)) {
       this.addSeparator(menu);
@@ -358,13 +353,15 @@ export class ContextMenuBuilder {
 
     this.addInspectElement(menu, menuInfo);
     this.processMenu(menu);
-
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -384,16 +381,19 @@ export class ContextMenuBuilder {
       this.addTranslateItems(menu, menuInfo);
     }
     this.addCopy(menu, menuInfo);
-    this.addInspectElement(menu, menuInfo);
-    // @ts-expect-error Expected 1 arguments, but got 2.
-    this.processMenu(menu, menuInfo);
 
+    this.addInspectElement(menu, menuInfo);
+    this.processMenu(menu);
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
+    this.addSeparator(menu);
     this.copyPageUrl(menu, menuInfo);
-    this.goToHomePage(menu, menuInfo);
+    this.addSeparator(menu);
     this.openInBrowser(menu, menuInfo);
+    this.openInFerdium(menu, menuInfo);
+    this.addSeparator(menu);
+    this.goToHomePage(menu, menuInfo);
 
     return menu;
   }
@@ -412,8 +412,7 @@ export class ContextMenuBuilder {
       this.addImageItems(menu, menuInfo);
     }
     this.addInspectElement(menu, menuInfo);
-    // @ts-expect-error Expected 1 arguments, but got 2.
-    this.processMenu(menu, menuInfo);
+    this.processMenu(menu);
 
     return menu;
   }
@@ -970,6 +969,26 @@ export class ContextMenuBuilder {
     return menu;
   }
 
+  /**
+   * Adds the 'open in ferdium' menu item.
+   */
+  openInFerdium(
+    menu: Electron.CrossProcessExports.Menu,
+    menuInfo: IContextMenuParams,
+  ) {
+    menu.append(
+      new MenuItem({
+        label: this.stringTable.openInFerdium(),
+        enabled: true,
+        click: () => {
+          window.location.href = menuInfo.linkURL;
+        },
+      }),
+    );
+
+    return menu;
+  }
+
   _sendNotificationOnClipboardEvent(
     isDisabled: boolean,
     notificationText: () => string,
diff --git a/src/webview/notifications.ts b/src/webview/notifications.ts
index e4401ab6e..0da86fbba 100644
--- a/src/webview/notifications.ts
+++ b/src/webview/notifications.ts
@@ -31,52 +31,51 @@ export class NotificationsHandler {
 }
 
 export const notificationsClassDefinition = `(() => {
-  class Notification {
-    static permission = 'granted';
-
-    constructor(title = '', options = {}) {
-      this.title = title;
-      this.options = options;
-      try {
-        window.ferdium.displayNotification(title, options)
-          .then(() => {
-            if (typeof (this.onClick) === 'function') {
-              this.onClick();
-            }
-          });
-      } catch(error) {
-                this.options.onClick = null;
-          window.ferdium.displayNotification(title, options)
-            .then(() => {
-              if (typeof (this.onClick) === 'function') {
-                this.onClick();
-              }
-            });
-      }
-    }
+class Notification {
+  static permission = 'granted';
 
-    static requestPermission(cb = null) {
-      if (!cb) {
-        return new Promise((resolve) => {
-          resolve(Notification.permission);
-        });
-      }
+  static _notification;
 
-      if (typeof (cb) === 'function') {
-        return cb(Notification.permission);
-      }
+  constructor(title = '', options = {}) {
+    Notification._displayNotification(title, options);
+  }
 
-      return Notification.permission;
-    }
+  static _displayNotification(title, options) {
+    Notification._notification = window.ferdium
+      .displayNotification(title, options)
+      .then(() => {
+        // TODO: After several tries, we couldn't find a way to trigger the native notification onclick event.
+        // This was needed so that user could go to the specific context when clicking on the notification (it only goes to the service now).
+        // For now, we don't do anything here
+      });
+  }
 
-    onNotify(data) {
-      return data;
+  static requestPermission(cb) {
+    if (typeof cb === 'function') {
+      cb(Notification.permission);
     }
 
-    onClick() {}
+    return Promise.resolve(Notification.permission);
+  }
+
+  onNotify(data) {
+    return data;
+  }
 
-    close() {}
+  close() {
+    if (Notification._notification) {
+      Notification._notification = null;
+    }
   }
 
+  onclick() {}
+
+  onclose() {}
+
+  onerror() {}
+
+  onshow() {}
+}
+
   window.Notification = Notification;
 })();`;
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts
index a35a99699..ad2215ffd 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -121,7 +121,7 @@ contextBridge.exposeInMainWorld('ferdium', {
   setDialogTitle: (title: string | null | undefined) =>
     dialogTitleHandler.setDialogTitle(title),
   displayNotification: (title: string, options: any) => {
-    notificationsHandler.displayNotification(
+    return notificationsHandler.displayNotification(
       title,
       // The following line is needed so that a proper clone of the "options" object is made.
       // This line was causing issues with some services.
diff --git a/test/jsUtils.test.ts b/test/jsUtils.test.ts
index 508f5dd9f..b40b21b2a 100644
--- a/test/jsUtils.test.ts
+++ b/test/jsUtils.test.ts
@@ -180,23 +180,59 @@ describe('jsUtils', () => {
 
   describe('acceleratorString', () => {
     it('handles without prefix and suffix', () => {
-      expect(jsUtils.acceleratorString(5, 'abc')).toEqual('(abc+5)');
+      expect(
+        jsUtils.acceleratorString({
+          index: 5,
+          keyCombo: 'abc',
+        }),
+      ).toEqual('(abc+5)');
     });
 
     it('handles index = 0', () => {
-      expect(jsUtils.acceleratorString(0, 'abc')).toEqual('(abc+0)');
+      expect(
+        jsUtils.acceleratorString({
+          index: 0,
+          keyCombo: 'abc',
+        }),
+      ).toEqual('(abc+0)');
     });
 
     it('handles index = 1', () => {
-      expect(jsUtils.acceleratorString(1, 'abc')).toEqual('(abc+1)');
+      expect(
+        jsUtils.acceleratorString({
+          index: 1,
+          keyCombo: 'abc',
+        }),
+      ).toEqual('(abc+1)');
     });
 
     it('handles index = 10', () => {
-      expect(jsUtils.acceleratorString(10, 'abc')).toEqual('(abc+0)');
+      expect(
+        jsUtils.acceleratorString({
+          index: 10,
+          keyCombo: 'abc',
+          maxIndex: 10,
+        }),
+      ).toEqual('(abc+0)');
     });
 
     it('handles index = 11', () => {
-      expect(jsUtils.acceleratorString(11, 'abc')).toEqual('');
+      expect(
+        jsUtils.acceleratorString({
+          index: 11,
+          keyCombo: 'abc',
+        }),
+      ).toEqual('');
+    });
+
+    it('handles index = 9, maxIndex = 8', () => {
+      expect(
+        jsUtils.acceleratorString({
+          index: 9,
+          maxIndex: 8,
+          keyCombo: 'abc',
+        }),
+      ).toEqual('');
     });
   });