37 files changed, 987 insertions, 427 deletions

diff --git a/package.json b/package.json
index 1c3502ee3..03ce9a1f8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdium",
   "desktopName": "ferdium.desktop",
   "appId": "org.ferdium.ferdium-app",
-  "version": "6.7.3-nightly.15",
+  "version": "6.7.4",
   "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.1",
+    "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 341b0905c..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.1)
+    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.1)
+    version: 1.1.0(electron@30.0.6)
   auto-launch:
     specifier: 5.0.6
     version: 5.0.6
@@ -202,7 +202,7 @@ dependencies:
     version: 10.10.0(react@18.2.0)
   react-loader-spinner:
     specifier: 5.4.5
-    version: 5.4.5(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0)
+    version: 5.4.5(@babel/core@7.24.5)(react-dom@18.2.0)(react@18.2.0)
   react-modal:
     specifier: 3.16.1
     version: 3.16.1(react-dom@18.2.0)(react@18.2.0)
@@ -352,8 +352,8 @@ devDependencies:
     specifier: 7.0.3
     version: 7.0.3
   electron:
-    specifier: 30.0.1
-    version: 30.0.1
+    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)
@@ -401,7 +401,7 @@ devDependencies:
     version: 4.6.0(eslint@8.57.0)
   eslint-plugin-sonar:
     specifier: 0.13.2
-    version: 0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5)
+    version: 0.13.2(@babel/core@7.24.5)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5)
   eslint-plugin-unicorn:
     specifier: 52.0.0
     version: 52.0.0(eslint@8.57.0)
@@ -645,8 +645,8 @@ packages:
     resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.24.2
-      picocolors: 1.0.0
+      '@babel/highlight': 7.24.5
+      picocolors: 1.0.1
 
   /@babel/compat-data@7.22.20:
     resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==}
@@ -680,20 +680,20 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/core@7.24.4:
-    resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==}
+  /@babel/core@7.24.5:
+    resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@babel/code-frame': 7.24.2
-      '@babel/generator': 7.24.4
+      '@babel/generator': 7.24.5
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.4)
-      '@babel/helpers': 7.24.4
-      '@babel/parser': 7.24.4
+      '@babel/helper-module-transforms': 7.24.5(@babel/core@7.24.5)
+      '@babel/helpers': 7.24.5
+      '@babel/parser': 7.24.5
       '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.1
-      '@babel/types': 7.24.0
+      '@babel/traverse': 7.24.5
+      '@babel/types': 7.24.5
       convert-source-map: 2.0.0
       debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
@@ -702,14 +702,14 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/eslint-parser@7.23.10(@babel/core@7.24.4)(eslint@8.57.0):
+  /@babel/eslint-parser@7.23.10(@babel/core@7.24.5)(eslint@8.57.0):
     resolution: {integrity: sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
       '@babel/core': ^7.11.0
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      '@babel/core': 7.24.4
+      '@babel/core': 7.24.5
       '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
       eslint: 8.57.0
       eslint-visitor-keys: 2.1.0
@@ -725,11 +725,11 @@ packages:
       '@jridgewell/trace-mapping': 0.3.20
       jsesc: 2.5.2
 
-  /@babel/generator@7.24.4:
-    resolution: {integrity: sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==}
+  /@babel/generator@7.24.5:
+    resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.5
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
@@ -785,6 +785,12 @@ packages:
     dependencies:
       '@babel/types': 7.23.5
 
+  /@babel/helper-module-imports@7.24.3:
+    resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+
   /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.5):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
@@ -799,18 +805,18 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.4):
-    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
+  /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5):
+    resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.4
+      '@babel/core': 7.24.5
       '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/helper-module-imports': 7.24.3
+      '@babel/helper-simple-access': 7.24.5
+      '@babel/helper-split-export-declaration': 7.24.5
+      '@babel/helper-validator-identifier': 7.24.5
 
   /@babel/helper-plugin-utils@7.22.5:
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
@@ -821,6 +827,13 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.23.5
+    dev: true
+
+  /@babel/helper-simple-access@7.24.5:
+    resolution: {integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
 
   /@babel/helper-split-export-declaration@7.22.6:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
@@ -828,6 +841,12 @@ packages:
     dependencies:
       '@babel/types': 7.23.5
 
+  /@babel/helper-split-export-declaration@7.24.5:
+    resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+
   /@babel/helper-string-parser@7.23.4:
     resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
     engines: {node: '>=6.9.0'}
@@ -840,6 +859,10 @@ packages:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-validator-identifier@7.24.5:
+    resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/helper-validator-option@7.22.15:
     resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
     engines: {node: '>=6.9.0'}
@@ -860,13 +883,13 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helpers@7.24.4:
-    resolution: {integrity: sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==}
+  /@babel/helpers@7.24.5:
+    resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.1
-      '@babel/types': 7.24.0
+      '@babel/traverse': 7.24.5
+      '@babel/types': 7.24.5
     transitivePeerDependencies:
       - supports-color
 
@@ -878,14 +901,14 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/highlight@7.24.2:
-    resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
+  /@babel/highlight@7.24.5:
+    resolution: {integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
+      '@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==}
@@ -894,12 +917,12 @@ packages:
     dependencies:
       '@babel/types': 7.23.5
 
-  /@babel/parser@7.24.4:
-    resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==}
+  /@babel/parser@7.24.5:
+    resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.5
 
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.5):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -956,13 +979,13 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.4):
+  /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.5):
     resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.4
+      '@babel/core': 7.24.5
       '@babel/helper-plugin-utils': 7.22.5
     dev: false
 
@@ -1072,8 +1095,8 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.24.2
-      '@babel/parser': 7.24.4
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.5
 
   /@babel/traverse@7.23.5(supports-color@5.5.0):
     resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
@@ -1092,18 +1115,18 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/traverse@7.24.1:
-    resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==}
+  /@babel/traverse@7.24.5:
+    resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.24.2
-      '@babel/generator': 7.24.4
+      '@babel/generator': 7.24.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.4
-      '@babel/types': 7.24.0
+      '@babel/helper-split-export-declaration': 7.24.5
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.5
       debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -1117,12 +1140,12 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
-  /@babel/types@7.24.0:
-    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
+  /@babel/types@7.24.5:
+    resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-string-parser': 7.24.1
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/helper-validator-identifier': 7.24.5
       to-fast-properties: 2.0.0
 
   /@bcoe/v8-coverage@0.2.3:
@@ -1471,12 +1494,12 @@ packages:
       - supports-color
     dev: true
 
-  /@electron/remote@2.1.2(electron@30.0.1):
+  /@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.1
+      electron: 30.0.6
     dev: false
 
   /@electron/universal@1.5.1:
@@ -3001,12 +3024,12 @@ packages:
       path-to-regexp: 6.2.2
     dev: false
 
-  /@syed_umair/electron-process-manager@1.1.0(electron@30.0.1):
+  /@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.1
+      electron: 30.0.6
       electron-process-reporter: 1.4.0
     dev: false
 
@@ -4512,17 +4535,17 @@ packages:
       resolve: 1.22.8
     dev: false
 
