diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png
index dc4e3df218ad765fa0fa95e761b317e924e49755..0f3a4799e2d23fdbd4687a4f69ca7e8782e39191 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png
index 743dfab446179342230d037db28decc215420a12..58c44784a1ca194f2fcba7c0bd82eb0c83670768 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png
index b11bd064aac544187aed626877a278f9ca3198e7..e744a892d65ec31125862b1f792e8d8eedeb680b 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png
index 4f3a11ef166882d26f3f4670c72fd0943beb9e33..2e18a7006d634027c57436197f26958816dd79a4 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png
index 994e5cd4cdc012bdc4c708fd6d4c64a52d32504f..e7e22f634cda2869a9fe45a85565a16978fb36d5 100644
Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/playwright.config.js b/packages/desktop-client/playwright.config.js
index 1bf7e2cf40af7d693867c8b0e94487199db383a6..fbb415beb04c99fd95eab39f2072cd3bdf5928a5 100644
--- a/packages/desktop-client/playwright.config.js
+++ b/packages/desktop-client/playwright.config.js
@@ -18,7 +18,7 @@ expect.extend({
     };
 
     // Check lightmode
-    await locator.evaluate(() => window.Actual.setTheme('light'));
+    await locator.evaluate(() => window.Actual.setTheme('auto'));
     const lightmode = await expect(locator).toHaveScreenshot(config);
 
     if (lightmode && !lightmode.pass) {
@@ -44,7 +44,7 @@ expect.extend({
     }
 
     // Switch back to lightmode
-    await locator.evaluate(() => window.Actual.setTheme('light'));
+    await locator.evaluate(() => window.Actual.setTheme('auto'));
     return {
       message: () => 'pass',
       pass: true,
diff --git a/packages/desktop-client/src/style/theme.tsx b/packages/desktop-client/src/style/theme.tsx
index 09e17c481738741da57a52a7f98184d0f0e9da93..ad29777e4304869e7c2e55f4df2b086184af472d 100644
--- a/packages/desktop-client/src/style/theme.tsx
+++ b/packages/desktop-client/src/style/theme.tsx
@@ -31,7 +31,7 @@ export const darkThemeOptions = Object.entries({
 }).map(([key, { name }]) => [key, name] as [DarkTheme, string]);
 
 export function useTheme() {
-  const [theme = 'light', setThemePref] = useGlobalPref('theme');
+  const [theme = 'auto', setThemePref] = useGlobalPref('theme');
   return [theme, setThemePref] as const;
 }
 
diff --git a/upcoming-release-notes/3513.md b/upcoming-release-notes/3513.md
new file mode 100644
index 0000000000000000000000000000000000000000..588f052d13b212a5872c2e6c29980bc4c36c4c9c
--- /dev/null
+++ b/upcoming-release-notes/3513.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+e2e: improve settings test stability.