diff --git a/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx b/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
index ab8e885abb..fd3cd333d8 100644
--- a/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
@@ -13,7 +13,7 @@ import type { IAsyncComputed } from "@ogre-tools/injectable-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { Spinner } from "../../../../../renderer/components/spinner";
 import type { HelmRepo } from "../../../../../common/helm/helm-repo";
-import { RemovableItem } from "../../../../../renderer/components/+preferences/removable-item";
+import { RemovableItem } from "../../../../preferences/renderer/removable-item/removable-item";
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
 
 interface Dependencies {
diff --git a/src/features/preferences/closing-preferences.test.tsx b/src/features/preferences/closing-preferences.test.tsx
index 4d192200a0..971a2d5be6 100644
--- a/src/features/preferences/closing-preferences.test.tsx
+++ b/src/features/preferences/closing-preferences.test.tsx
@@ -19,8 +19,8 @@ import { createMemoryHistory } from "history";
 import { createObservableHistory } from "mobx-observable-history";
 import navigateToFrontPageInjectable from "../../common/front-end-routing/navigate-to-front-page.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
-import navigateToPreferenceTabInjectable from "../../renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
-import preferenceTabIsActiveInjectable from "../../renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "./renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "./renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
 import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token";
 
 describe("preferences - closing-preferences", () => {
diff --git a/src/renderer/components/+preferences/close-preferences.injectable.ts b/src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
similarity index 75%
rename from src/renderer/components/+preferences/close-preferences.injectable.ts
rename to src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
index b85c2ae52a..57860c2f28 100644
--- a/src/renderer/components/+preferences/close-preferences.injectable.ts
+++ b/src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import observableHistoryInjectable from "../../navigation/observable-history.injectable";
-import navigateToFrontPageInjectable from "../../../common/front-end-routing/navigate-to-front-page.injectable";
+import observableHistoryInjectable from "../../../../renderer/navigation/observable-history.injectable";
+import navigateToFrontPageInjectable from "../../../../common/front-end-routing/navigate-to-front-page.injectable";
 
 const closePreferencesInjectable = getInjectable({
   id: "close-preferences",
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
index dee7902077..6d0186aa8e 100644
--- a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
@@ -13,7 +13,7 @@ import { iter, tuple } from "../../../../../../renderer/utils";
 import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
 import { PathPicker } from "../../../../../../renderer/components/path-picker/path-picker";
 import { Spinner } from "../../../../../../renderer/components/spinner";
-import { RemovableItem } from "../../../../../../renderer/components/+preferences/removable-item";
+import { RemovableItem } from "../../../removable-item/removable-item";
 import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
 import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
 import loggerInjectable from "../../../../../../common/logger.injectable";
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts
new file mode 100644
index 0000000000..55a8d44fc2
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverride } from "../../../../../../../common/test-utils/get-global-override";
+import defaultShellInjectable from "./default-shell.injectable";
+
+export default getGlobalOverride(
+  defaultShellInjectable,
+  () => "some-default-shell",
+);
diff --git a/src/renderer/components/+preferences/default-shell.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
similarity index 86%
rename from src/renderer/components/+preferences/default-shell.injectable.ts
rename to src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
index a8d33fe627..3ca42fb7c9 100644
--- a/src/renderer/components/+preferences/default-shell.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import isWindowsInjectable from "../../../../../../../common/vars/is-windows.injectable";
 
 const defaultShellInjectable = getInjectable({
   id: "default-shell",
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx
index 76c9ed9338..5fe14ab9df 100644
--- a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx
@@ -9,7 +9,7 @@ import type { UserStore } from "../../../../../../common/user-store";
 import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
 import { observer } from "mobx-react";
 import { Input } from "../../../../../../renderer/components/input";
-import defaultShellInjectable from "../../../../../../renderer/components/+preferences/default-shell.injectable";
+import defaultShellInjectable from "./default-shell/default-shell.injectable";
 
 interface Dependencies {
   userStore: UserStore;
diff --git a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
similarity index 87%
rename from src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
rename to src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
index b477d797c6..f4e34267e8 100644
--- a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { navigateToRouteInjectionToken } from "../../../../../common/front-end-routing/navigate-to-route-injection-token";
-import preferencesRouteInjectable from "../../../../../features/preferences/common/preferences-route.injectable";
+import preferencesRouteInjectable from "../../../common/preferences-route.injectable";
 
 const navigateToPreferenceTabInjectable = getInjectable({
   id: "navigate-to-preference-tab-2",
diff --git a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
similarity index 74%
rename from src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
rename to src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
index ab44d91b33..75a8948a4c 100644
--- a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
+++ b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
@@ -4,9 +4,9 @@
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import routeIsActiveInjectable from "../../../../routes/route-is-active.injectable";
-import preferencesRouteInjectable from "../../../../../features/preferences/common/preferences-route.injectable";
-import routePathParametersInjectable from "../../../../routes/route-path-parameters.injectable";
+import routeIsActiveInjectable from "../../../../../renderer/routes/route-is-active.injectable";
+import preferencesRouteInjectable from "../../../common/preferences-route.injectable";
+import routePathParametersInjectable from "../../../../../renderer/routes/route-path-parameters.injectable";
 
 const preferenceTabIsActiveInjectable = getInjectable({
   id: "preference-tab-is-active",
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
index 09e033f55d..23b908b50d 100644
--- a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { Tab } from "../../../../renderer/components/tabs";
-import navigateToPreferenceTabInjectable from "../../../../renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { observer } from "mobx-react";
 import type { PreferenceTab } from "../preference-items/preference-item-injection-token";
 import type { IComputedValue } from "mobx";
-import preferenceTabIsActiveInjectable from "../../../../renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
+import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
 import React from "react";
 
 interface Dependencies {
diff --git a/src/renderer/components/+preferences/preferences.scss b/src/features/preferences/renderer/preferences.scss
similarity index 100%
rename from src/renderer/components/+preferences/preferences.scss
rename to src/features/preferences/renderer/preferences.scss
diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx
index 136e1f1bac..5e4e03e0dd 100644
--- a/src/features/preferences/renderer/preferences.tsx
+++ b/src/features/preferences/renderer/preferences.tsx
@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import "../../../renderer/components/+preferences/preferences.scss";
+import "./preferences.scss";
 import React from "react";
 
 import { SettingLayout } from "../../../renderer/components/layout/setting-layout";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import closePreferencesInjectable from "../../../renderer/components/+preferences/close-preferences.injectable";
+import closePreferencesInjectable from "./close-preferences/close-preferences.injectable";
 import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable";
 import type { Composite } from "../../application-menu/main/menu-items/get-composite/get-composite";
 import type { PreferenceTypes, PreferenceTab } from "./preference-items/preference-item-injection-token";
diff --git a/src/renderer/components/+preferences/removable-item.module.scss b/src/features/preferences/renderer/removable-item/removable-item.module.scss
similarity index 100%
rename from src/renderer/components/+preferences/removable-item.module.scss
rename to src/features/preferences/renderer/removable-item/removable-item.module.scss
diff --git a/src/renderer/components/+preferences/removable-item.tsx b/src/features/preferences/renderer/removable-item/removable-item.tsx
similarity index 88%
rename from src/renderer/components/+preferences/removable-item.tsx
rename to src/features/preferences/renderer/removable-item/removable-item.tsx
index 328ec7b5ad..ee04f9d76c 100644
--- a/src/renderer/components/+preferences/removable-item.tsx
+++ b/src/features/preferences/renderer/removable-item/removable-item.tsx
@@ -7,8 +7,8 @@ import styles from "./removable-item.module.scss";
 import type { DOMAttributes } from "react";
 import React from "react";
 
-import { cssNames } from "../../utils";
-import { Icon } from "../icon";
+import { cssNames } from "../../../../renderer/utils";
+import { Icon } from "../../../../renderer/components/icon";
 
 export interface RemovableItemProps extends DOMAttributes<any>{
   icon?: string;
diff --git a/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts
index 5628f9bfea..26bcd3c021 100644
--- a/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
 import { computed } from "mobx";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
 
 const applicationPreferencesNavigationItemInjectable = getInjectable({
   id: "application-preferences-navigation-item",
diff --git a/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts
index 34b04550dc..ffcdff7257 100644
--- a/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
 import { computed } from "mobx";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
 
 const editorPreferencesNavigationItemInjectable = getInjectable({
   id: "editor-preferences-navigation-item",
diff --git a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
index eda0735dc7..27d0a634b8 100644
--- a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
 import { computed } from "mobx";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
 
 const kubernetesPreferencesNavigationItemInjectable = getInjectable({
   id: "kubernetes-preferences-navigation-item",
diff --git a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
index 8340a5b7e4..1f2ddcea9a 100644
--- a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
 import { computed } from "mobx";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
 
 const proxyPreferencesNavigationItemInjectable = getInjectable({
   id: "proxy-preferences-navigation-item",
diff --git a/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
index e4737ef77d..f4218efa78 100644
--- a/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
@@ -7,8 +7,8 @@ import { preferenceNavigationItemInjectionToken } from "./preference-navigation-
 import { computed } from "mobx";
 import telemetryPreferenceItemsInjectable from "../telemetry-preference-items.injectable";
 import sentryDataSourceNameInjectable from "../../../../common/vars/sentry-dsn-url.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
 
 const terminalPreferencesNavigationItemInjectable = getInjectable({
   id: "telemetry-preferences-navigation-item",
diff --git a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
index 2b3ba77113..d66a5e085a 100644
--- a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
 import { computed } from "mobx";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
-import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import navigateToPreferenceTabInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import preferenceTabIsActiveInjectable from "../../../../features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable";
 
 const terminalPreferencesNavigationItemInjectable = getInjectable({
   id: "terminal-preferences-navigation-item",
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index f97a78c4d2..8264957dad 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -27,7 +27,6 @@ import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.inject
 import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable";
 import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable";
 import { observable, computed, runInAction } from "mobx";
-import defaultShellInjectable from "./components/+preferences/default-shell.injectable";
 import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
 import getFilePathsInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable";
@@ -96,6 +95,7 @@ export const getDiForUnitTesting = (
     [
       startTopbarStateSyncInjectable,
       setupSystemCaInjectable,
+      setupOnApiErrorListenersInjectable
     ].forEach((injectable) => {
       di.override(injectable, () => ({
         id: injectable.id,