diff --git a/frontend/src/components/editor-page/app-bar/app-bar.tsx b/frontend/src/components/editor-page/app-bar/app-bar.tsx
index f00c60aad..491943c61 100644
--- a/frontend/src/components/editor-page/app-bar/app-bar.tsx
+++ b/frontend/src/components/editor-page/app-bar/app-bar.tsx
@@ -8,9 +8,9 @@ import { useOutlineButtonVariant } from '../../../hooks/dark-mode/use-outline-bu
 import { CheatsheetButton } from '../../cheatsheet/cheatsheet-button'
 import { NewNoteButton } from '../../common/new-note-button/new-note-button'
 import { ShowIf } from '../../common/show-if/show-if'
+import { SettingsButton } from '../../global-dialogs/settings-dialog/settings-button'
 import { SignInButton } from '../../landing-layout/navigation/sign-in-button'
 import { UserDropdown } from '../../landing-layout/navigation/user-dropdown'
-import { SettingsButton } from '../../layout/settings-dialog/settings-button'
 import { HelpButton } from './help-button/help-button'
 import { NavbarBranding } from './navbar-branding'
 import { ReadOnlyModeButton } from './read-only-mode-button'
diff --git a/frontend/src/components/layout/settings-dialog/editor/editor-settings-tab-content.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx
similarity index 94%
rename from frontend/src/components/layout/settings-dialog/editor/editor-settings-tab-content.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx
index 3a6f7f079..f71430a45 100644
--- a/frontend/src/components/layout/settings-dialog/editor/editor-settings-tab-content.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/editor/ligature-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/ligature-setting-button-group.tsx
similarity index 90%
rename from frontend/src/components/layout/settings-dialog/editor/ligature-setting-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/editor/ligature-setting-button-group.tsx
index f5dd4ad28..8a28e097b 100644
--- a/frontend/src/components/layout/settings-dialog/editor/ligature-setting-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/editor/ligature-setting-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/editor/line-wrapping-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/line-wrapping-setting-button-group.tsx
similarity index 90%
rename from frontend/src/components/layout/settings-dialog/editor/line-wrapping-setting-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/editor/line-wrapping-setting-button-group.tsx
index f2cfbf621..416c424c1 100644
--- a/frontend/src/components/layout/settings-dialog/editor/line-wrapping-setting-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/editor/line-wrapping-setting-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/editor/smart-paste-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/smart-paste-setting-button-group.tsx
similarity index 90%
rename from frontend/src/components/layout/settings-dialog/editor/smart-paste-setting-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/editor/smart-paste-setting-button-group.tsx
index cb0ad8779..d54d7af61 100644
--- a/frontend/src/components/layout/settings-dialog/editor/smart-paste-setting-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/editor/smart-paste-setting-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/editor/sync-scroll-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/sync-scroll-setting-button-group.tsx
similarity index 90%
rename from frontend/src/components/layout/settings-dialog/editor/sync-scroll-setting-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/editor/sync-scroll-setting-button-group.tsx
index c2ac75db5..e68712530 100644
--- a/frontend/src/components/layout/settings-dialog/editor/sync-scroll-setting-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/editor/sync-scroll-setting-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/global/__snapshots__/language-picker.spec.tsx.snap b/frontend/src/components/global-dialogs/settings-dialog/global/__snapshots__/language-picker.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/global/__snapshots__/language-picker.spec.tsx.snap
rename to frontend/src/components/global-dialogs/settings-dialog/global/__snapshots__/language-picker.spec.tsx.snap
diff --git a/frontend/src/components/layout/settings-dialog/global/available-languages.ts b/frontend/src/components/global-dialogs/settings-dialog/global/available-languages.ts
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/global/available-languages.ts
rename to frontend/src/components/global-dialogs/settings-dialog/global/available-languages.ts
diff --git a/frontend/src/components/layout/settings-dialog/global/dark-mode-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/global/dark-mode-setting-button-group.tsx
similarity index 96%
rename from frontend/src/components/layout/settings-dialog/global/dark-mode-setting-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/global/dark-mode-setting-button-group.tsx
index 22f0e7fc8..63a992135 100644
--- a/frontend/src/components/layout/settings-dialog/global/dark-mode-setting-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/global/dark-mode-setting-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/global/global-settings-tab-content.tsx b/frontend/src/components/global-dialogs/settings-dialog/global/global-settings-tab-content.tsx
similarity index 91%
rename from frontend/src/components/layout/settings-dialog/global/global-settings-tab-content.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/global/global-settings-tab-content.tsx
index 6466fba4c..4dfa41b4e 100644
--- a/frontend/src/components/layout/settings-dialog/global/global-settings-tab-content.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/global/global-settings-tab-content.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/global/language-option.tsx b/frontend/src/components/global-dialogs/settings-dialog/global/language-option.tsx
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/global/language-option.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/global/language-option.tsx
diff --git a/frontend/src/components/layout/settings-dialog/global/language-picker.spec.tsx b/frontend/src/components/global-dialogs/settings-dialog/global/language-picker.spec.tsx
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/global/language-picker.spec.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/global/language-picker.spec.tsx
diff --git a/frontend/src/components/layout/settings-dialog/global/language-picker.tsx b/frontend/src/components/global-dialogs/settings-dialog/global/language-picker.tsx
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/global/language-picker.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/global/language-picker.tsx
diff --git a/frontend/src/components/layout/settings-dialog/settings-button.tsx b/frontend/src/components/global-dialogs/settings-dialog/settings-button.tsx
similarity index 94%
rename from frontend/src/components/layout/settings-dialog/settings-button.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/settings-button.tsx
index 255a5da75..53f8540f7 100644
--- a/frontend/src/components/layout/settings-dialog/settings-button.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/settings-button.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/settings-modal.tsx b/frontend/src/components/global-dialogs/settings-dialog/settings-modal.tsx
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/settings-modal.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/settings-modal.tsx
diff --git a/frontend/src/components/layout/settings-dialog/utils/__snapshots__/on-off-button-group.spec.tsx.snap b/frontend/src/components/global-dialogs/settings-dialog/utils/__snapshots__/on-off-button-group.spec.tsx.snap
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/utils/__snapshots__/on-off-button-group.spec.tsx.snap
rename to frontend/src/components/global-dialogs/settings-dialog/utils/__snapshots__/on-off-button-group.spec.tsx.snap
diff --git a/frontend/src/components/layout/settings-dialog/utils/on-off-button-group.spec.tsx b/frontend/src/components/global-dialogs/settings-dialog/utils/on-off-button-group.spec.tsx
similarity index 100%
rename from frontend/src/components/layout/settings-dialog/utils/on-off-button-group.spec.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/utils/on-off-button-group.spec.tsx
diff --git a/frontend/src/components/layout/settings-dialog/utils/on-off-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/utils/on-off-button-group.tsx
similarity index 96%
rename from frontend/src/components/layout/settings-dialog/utils/on-off-button-group.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/utils/on-off-button-group.tsx
index 3ff74d5a6..6fdc26a23 100644
--- a/frontend/src/components/layout/settings-dialog/utils/on-off-button-group.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/utils/on-off-button-group.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/utils/setting-line.tsx b/frontend/src/components/global-dialogs/settings-dialog/utils/setting-line.tsx
similarity index 93%
rename from frontend/src/components/layout/settings-dialog/utils/setting-line.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/utils/setting-line.tsx
index 947898c06..6a575a4a4 100644
--- a/frontend/src/components/layout/settings-dialog/utils/setting-line.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/utils/setting-line.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/layout/settings-dialog/utils/settings-toggle-button.tsx b/frontend/src/components/global-dialogs/settings-dialog/utils/settings-toggle-button.tsx
similarity index 96%
rename from frontend/src/components/layout/settings-dialog/utils/settings-toggle-button.tsx
rename to frontend/src/components/global-dialogs/settings-dialog/utils/settings-toggle-button.tsx
index 26b669873..ce35c9599 100644
--- a/frontend/src/components/layout/settings-dialog/utils/settings-toggle-button.tsx
+++ b/frontend/src/components/global-dialogs/settings-dialog/utils/settings-toggle-button.tsx
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
diff --git a/frontend/src/components/landing-layout/navigation/header-bar/header-bar.tsx b/frontend/src/components/landing-layout/navigation/header-bar/header-bar.tsx
index 11cff3441..49120af42 100644
--- a/frontend/src/components/landing-layout/navigation/header-bar/header-bar.tsx
+++ b/frontend/src/components/landing-layout/navigation/header-bar/header-bar.tsx
@@ -1,12 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file)
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { useApplicationState } from '../../../../hooks/common/use-application-state'
 import { cypressId } from '../../../../utils/cypress-attribute'
 import { NewNoteButton } from '../../../common/new-note-button/new-note-button'
-import { SettingsButton } from '../../../layout/settings-dialog/settings-button'
+import { SettingsButton } from '../../../global-dialogs/settings-dialog/settings-button'
 import { SignInButton } from '../sign-in-button'
 import { UserDropdown } from '../user-dropdown'
 import { HeaderNavLink } from './header-nav-link'