-  /babel-plugin-styled-components@2.1.4(@babel/core@7.24.4)(styled-components@5.3.11):
+  /babel-plugin-styled-components@2.1.4(@babel/core@7.24.5)(styled-components@5.3.11):
     resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==}
     peerDependencies:
       styled-components: '>= 2'
     dependencies:
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-module-imports': 7.22.15
-      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.4)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.5)
       lodash: 4.17.21
       picomatch: 2.3.1
-      styled-components: 5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)
+      styled-components: 5.3.11(@babel/core@7.24.5)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)
     transitivePeerDependencies:
       - '@babel/core'
     dev: false
@@ -4699,7 +4722,7 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001611
+      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)
@@ -4950,8 +4973,8 @@ packages:
     resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
     dev: false
 
-  /caniuse-lite@1.0.30001611:
-    resolution: {integrity: sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==}
+  /caniuse-lite@1.0.30001620:
+    resolution: {integrity: sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==}
 
   /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
@@ -6194,8 +6217,8 @@ packages:
       mkdirp: 0.5.6
     dev: false
 
-  /electron@30.0.1:
-    resolution: {integrity: sha512-iwxkI/n2wBd29NH7TH0ZY8aWGzCoKpzJz+D10u7aGSJi1TV6d4MSM3rWyKvT/UkAHkTKOEgYfUyCa2vWQm8L0g==}
+  /electron@30.0.6:
+    resolution: {integrity: sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
     requiresBuild: true
@@ -6947,7 +6970,7 @@ packages:
       string.prototype.matchall: 4.0.11
     dev: true
 
-  /eslint-plugin-sonar@0.13.2(@babel/core@7.24.4)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5):
+  /eslint-plugin-sonar@0.13.2(@babel/core@7.24.5)(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5):
     resolution: {integrity: sha512-7mZkk4/E2tGtIi3OCNCTmEWthweWzoAj9YcsxxIDI38r7q4RDusWDpsdGHPZXp/+QU8ZKkvmE11G4DtJW+k1kg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -6956,8 +6979,8 @@ packages:
       eslint: ^8.0.0
       typescript: ^4.0.0 || ^5.0.0
     dependencies:
-      '@babel/core': 7.24.4
-      '@babel/eslint-parser': 7.23.10(@babel/core@7.24.4)(eslint@8.57.0)
+      '@babel/core': 7.24.5
+      '@babel/eslint-parser': 7.23.10(@babel/core@7.24.5)(eslint@8.57.0)
       '@eslint-community/regexpp': 4.10.0
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5)
       '@typescript-eslint/parser': 7.6.0(eslint@8.57.0)(typescript@5.4.5)
@@ -11299,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'}
@@ -11935,7 +11961,7 @@ packages:
     resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
     dev: false
 
-  /react-loader-spinner@5.4.5(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0):
+  /react-loader-spinner@5.4.5(@babel/core@7.24.5)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-32f+sb/v2tnNfyvnCCOS4fpyVHsGXjSyNo6QLniHcaj1XjKLxx14L2z0h6szRugOL8IEJ+53GPwNAdbkDqmy4g==}
     peerDependencies:
       react: ^16.0.0 || ^17.0.0 || ^18.0.0
@@ -11944,7 +11970,7 @@ packages:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-is: 18.2.0
-      styled-components: 5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)
+      styled-components: 5.3.11(@babel/core@7.24.5)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)
       styled-tools: 1.7.2
     transitivePeerDependencies:
       - '@babel/core'
@@ -13379,7 +13405,7 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /styled-components@5.3.11(@babel/core@7.24.4)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0):
+  /styled-components@5.3.11(@babel/core@7.24.5)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -13392,7 +13418,7 @@ packages:
       '@emotion/is-prop-valid': 1.2.1
       '@emotion/stylis': 0.8.5
       '@emotion/unitless': 0.7.5
-      babel-plugin-styled-components: 2.1.4(@babel/core@7.24.4)(styled-components@5.3.11)
+      babel-plugin-styled-components: 2.1.4(@babel/core@7.24.5)(styled-components@5.3.11)
       css-to-react-native: 3.2.0
       hoist-non-react-statics: 3.3.2
       react: 18.2.0
diff --git a/recipes b/recipes
-Subproject 7ab6497fbd7bc64c3f2b17b587d273c9bbd155c
+Subproject ae724d09560576253952f8884497a8d797215ae
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/MediaSource.tsx b/src/components/MediaSource.tsx
new file mode 100644
index 000000000..34fbda227
--- /dev/null
+++ b/src/components/MediaSource.tsx
@@ -0,0 +1,171 @@
+import { ipcRenderer } from 'electron';
+import { type MouseEventHandler, useEffect, useState } from 'react';
+import {
+  type WrappedComponentProps,
+  defineMessages,
+  injectIntl,
+} from 'react-intl';
+import { SCREENSHARE_CANCELLED_BY_USER } from '../config';
+import { isWayland } from '../environment';
+import type Service from '../models/Service';
+import FullscreenLoader from './ui/FullscreenLoader';
+
+interface IProps extends WrappedComponentProps {
+  service: Service;
+}
+
+const messages = defineMessages({
+  loading: {
+    id: 'service.screenshare.loading',
+    defaultMessage: 'Loading screens and windows',
+  },
+  cancel: {
+    id: 'service.screenshare.cancel',
+    defaultMessage: 'Cancel',
+  },
+});
+
+interface ICancelButtonProps extends WrappedComponentProps {
+  handleOnClick: MouseEventHandler<HTMLButtonElement> | undefined;
+}
+
+const CancelButton = injectIntl(
+  ({ handleOnClick, intl }: ICancelButtonProps) => (
+    <li className="desktop-capturer-selection__item">
+      <button
+        type="button" // Add explicit type attribute
+        className="desktop-capturer-selection__btn"
+        data-id={SCREENSHARE_CANCELLED_BY_USER}
+        title="Cancel"
+        onClick={handleOnClick}
+      >
+        <span className="desktop-capturer-selection__name desktop-capturer-selection__name--cancel">
+          {intl.formatMessage(messages.cancel)}
+        </span>
+      </button>
+    </li>
+  ),
+);
+
+function MediaSource(props: IProps) {
+  const { service, intl } = props;
+  const [sources, setSources] = useState<any>([]);
+  const [show, setShow] = useState<boolean>(false);
+  const [trackerId, setTrackerId] = useState<string | null>(null);
+  const [loadingSources, setLoadingSources] = useState<boolean>(false);
+
+  ipcRenderer.on(`select-capture-device:${service.id}`, (_event, data) => {
+    if (loadingSources) return;
+    setShow(true);
+    setTrackerId(data.trackerId);
+  });
+
+  const handleOnClick = (e: any) => {
+    const { id } = e.currentTarget.dataset;
+    window['ferdium'].actions.service.sendIPCMessage({
+      serviceId: service.id,
+      channel: `selected-media-source:${trackerId}`,
+      args: {
+        mediaSourceId: id,
+      },
+    });
+
+    setShow(false);
+    setSources([]);
+    setTrackerId(null);
+  };
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: This effect should only run when `show` changes
+  useEffect(() => {
+    if (show) {
+      setLoadingSources(true);
+      ipcRenderer
+        .invoke('get-desktop-capturer-sources')
+        .then(sources => {
+          if (isWayland) {
+            // On Linux, we do not need to prompt the user again for the source
+            handleOnClick({
+              currentTarget: { dataset: { id: sources[0].id } },
+            });
+            return;
+          }
+
+          setSources(sources);
+          setLoadingSources(false);
+        })
+        // silence the error
+        .catch(() => {
+          setShow(false);
+          setSources([]);
+          setLoadingSources(false);
+        });
+    } else {
+      setSources([]);
+      setLoadingSources(false);
+    }
+  }, [show]);
+
+  if (!show) {
+    return null;
+  }
+
+  if (loadingSources) {
+    return (
+      <div className="desktop-capturer-selection">
+        <ul
+          className="desktop-capturer-selection__list"
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+          }}
+        >
+          <FullscreenLoader title={intl.formatMessage(messages.loading)}>
+            <div style={{ display: 'flex', justifyContent: 'center' }}>
+              <CancelButton handleOnClick={handleOnClick} />
+            </div>
+          </FullscreenLoader>
+        </ul>
+      </div>
+    );
+  }
+
+  if (sources.length === 0) {
+    return (
+      <div className="desktop-capturer-selection">
+        <ul className="desktop-capturer-selection__list">
+          <li>No available sources.</li>
+          <CancelButton handleOnClick={handleOnClick} />
+        </ul>
+      </div>
+    );
+  }
+
+  return (
+    <div className="desktop-capturer-selection">
+      <ul className="desktop-capturer-selection__list">
+        {sources.map(({ id, name, thumbnail }) => (
+          <li className="desktop-capturer-selection__item" key={id}>
+            <button
+              type="button" // Add explicit type attribute
+              className="desktop-capturer-selection__btn"
+              data-id={id}
+              title={name}
+              onClick={handleOnClick}
+            >
+              <img
+                alt="Desktop capture preview"
+                className="desktop-capturer-selection__thumbnail"
+                src={thumbnail.toDataURL()}
+              />
+              <span className="desktop-capturer-selection__name">{name}</span>
+            </button>
+          </li>
+        ))}
+      </ul>
+      <CancelButton handleOnClick={handleOnClick} />
+    </div>
+  );
+}
+
+export default injectIntl(MediaSource);
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index 577473b5d..b7f539a5d 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -7,6 +7,7 @@ import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import type ServiceModel from '../../../models/Service';
 import type { RealStores } from '../../../stores';
+import MediaSource from '../../MediaSource';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 import WebviewLoader from '../../ui/WebviewLoader';
 import ServiceDisabled from './ServiceDisabled';
@@ -164,6 +165,7 @@ class ServiceView extends Component<IProps, IState> {
             ) : (
               <>
                 {showNavBar && <WebControlsScreen service={service} />}
+                <MediaSource service={service} />
                 <ServiceWebview
                   service={service}
                   setWebviewReference={setWebviewRef}
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/services/EditServiceForm.tsx b/src/components/settings/services/EditServiceForm.tsx
index 69893c16c..00629b6b6 100644
--- a/src/components/settings/services/EditServiceForm.tsx
+++ b/src/components/settings/services/EditServiceForm.tsx
@@ -396,6 +396,7 @@ class EditServiceForm extends Component<IProps, IState> {
 
                 <div className="settings__settings-group">
                   <H3>{intl.formatMessage(messages.headlineAppearance)}</H3>
+                  <Toggle {...form.$('useFavicon').bind()} />
                   <Toggle {...form.$('isDarkModeEnabled').bind()} />
                   {form.$('isDarkModeEnabled').value && (
                     <>
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 f086c54ee..0034b00a6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -49,6 +49,9 @@ export const WEBRTC_IP_HANDLING_POLICY = {
   [disableWebRTCIPHandlingPolicy]: 'Do not expose public or local IPs',
 };
 
+export const SCREENSHARE_CANCELLED_BY_USER =
+  'desktop-capturer-selection__cancel';
+
 // TODO: Need to convert many of these to i18n
 export const HIBERNATION_STRATEGIES = {
   10: 'Extremely Fast Hibernation (10sec)',
@@ -398,6 +401,7 @@ export const DEFAULT_APP_SETTINGS = {
   automaticUpdates: true,
   universalDarkMode: true,
   userAgentPref: '',
+  downloadFolderPath: '',
   adaptableDarkMode: true,
   accentColor: DEFAULT_ACCENT_COLOR,
   progressbarAccentColor: DEFAULT_ACCENT_COLOR,
@@ -440,6 +444,7 @@ export const DEFAULT_SERVICE_SETTINGS = {
   isBadgeEnabled: true,
   isMediaBadgeEnabled: false,
   trapLinkClicks: false,
+  useFavicon: false,
   isMuted: false,
   customIcon: false,
   isDarkModeEnabled: false,
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/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index f3b9b0857..e890e8695 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -96,6 +96,10 @@ const messages = defineMessages({
     id: 'settings.service.form.trapLinkClicks',
     defaultMessage: 'Open URLs within Ferdium',
   },
+  useFavicon: {
+    id: 'settings.service.form.useFavicon',
+    defaultMessage: 'Use service favicon instead of default or custom icon',
+  },
   onlyShowFavoritesInUnreadCount: {
     id: 'settings.service.form.onlyShowFavoritesInUnreadCount',
     defaultMessage: 'Only show Favorites in unread count',
@@ -258,6 +262,15 @@ class EditServiceScreen extends Component<IProps> {
           default: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
           type: 'checkbox',
         },
+        useFavicon: {
+          label: intl.formatMessage(messages.useFavicon),
+          value: ifUndefined<boolean>(
+            service?.useFavicon,
+            DEFAULT_SERVICE_SETTINGS.useFavicon,
+          ),
+          default: DEFAULT_SERVICE_SETTINGS.useFavicon,
+          type: 'checkbox',
+        },
         isMuted: {
           label: intl.formatMessage(messages.enableAudio),
           value: !ifUndefined<boolean>(
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/environment.ts b/src/environment.ts
index 87e2f4f66..4a0399876 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -7,6 +7,8 @@ export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 export const isWinPortable = process.env.PORTABLE_EXECUTABLE_FILE != null;
 
+export const isWayland = isLinux && process.env.XDG_SESSION_TYPE === 'wayland';
+
 export const electronVersion: string = process.versions.electron ?? '';
 export const chromeVersion: string = process.versions.chrome ?? '';
 export const nodeVersion: string = process.versions.node;
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/helpers/favicon-helpers.ts b/src/helpers/favicon-helpers.ts
new file mode 100644
index 000000000..5743d938f
--- /dev/null
+++ b/src/helpers/favicon-helpers.ts
@@ -0,0 +1,3 @@
+export function getFaviconUrl(url: string, size: number = 128): string {
+  return `https://www.google.com/s2/favicons?sz=${size}&domain_url=${url}`;
+}
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 1941ecd86..cb0f4369c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -164,6 +164,8 @@
   "service.errorHandler.headline": "Oh no!",
   "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
+  "service.screenshare.cancel": "Cancel",
+  "service.screenshare.loading": "Loading screens and windows",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdium.",
@@ -192,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",
@@ -211,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",
@@ -288,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.",
@@ -306,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.",
@@ -394,6 +405,7 @@
   "settings.service.form.tabOnPremise": "Self hosted ��",
   "settings.service.form.team": "Team",
   "settings.service.form.trapLinkClicks": "Open URLs within Ferdium",
+  "settings.service.form.useFavicon": "Use service favicon instead of default or custom icon",
   "settings.service.form.useHostedService": "Use the hosted {name} service.",
   "settings.service.form.yourServices": "Your services",
   "settings.service.reloadRequired": "Changes require reload of the service",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 2247db0b0..0712a15d4 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -16,6 +16,7 @@
   "feature.publishDebugInfo.info": "פרסו� פירוט השגי�ות שלך מסייע לנו ל�תר תקלות ושגי�ות ב־Ferdium. פרסו� פירוט השגי�ות שלך מהווה �ת הסכמתך למדיניות הפרטיות לניפוי שגי�ות ותנ�י השירות של Ferdium",
   "feature.publishDebugInfo.privacy": "מדיניות פרטיות",
   "feature.publishDebugInfo.publish": "מוסכ�, לפרס�",
+  "feature.publishDebugInfo.published": "יומן ניפוי השגי�ות שלך פורס� והו� זמין כעת דרך",
   "feature.publishDebugInfo.terms": "תנ�י שירות",
   "feature.publishDebugInfo.title": "פרסו� פרטי ניפוי שגי�ות",
   "feature.quickSwitch.info": "בחירת שירותי� מתבצעת ע� TAB, ↑ ו־↓. פתיחת שירותי� ע� ENTER.",
@@ -187,6 +188,7 @@
   "settings.account.yourLicense": "רישיון ה־Ferdium שלך:",
   "settings.app.accentColorInfo": "יש לציין �ת הצבע שלך ב�ופן שתו�� ל־CSS (ברירת המחדל: {defaultAccentColor} �ו להש�יר �ת שדה הקלט פנוי)",
   "settings.app.buttonInstallUpdate": "להפעיל מחדש ולהתקין עדכוני�",
+  "settings.app.buttonOpenFerdiumCertsFolder": "פתיחת תיקיית ה�ישורי�",
   "settings.app.buttonOpenFerdiumProfileFolder": "פתיחת תיקיית הפרופיל",
   "settings.app.buttonOpenFerdiumServiceRecipesFolder": "פתיחת תיקיית מתכוני השירותי�",
   "settings.app.buttonOpenImportExport": "ייבו� / ייצו�",
@@ -229,6 +231,7 @@
   "settings.app.form.hideWorkspacesButton": "הסתרת כפתור סביבות עבודה",
   "settings.app.form.iconSize": "גודל סמל שירות",
   "settings.app.form.inactivityLock": "נעילה ל�חר �י פעילות",
+  "settings.app.form.isTwoFactorAutoCatcherEnabled": "ללכוד קודי� ל�ימות דו־שלבי מההתר�ות �וטומטית (למשל: הודעות ב־Android) ולהעתיק ללוח הגזירי�",
   "settings.app.form.keepAllWorkspacesLoaded": "לשמור על כל סביבות העבודה פעילות ברקע",
   "settings.app.form.language": "שפה",
   "settings.app.form.lockPassword": "סיסמה",
@@ -258,9 +261,11 @@
   "settings.app.form.startMinimized": "להתחיל ממוזער",
   "settings.app.form.translatorEngine": "מנוע תרגו�",
   "settings.app.form.translatorLanguage": "שפת המתרג� כברירת מחדל",
+  "settings.app.form.twoFactorAutoCatcherMatcher": "רשימה מופרדת בפסיקי� של מילי�/ביטויי� תלויי רישיות (מבדיל בין �ותיות קטנות לגדולות ב�נגלית) ללכידת קודי� ל�ימות דו־שלבי. למשל: token,� code,� sms,� verify, �ימות, קוד, חד־פעמי",
   "settings.app.form.universalDarkMode": "הפעלת מצב לילה כולל",
   "settings.app.form.useGrayscaleServices": "להשתמש בשירותי גווני �פור",
   "settings.app.form.useHorizontalStyle": "להשתמש בסגנון �ופקי",
+  "settings.app.form.useSelfSignedCertificates": "הפעלת �ישורי� חתומי� עצמ�ית",
   "settings.app.form.useTouchIdToUnlock": "ל�פשר שימוש ב־TouchID כדי לשחרר �ת Ferdium",
   "settings.app.form.wakeUpHibernationSplay": "להרחיב �ת מחזורי הרדמה/השכמה כדי להפחית בעומס",
   "settings.app.form.wakeUpHibernationStrategy": "�סטרטגיית הרדמה ל�חר השכמה �וטומטית",
@@ -275,6 +280,8 @@
   "settings.app.headlineUpdates": "עדכוני�",
   "settings.app.hibernateInfo": "כברירת מחדל, השירותי� שלך ייש�רו פתוחי� וטעוני� ברקע על ידי Ferdium כדי שיהיו מוכני� לשימוש. הרדמת שירותי� תפרוק �ת השירותי� שלך ל�חר זמן מסוי�. עשוי לחסוך בזיכרון �ו למנוע משירותי� לה�ט �ת המחשב שלך.",
   "settings.app.inactivityLockInfo": "דקות חוסר פעילות של�חריהן Ferdium �מור להינעל �וטומטית. 0 כדי להשבית",
+  "settings.app.infoOpenCertificatesFolder": "כדי להתקין �ישור, יש ללחוץ על הכפתור שלהלן כדי לפתוח �ת תיקיית ה�ישורי� ולהעתיק �ותו לתיקייה. ל�חר מכן �פשר לרענן �ת השירות (CTRL/CMD + R). כדי להסיר (לחלוטין), �פשר פשוט למחוק �ת קובץ ה�ישור ולהפעיל �ת Ferdium מחדש.",
+  "settings.app.lockInfo": "נעילה בסיסמה מ�פשרת לך להגן על ההתכתבויות שלך.\nהשימוש בנעילה בסיסמה י�לץ �ותך להקליד �ת הסיסמה שלך ע� כל הפעלה �ו נעילה של Ferdium ב�מצעות סמל המנעול בפינה הימנית התחתונה �ו בעזרת קיצור המקלדת {lockShortcut}.",
   "settings.app.lockedPassword": "סיסמה",
   "settings.app.lockedPasswordInfo": "נ� לווד� שהגדרת סיסמה שקל לך לזכור.\n�יבוד הסיסמה הז�ת י�לץ �ותך להתקין �ת Ferdium מחדש.",
   "settings.app.overallTheme": "ערכת עיצוב כללית",
@@ -294,6 +301,8 @@
   "settings.app.sectionUpdates": "הגדרות עדכוני יישו�",
   "settings.app.sentryInfo": "שליחת נתוני� טלמטריי� מ�פשרות לנו למצו� שגי�ות ב־Ferdium - �נו ל� נשלח מידע פרטי כגון תוכן ההודעות שלך!",
   "settings.app.serverHelp": "יש חיבור לשרת ב־{serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "השירותי� שלך עדכניי�",
+  "settings.app.spellCheckerLanguageInfo": "ב־Ferdium נעשה שימוש בבודק ה�יות המובנה של Mac כדי לבדוק שגי�ות הקלדה. כדי לשנות �ת שפות הבדיקה של בודק ה�יות ניתן לעשות ז�ת בהגדרות המערכת של ה־Mac.",
   "settings.app.subheadlineCache": "זיכרון מטמון",
   "settings.app.subheadlineFerdiumProfile": "פרופיל Ferdium",
   "settings.app.todoServerInfo": "השרת הזה ישמש לספק �ת היכולת „משימות Ferdium�.",
@@ -302,6 +311,7 @@
   "settings.app.updateStatusAvailable": "יש עדכון, מתבצעת הורדה…",
   "settings.app.updateStatusSearching": "מתבצע חיפוש �חר עדכוני�…",
   "settings.app.updateStatusUpToDate": "זו הגרסה העדכנית ביותר של Ferdium",
+  "settings.app.warningSelfSignedCertificates": "�זהרה: יש להפעיל �ת היכולת הז�ת רק �� ברור לך לחלוטין מה הי� עושה. הפעלתה מהווה סיכון �בטחת מידע והי� מיועדת למטרות בדיקה בלבד.",
   "settings.invite.headline": "להזמין חברי�",
   "settings.navigation.account": "חשבון",
   "settings.navigation.availableServices": "שירותי� זמיני�",
@@ -324,6 +334,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": "חזרה לשירותי�",
diff --git a/src/i18n/locales/lv.json b/src/i18n/locales/lv.json
index 9713bbb0f..9c041b4f8 100644
--- a/src/i18n/locales/lv.json
+++ b/src/i18n/locales/lv.json
@@ -16,6 +16,7 @@
   "feature.publishDebugInfo.info": "Dalīšan�s ar atkļūdošanas inform�ciju palīdz mums atrast Ferdium nepilnības un kļūmes. Daloties ar atkļūdošanas inform�ciju tiek pieņemti Ferdium atkļūdot�ja priv�tuma nosacījumi un pakalpojuma noteikumi",
   "feature.publishDebugInfo.privacy": "Priv�tuma nosacījumi",
   "feature.publishDebugInfo.publish": "Apstiprin�t un publicēt",
+  "feature.publishDebugInfo.published": "Atkļūdošanas žurn�ls tika padarīts pieejams un tagad ir atrodams",
   "feature.publishDebugInfo.terms": "Pakalpojuma izmantošanas noteikumi",
   "feature.publishDebugInfo.title": "Dalīties ar atkļūdošanas inform�ciju",
   "feature.quickSwitch.info": "Pakalpojumu var izvēlēties ar TAB, ↑ un ↓. Pakalpojumu var atvērt ar ENTER.",
@@ -62,10 +63,10 @@
   "locked.submit.label": "AtbloÄ·Ä“t",
   "locked.touchId": "AtbloÄ·Ä“t ar Touch ID",
   "locked.unlockWithPassword": "AtbloÄ·Ä“t ar Paroli",
-  "login.changeServer": "Maini Å¡eit!",
-  "login.changeServerMessage": "Tu izmanto {serverNameParse} serveri. Vai vēlies to mainīt?",
+  "login.changeServer": "Nomainīt",
+  "login.changeServerMessage": "Tiek izmantots {serverNameParse} serveris. Vai p�rslēgties uz citu?",
   "login.customServerQuestion": "Izmanto piel�gotu Ferdium serveri?",
-  "login.customServerSuggestion": "MÄ“Ä£ini ievietot savu Franz kontu!",
+  "login.customServerSuggestion": "MÄ“Ä£ini ievietot savu Franz kontu",
   "login.email.label": "E-pasta adrese",
   "login.headline": "Pieteikties",
   "login.invalidCredentials": "E-pasta adrese vai parole ir nederīga",
@@ -123,6 +124,7 @@
   "menu.view.back": "Atpakaļ",
   "menu.view.forward": "Uz priekšu",
   "menu.view.lockFerdium": "Aizslēgt Ferdium",
+  "menu.view.openProcessManager": "Atvērt procesu p�rvaldnieku",
   "menu.view.openQuickSwitch": "Atvērt �tro p�rslēgšanos",
   "menu.view.reloadFerdium": "P�rl�dēt Ferdium",
   "menu.view.reloadService": "P�rl�dēt Pakalpojumu",
@@ -166,7 +168,7 @@
   "services.getStarted": "S�ksim",
   "services.login": "LÅ«gums pieteikties, lai izmantotu Ferdium.",
   "services.serverInfo": "Pēc izvēles ir iespējams mainīt Ferdium serveri, klikšķinot uz zobrata apakšēj� kreisaj� stūrī. Ja p�rej (no k�da no izvietotajiem serveriem) uz Ferdium bez konta, lūgums ņemt vēr�, ka ir iespējams izgūt savus datus no t� servera un pēc tam tos ievietot pašreizēj�, izmantojot palīdzības izvēlni, lai atjaunotu visas savas darbvietas un pievienotos pakalpojumus.",
-  "services.serverless": "Izmantot Ferdium bez Konta",
+  "services.serverless": "Izmantot Ferdium bez konta",
   "settings.account.account.editButton": "Labot kontu",
   "settings.account.accountUnavailable": "Konts nav pieejams",
   "settings.account.accountUnavailableInfo": "Ferdium tiek izmantots bez konta. Ja ir vēlēšan�s izmantot Ferdium ar kontu un sinhronizēt savus pakalpojumus daž�d�s iek�rt�s, lūgums atlasīt serveri iestatījumu cilnē un tad pieteikties.",
@@ -187,6 +189,7 @@
   "settings.account.yourLicense": "Tava Ferdium licence:",
   "settings.app.accentColorInfo": "Sava kr�sas izvēle ir j�ieraksta CSS saderīg� veid�. (Noklusējums: {defaultAccentColor} vai notīrīts ievades lauks)",
   "settings.app.buttonInstallUpdate": "P�rs�knēt un uzst�dīt atjaunin�jumu",
+  "settings.app.buttonOpenFerdiumCertsFolder": "Atvērt sertifik�tu mapi",
   "settings.app.buttonOpenFerdiumProfileFolder": "Par�dīt profila mapi",
   "settings.app.buttonOpenFerdiumServiceRecipesFolder": "Atvērt Pakalpojumu Recepšu mapi",
   "settings.app.buttonOpenImportExport": "Ievietot / Izgūt",
@@ -220,6 +223,7 @@
   "settings.app.form.grayscaleServicesDim": "Pelēktoņu aptumšošanas līmenis",
   "settings.app.form.hibernateOnStartup": "Paturēt pakalpojumus hibern�cijas režīm�, startējot",
   "settings.app.form.hibernationStrategy": "Hibern�cijas stratēģija",
+  "settings.app.form.hideAllServicesWorkspace": "Paslēpt \"Visi pakalpojumi\" darbvietu",
   "settings.app.form.hideCollapseButton": "Paslēpt sakļaušanas pogu",
   "settings.app.form.hideDownloadButton": "Paslēpt lejupiel�žu pogu",
   "settings.app.form.hideNotificationsButton": "Paslēpt paziņojumu un skaņu pogu",
@@ -261,6 +265,7 @@
   "settings.app.form.universalDarkMode": "Iespējot visp�rējo tumšo izskatu",
   "settings.app.form.useGrayscaleServices": "Izmantot pelēktoņu pakalpojumu ikonas",
   "settings.app.form.useHorizontalStyle": "Lietot horizont�lu stilu",
+  "settings.app.form.useSelfSignedCertificates": "Iespējot pašparakstītus sertifik�tus",
   "settings.app.form.useTouchIdToUnlock": "Atļ�ut izmantot Touch ID, lai atbloķētu Ferdium",
   "settings.app.form.wakeUpHibernationSplay": "Uzr�dīt hibern�cija/mošan�s ciklus, lai samazin�tu noslogojumu",
   "settings.app.form.wakeUpHibernationStrategy": "Hibern�cijas stratēģija pēc autom�tiskas pamošan�s",
@@ -275,6 +280,7 @@
   "settings.app.headlineUpdates": "Atjaunin�jumi",
   "settings.app.hibernateInfo": "Pēc noklusējuma Ferdium paturēs visus pakalpojumus atvērtus un iel�dētus fon�, lai tie būtu gatavi, kad ir vajadzība tos izmantot. Pakalpojuma hibern�cija izslēgs pakalpojumus pēc noteikta laika. Tas ir noderīgi, lai ietaupītu RAM vai atturētu pakalpojumus no datora pelēnin�šanas.",
   "settings.app.inactivityLockInfo": "Neaktīvo minūšu skaits, pēc kur�m Ferdium autom�tiski aizslēgsies. Izmanto 0, lai atslēgtu",
+  "settings.app.lockInfo": "Aizslēgšana ar paroli ļauj aizsarg�t ziņojumus.\nAr aizslēgšanu ar paroli tiks vaic�ts ievadīt paroli katru reizi, kad Ferdium tiek s�knēts vai pašrocīgi aizslēgts ar slēdzenes zīmi apakšēj� kreisaj� stūrī vai saīsni {lockShortcut}.",
   "settings.app.lockedPassword": "Parole",
   "settings.app.lockedPasswordInfo": "Lūdzu, p�rliecinies, ka ievadi paroli, kuru atcerēsies.\nJa tu pazaudēsi šo paroli, tev vajadzēs p�rinstalēt Ferdium.",
   "settings.app.overallTheme": "Visp�rēj� Tēma",
@@ -294,6 +300,8 @@
   "settings.app.sectionUpdates": "Aplik�cijas Atjaunin�jumu Iestatījumi",
   "settings.app.sentryInfo": "Izmantošanas p�rskata nosūtīšana ļauj atrast kļūdas Ferdium. Netiks sūtīta nek�da personīga inform�cija, piemēram, ziņojumu saturs.",
   "settings.app.serverHelp": "Savienojies ar serveri {serverURL}",
+  "settings.app.servicesUpdateStatusUpToDate": "Pakalpojumi ir atjaunin�ti",
+  "settings.app.spellCheckerLanguageInfo": "Ferdium izmanto Mac iebūvēto pareizrakstības p�rbaudīt�ju, lai meklētu drukas kļūmes. Ja ir vēlme mainīt pareizrakstības p�rbaudīt�ja izmantoto valodu, to var izdarīt Mac sistēmas uzst�dījumos.",
   "settings.app.subheadlineCache": "Kešatmiņa",
   "settings.app.subheadlineFerdiumProfile": "Ferdium Profils",
   "settings.app.todoServerInfo": "Šis serveris tiks izmantots \"Ferdium dar�mais\" iespējai.",
@@ -314,9 +322,9 @@
   "settings.recipes.all": "Visi pakalpojumi",
   "settings.recipes.custom": "Piel�gotie Pakalpojumi",
   "settings.recipes.customService.headline.communityRecipes": "Kopienas Trešo Pušu Receptes",
-  "settings.recipes.customService.headline.customRecipes": "Piel�got�s Trešo Pušu Receptes",
+  "settings.recipes.customService.headline.customRecipes": "Piel�gotas trešo pušu receptes",
   "settings.recipes.customService.headline.devRecipes": "Manas izstr�des pakalpojumu receptes",
-  "settings.recipes.customService.intro": "Lai pievienotu piel�gotu pakalpojumu, kopē pakalpojuma receptes mapi iekš�:",
+  "settings.recipes.customService.intro": "Lai pievienotu piel�gotu pakalpojumu, pakalpojuma receptes mape j�iekopē:",
   "settings.recipes.customService.openDevDocs": "Izstr�d�t�ja rokasgr�mata",
   "settings.recipes.customService.openFolder": "Atvērt mapi",
   "settings.recipes.ferdiumPicks": "Ferdium Izvēle",
@@ -324,6 +332,8 @@
   "settings.recipes.missingService": "Trūkst pakalpojuma?",
   "settings.recipes.nothingFound": "Atvaino, bet neviens pakalpojums neatbilst meklēšanas nosacījumiem, bet to joproj�m ir iespējams pievienot ar \"Piel�gota tīmekļa vietne\" iespēju. Lūgums ņemt vēr�, ka tīmekļa vietne var uzr�dīt vair�k pakalpojumu, kas tika pievienoti Ferdium kopš pašreiz izmantot�s versijas. Lai iegūtu jaunos pakalpojumus, lūgums apsvērt atjaunot uz jaun�ku Ferdium versiju.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Pakalpojums veiksmīgi pievienots",
+  "settings.releasenotes.connectionError": "Atgadīj�s kļūme savienojoties ar Github, lūgums vēl�k mēģin�t vēlreiz.",
+  "settings.releasenotes.connectionErrorPageMissing": "Atgadīj�s kļūme savienojoties ar Github. Meklēt� lapa nav atrodama.",
   "settings.releasenotes.headline": "Inform�cija par laidienu",
   "settings.searchService": "Meklēt pakalpojumu",
   "settings.service.error.goBack": "Atpakaļ uz pakalpojumiem",
@@ -373,7 +383,7 @@
   "settings.service.form.proxy.password": "Parole (neoblig�ta)",
   "settings.service.form.proxy.port": "Ports",
   "settings.service.form.proxy.restartInfo": "Lūgums p�rs�knēt Ferdium pēc starpniekservera iestatījumu izmainīšanas.",
-  "settings.service.form.proxy.user": "Lietot�js (neoblig�ts)",
+  "settings.service.form.proxy.user": "Lietot�js (izvēles)",
   "settings.service.form.recipeFileInfo": "Lietot�ja datnes tiks ievietotas tīmekļa lap�, lai varētu piel�got pakalpojumus pēc saviem ieskatiem. Lietot�ja datnes tiek glab�tas tikai vietēji un netiek nosūtītas uz citiem datoriem, kuros tiek izmantots tas pats konts.",
   "settings.service.form.saveButton": "Saglab�t pakalpojumu",
   "settings.service.form.tabHosted": "Izvietots",
@@ -471,8 +481,8 @@
   "tabs.item.wakeUpService": "Pamodin�t pakalpojumu",
   "validation.email": "{field} nav derīgs",
   "validation.minLength": "{field} ir j�būt vismaz {length} simboliem garam",
-  "validation.oneRequired": "Vismaz viens ir oblig�ts",
-  "validation.required": "{field} ir oblig�ts",
+  "validation.oneRequired": "Ir nepieciešams vismaz viens",
+  "validation.required": "{field} ir j�nor�da",
   "validation.url": "{field} nav derīgs URL",
   "webControls.back": "Atpakaļ",
   "webControls.forward": "Uz priekšu",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 9976af270..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": "Дей�тви� по�ле автоматиче�кого про�ыпани�",
@@ -256,17 +259,30 @@
   "settings.app.headlineUpdates": "Обновлени�",
   "settings.app.hibernateInfo": "По умолчанию, Ferdium о�тавит в�е ваши �ерви�ы открытыми и загружеными в фоновом режиме, чтобы они были готовы к и�пользованию. Сп�щий режим выгрузит ваши �ерви�ы по�ле заданного количе�тва минут. Это полезно дл� �кономии пам�ти и/или оптимальной работы компьютера.",
   "settings.app.inactivityLockInfo": "минут бездей�тви�, по�ле чего Ferdium будет автоматиче�ки блокировать��. И�пользуйте 0, чтобы отключить",
+  "settings.app.infoOpenCertificatesFolder": "Чтобы у�тановить �ертификат, нажмите на кнопку ниже, чтобы открыть папку �ертификатов и �копировать его в папку. По�ле �того вы можете обновить �лужбу (CTRL/CMD + R). Дл� удалени� про�то удалите файл �ертификата и перезапу�тите Ferdium.",
   "settings.app.lockedPassword": "Пароль",
   "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": "�а�тройки значков �ерви�а",
+  "settings.app.sectionSidebarSettings": "�а�тройки боковой панели",
   "settings.app.sectionUpdates": "�а�тройки обновлени� приложени�",
   "settings.app.sentryInfo": "Отправка телеметрии позвол�ет нам находить ошибки в Ferdium - мы не будем отправл�ть никакой личной информации, включа� ваши �ообщени�!",
   "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 на ваш �зык.",
@@ -296,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": "Вернуть�� к �ерви�ам",
@@ -317,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": "Общие",
@@ -401,6 +420,7 @@
   "setupAssistant.headline": "Давайте начнем",
   "setupAssistant.subheadline": "Сделайте �вой выбор �реди наиболее попул�рных �ерви�ов и возвращайте�ь к �воим �ообщени�м пр�мо �ейча�.",
   "setupAssistant.submit.label": "�ачнем",
+  "sidebar.addNewService": "Добавить новый �ерви�",
   "sidebar.muteApp": "Отключить уведомлени� и звук",
   "sidebar.unmuteApp": "Включить уведомлени� и звук",
   "signup.company.label": "Компани�",
@@ -432,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 999d84348..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'));
@@ -610,6 +623,11 @@ ipcMain.on('feature-basic-auth-cancel', () => {
   authCallback = noop;
 });
 
+ipcMain.on('load-available-displays', (_e, data) => {
+  debug('MAIN PROCESS: Received load-desktop-capturer-sources');
+  mainWindow?.webContents.send(`select-capture-device:${data.serviceId}`, data);
+});
+
 // Handle synchronous messages from service webviews.
 
 ipcMain.on('find-in-page', (e, text, options) => {
@@ -777,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/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index 8e8aa97a8..4e3c63515 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -53,6 +53,7 @@ class ServiceController {
         isNotificationEnabled: DEFAULT_SERVICE_SETTINGS.isNotificationEnabled,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
         trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
+        useFavicon: DEFAULT_SERVICE_SETTINGS.useFavicon,
         isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         isProgressbarEnabled: DEFAULT_SERVICE_SETTINGS.isProgressbarEnabled,
@@ -83,6 +84,7 @@ class ServiceController {
         hasCustomIcon: DEFAULT_SERVICE_SETTINGS.hasCustomIcon,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
         trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
+        useFavicon: DEFAULT_SERVICE_SETTINGS.useFavicon,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         isProgressbarEnabled: DEFAULT_SERVICE_SETTINGS.isProgressbarEnabled,
         isEnabled: DEFAULT_SERVICE_SETTINGS.isEnabled,
@@ -232,6 +234,7 @@ class ServiceController {
         hasCustomIcon: DEFAULT_SERVICE_SETTINGS.customIcon,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
         trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
+        useFavicon: DEFAULT_SERVICE_SETTINGS.useFavicon,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         isProgressbarEnabled: DEFAULT_SERVICE_SETTINGS.isProgressbarEnabled,
         isEnabled: DEFAULT_SERVICE_SETTINGS.isEnabled,
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 6d19f44f1..ae04b8b58 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -7,7 +7,9 @@ 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';
 import { ifUndefined } from '../jsUtils';
 import type { IRecipe } from './Recipe';
@@ -134,6 +136,8 @@ export default class Service {
 
   @observable isMediaPlaying: boolean = false;
 
+  @observable useFavicon: boolean = DEFAULT_SERVICE_SETTINGS.useFavicon;
+
   @action _setAutoRun() {
     if (!this.isEnabled) {
       this.webview = null;
@@ -167,6 +171,7 @@ export default class Service {
     this.team = ifUndefined<string>(data.team, this.team);
     this.customUrl = ifUndefined<string>(data.customUrl, this.customUrl);
     this.iconUrl = ifUndefined<string>(data.iconUrl, this.iconUrl);
+    this.useFavicon = ifUndefined<boolean>(data.useFavicon, this.useFavicon);
     this.order = ifUndefined<number>(data.order, this.order);
     this.isEnabled = ifUndefined<boolean>(data.isEnabled, this.isEnabled);
     this.isNotificationEnabled = ifUndefined<boolean>(
@@ -350,6 +355,10 @@ export default class Service {
   }
 
   @computed get icon(): string {
+    if (this.useFavicon) {
+      return getFaviconUrl(this.url);
+    }
+
     if (this.iconUrl) {
       if (needsToken()) {
         let url: URL;
@@ -369,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');
   }
 
@@ -524,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 6c7a55d6b..58c6b2a87 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -472,6 +472,7 @@ export default class ServicesStore extends TypedStore {
       isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
       isMediaBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isMediaBadgeEnabled,
       trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
+      useFavicon: DEFAULT_SERVICE_SETTINGS.useFavicon,
       isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
       customIcon: DEFAULT_SERVICE_SETTINGS.customIcon,
       isDarkModeEnabled: DEFAULT_SERVICE_SETTINGS.isDarkModeEnabled,
@@ -838,6 +839,16 @@ export default class ServicesStore extends TypedStore {
 
         break;
       }
+
+      case 'load-available-displays': {
+        debug('Received request for capture devices from', serviceId);
+        ipcRenderer.send('load-available-displays', {
+          serviceId,
+          ...args[0],
+        });
+        break;
+      }
+
       case 'notification': {
         const { notificationId, options } = args[0];
 
@@ -906,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/styles/capture-sources.scss b/src/styles/capture-sources.scss
new file mode 100644
index 000000000..c9ee69f09
--- /dev/null
+++ b/src/styles/capture-sources.scss
@@ -0,0 +1,75 @@
+.desktop-capturer-selection {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100vh;
+  background: rgba(30, 30, 30, 0.75);
+  color: #fff;
+  z-index: 10000000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.desktop-capturer-selection__scroller {
+  width: 100%;
+  max-height: 100vh;
+  overflow-y: auto;
+}
+.desktop-capturer-selection__list {
+  max-width: calc(100% - 100px);
+  margin: 50px;
+  padding: 0;
+  display: flex;
+  flex-wrap: wrap;
+  list-style: none;
+  overflow: hidden;
+  justify-content: center;
+}
+.desktop-capturer-selection__item {
+  display: flex;
+  margin: 4px;
+}
+.desktop-capturer-selection__btn {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  width: 145px;
+  margin: 0;
+  border: 0;
+  border-radius: 3px;
+  padding: 4px;
+  background: #252626;
+  text-align: left;
+  @media (prefers-reduced-motion: no-preference) {
+    transition:
+      background-color 0.15s,
+      box-shadow 0.15s,
+      color 0.15s;
+  }
+  color: #dedede;
+}
+.desktop-capturer-selection__btn:hover,
+.desktop-capturer-selection__btn:focus {
+  background: rgba(98, 100, 167, 0.8);
+  box-shadow:
+    0 0 4px rgba(0, 0, 0, 0.45),
+    0 0 2px rgba(0, 0, 0, 0.25);
+  color: #fff;
+}
+.desktop-capturer-selection__thumbnail {
+  width: 100%;
+  height: 81px;
+  object-fit: cover;
+}
+.desktop-capturer-selection__name {
+  margin: 6px 0;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  text-align: center;
+  overflow: hidden;
+}
+.desktop-capturer-selection__name--cancel {
+  margin: auto 0;
+}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 8369c9298..fafb1b861 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -23,6 +23,7 @@
 @import './invite.scss';
 @import './title-bar.scss';
 @import './features.scss';
+@import './capture-sources.scss';
 
 // form
 @import './input.scss';
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 d6db39779..ad2215ffd 100644
--- a/src/webview/recipe.ts
+++ b/src/webview/recipe.ts
@@ -32,11 +32,7 @@ import {
   NotificationsHandler,
   notificationsClassDefinition,
 } from './notifications';
-import {
-  getDisplayMediaSelector,
-  screenShareCss,
-  screenShareJs,
-} from './screenshare';
+import { getDisplayMediaSelector, screenShareJs } from './screenshare';
 import SessionHandler from './sessionHandler';
 import {
   getSpellcheckerLocaleByFuzzyIdentifier,
@@ -125,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.
@@ -267,7 +263,6 @@ class RecipeController {
 
   async loadUserFiles(recipe, config) {
     const styles = document.createElement('style');
-    styles.innerHTML = screenShareCss;
 
     const userCss = join(recipe.path, 'user.css');
     if (pathExistsSync(userCss)) {
diff --git a/src/webview/screenshare.ts b/src/webview/screenshare.ts
index e631ce52f..521f95bd6 100644
--- a/src/webview/screenshare.ts
+++ b/src/webview/screenshare.ts
@@ -1,139 +1,41 @@
 import { ipcRenderer } from 'electron';
+import { v4 as uuidV4 } from 'uuid';
 
-const CANCEL_ID = 'desktop-capturer-selection__cancel';
+const debug = require('../preload-safe-debug')('Ferdium:Screenshare');
 
 export async function getDisplayMediaSelector() {
-  const sources = await ipcRenderer.invoke('get-desktop-capturer-sources');
-  return `<div class="desktop-capturer-selection__scroller">
-  <ul class="desktop-capturer-selection__list">
-    ${sources
-      .map(
-        ({ id, name, thumbnail }) => `
-      <li class="desktop-capturer-selection__item">
-        <button class="desktop-capturer-selection__btn" data-id="${id}" title="${name}">
-          <img class="desktop-capturer-selection__thumbnail" src="${thumbnail.toDataURL()}" />
-          <span class="desktop-capturer-selection__name">${name}</span>
-        </button>
-      </li>
-    `,
-      )
-      .join('')}
-    <li class="desktop-capturer-selection__item">
-      <button class="desktop-capturer-selection__btn" data-id="${CANCEL_ID}" title="Cancel">
-        <span class="desktop-capturer-selection__name desktop-capturer-selection__name--cancel">Cancel</span>
-      </button>
-    </li>
-  </ul>
-</div>`;
-}
+  return new Promise((resolve, reject) => {
+    const trackerId = uuidV4();
+    debug('New screenshare request', trackerId);
 
-export const screenShareCss = `
-.desktop-capturer-selection {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100vh;
-  background: rgba(30,30,30,.75);
-  color: #fff;
-  z-index: 10000000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.desktop-capturer-selection__scroller {
-  width: 100%;
-  max-height: 100vh;
-  overflow-y: auto;
-}
-.desktop-capturer-selection__list {
-  max-width: calc(100% - 100px);
-  margin: 50px;
-  padding: 0;
-  display: flex;
-  flex-wrap: wrap;
-  list-style: none;
-  overflow: hidden;
-  justify-content: center;
-}
-.desktop-capturer-selection__item {
-  display: flex;
-  margin: 4px;
-}
-.desktop-capturer-selection__btn {
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  width: 145px;
-  margin: 0;
-  border: 0;
-  border-radius: 3px;
-  padding: 4px;
-  background: #252626;
-  text-align: left;
-  @media (prefers-reduced-motion: no-preference) {
-    transition: background-color .15s, box-shadow .15s, color .15s;
-  }
-  color: #dedede;
-}
-.desktop-capturer-selection__btn:hover,
-.desktop-capturer-selection__btn:focus {
-  background: rgba(98,100,167,.8);
-  box-shadow: 0 0 4px rgba(0,0,0,0.45), 0 0 2px rgba(0,0,0,0.25);
-  color: #fff;
-}
-.desktop-capturer-selection__thumbnail {
-  width: 100%;
-  height: 81px;
-  object-fit: cover;
-}
-.desktop-capturer-selection__name {
-  margin: 6px 0;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: center;
-  overflow: hidden;
-}
-.desktop-capturer-selection__name--cancel {
-  margin: auto 0;
+    ipcRenderer.sendToHost('load-available-displays', {
+      trackerId,
+    });
+
+    ipcRenderer.once(`selected-media-source:${trackerId}`, (_e, data) => {
+      if (data.mediaSourceId === 'desktop-capturer-selection__cancel') {
+        return reject(new Error('Cancelled by user'));
+      }
+
+      return resolve(data.mediaSourceId);
+    });
+  });
 }
-`;
 
 export const screenShareJs = `
 window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve, reject) => {
   try {
-    const selectionElem = document.createElement('div');
-    selectionElem.classList = ['desktop-capturer-selection'];
-    selectionElem.innerHTML = await window.ferdium.getDisplayMediaSelector();
-    document.body.appendChild(selectionElem);
-
-    document
-      .querySelectorAll('.desktop-capturer-selection__btn')
-      .forEach((button) => {
-        button.addEventListener('click', async () => {
-          try {
-            const id = button.getAttribute('data-id');
-            if (id === '${CANCEL_ID}') {
-              reject(new Error('Cancelled by user'));
-            } else {
-              const stream = await window.navigator.mediaDevices.getUserMedia({
-                audio: false,
-                video: {
-                  mandatory: {
-                    chromeMediaSource: 'desktop',
-                    chromeMediaSourceId: id,
-                  },
-                },
-              });
-              resolve(stream);
-            }
-          } catch (err) {
-            reject(err);
-          } finally {
-            selectionElem.remove();
-          }
-        });
-      });
+    const displayId = await window.ferdium.getDisplayMediaSelector();
+    const stream = await window.navigator.mediaDevices.getUserMedia({
+      audio: false,
+      video: {
+        mandatory: {
+          chromeMediaSource: 'desktop',
+          chromeMediaSourceId: displayId,
+        },
+      },
+    });
+    resolve(stream);
   } catch (err) {
     reject(err);
   }
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('');
     });
   });