diff --git a/goofy-client/apps/goofy/src/app/app.module.ts b/goofy-client/apps/goofy/src/app/app.module.ts
index 551acc057c62f6741b9e9a526d0a8a9a899ff576..96e76bad8e55ef5f848a7692d4e3ce977de90762 100644
--- a/goofy-client/apps/goofy/src/app/app.module.ts
+++ b/goofy-client/apps/goofy/src/app/app.module.ts
@@ -25,7 +25,7 @@ import { registerLocaleData } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import localeDe from '@angular/common/locales/de';
 import { LOCALE_ID, NgModule } from '@angular/core';
-import { MatLegacyTooltipDefaultOptions as MatTooltipDefaultOptions, MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS as MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/legacy-tooltip';
+import { MatTooltipDefaultOptions, MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule, Routes } from '@angular/router';
diff --git a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.spec.ts b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.spec.ts
index 87ccdd0e2378d152fa3c158081fb5cc51b997a79..7e72b1ad366bd84406188631ea09505476b117bd 100644
--- a/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.spec.ts
+++ b/goofy-client/libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyTooltip as MatTooltip } from '@angular/material/legacy-tooltip';
+import { MatTooltip } from '@angular/material/tooltip';
 import { faker } from '@faker-js/faker';
 import { ApiDownloadToken } from '@goofy-client/api-root-shared';
 import { BinaryFileLinkRel, BinaryFileResource } from '@goofy-client/binary-file-shared';
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
index d66a2ff90f376afc9b83c439f4a89e2ea8b438b5..b88a880ec5085005b3c14bf04a74fe2460539f52 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
@@ -22,10 +22,10 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { ReactiveFormsModule, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { mock } from '@goofy-client/test-utils';
 import { ButtonWithSpinnerComponent, TextEditorComponent } from '@goofy-client/ui';
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
index 32a622293e57108d5231435c6b5122f1aea4934a..b769f92459fadea42984de5cc1230c73950ae41c 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { BinaryFileAttachmentContainerComponent } from '@goofy-client/binary-file';
 import { KommentarLinkRel, KommentarService } from '@goofy-client/kommentar-shared';
 import { createStateResource } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/postfach-shared/src/lib/postfach.service.spec.ts b/goofy-client/libs/postfach-shared/src/lib/postfach.service.spec.ts
index 76e1781e792080ef4cbd5ee7831f99487d79c1bf..8dd671a77e8fe44ae3aa2b75cf8b45e78707db6b 100644
--- a/goofy-client/libs/postfach-shared/src/lib/postfach.service.spec.ts
+++ b/goofy-client/libs/postfach-shared/src/lib/postfach.service.spec.ts
@@ -21,7 +21,7 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
 import { BinaryFileListResource, BinaryFileService } from '@goofy-client/binary-file-shared';
 import { CommandResource, CommandService } from '@goofy-client/command-shared';
 import { createEmptyStateResource, createStateResource, NavigationService, StateResource } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/postfach-shared/src/lib/postfach.service.ts b/goofy-client/libs/postfach-shared/src/lib/postfach.service.ts
index c8430fe0591972ab8bd49d86d48c255734786e72..c43ca16da8bcaa7cd60c1436600895b661e2cbe4 100644
--- a/goofy-client/libs/postfach-shared/src/lib/postfach.service.ts
+++ b/goofy-client/libs/postfach-shared/src/lib/postfach.service.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Injectable } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
 import { Params } from '@angular/router';
 import { BinaryFileListResource, BinaryFileService } from '@goofy-client/binary-file-shared';
 import { CommandResource, CommandService, doIfCommandIsDone, hasError, isDone, isPending } from '@goofy-client/command-shared';
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts b/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
index f414a7836f4b9b9c5e9e5cf335f2ee2c058875b3..d8a75edbbc43df6b44eba489c7d7e9891af7b733 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Input } from '@angular/core';
-import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialogRef } from '@angular/material/dialog';
 import { CommandResource } from '@goofy-client/command-shared';
 import { PostfachMailListLinkRel, PostfachMailListResource, PostfachService } from '@goofy-client/postfach-shared';
 import { hasError, isNotNull, isNotUndefined, StateResource } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.spec.ts b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.spec.ts
index 585161dbdec6ff816a09300980116944643a8120..ff8bd6c8e0f5a4c89e623b8c244cde7f25f27d82 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.spec.ts
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.spec.ts
@@ -23,9 +23,9 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { BinaryFileAttachmentContainerComponent } from '@goofy-client/binary-file';
 import { PostfachMailFormDialogData, PostfachMailListResource, PostfachService } from '@goofy-client/postfach-shared';
diff --git a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.ts b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.ts
index 6b78b65d4b98b332ed3766d4fee58f97042a1032..79885e7f3729a78eb626b06b0cbb3014bdf523fd 100644
--- a/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.ts
+++ b/goofy-client/libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.component.ts
@@ -23,7 +23,7 @@
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
-import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { BinaryFileResource } from '@goofy-client/binary-file-shared';
 import { CommandResource } from '@goofy-client/command-shared';
 import { PostfachMailListLinkRel } from '@goofy-client/postfach-shared';
diff --git a/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.spec.ts b/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.spec.ts
index a0b7b53fc6195ed8c956ee2fafff00c0e9316288..0246805fc3f3fc4e0a094b310030c2befee73f79 100644
--- a/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.spec.ts
+++ b/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.spec.ts
@@ -23,7 +23,7 @@
  */
 import { HttpErrorResponse, HttpRequest, HttpStatusCode } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatDialogModule } from '@angular/material/dialog';
 import { HttpErrorHandler } from '@goofy-client/tech-shared';
 import { mock } from '@goofy-client/test-utils';
 import { createApiError } from 'libs/tech-shared/test/error';
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.spec.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.spec.ts
index 8796e7fef152c464d4a8f16eccfa395ab8cc5694..2bc9c9cecfd757aa784f99c4a949a392d15d38ab 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacySnackBarRef as MatSnackBarRef, MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from '@angular/material/legacy-snack-bar';
+import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
 import { mock } from '@goofy-client/test-utils';
 import { SnackBarData } from '@goofy-client/ui';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
index ed763917eee41d9b2c622bbba8990ff51e8c6734..34d97e05cfd79aaf9aa4bafaf475312493ecfb5f 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-error/snackbar-error.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Inject } from '@angular/core';
-import { MatLegacySnackBarRef as MatSnackBarRef, MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from '@angular/material/legacy-snack-bar';
+import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
 import { SnackBarData } from '../snackbar.service';
 
 @Component({
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.spec.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.spec.ts
index aae405534e9ed13aa2701d4a473b6b37b68dc79c..68e08afd21c8f24bceaba7947c132a8a88100a50 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacySnackBarModule as MatSnackBarModule, MatLegacySnackBarRef as MatSnackBarRef, MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from '@angular/material/legacy-snack-bar';
+import { MatSnackBarModule, MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
 import { mock } from '@goofy-client/test-utils';
 import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
 import { createCommandResource } from 'libs/command-shared/test/command';
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
index 062b980cf680de8a76c1d6ec8d04742268603137..36a518a55ae108a863c8a44a1f71b68344caca5a 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar-info/snackbar-info.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Inject } from '@angular/core';
-import { MatLegacySnackBarRef as MatSnackBarRef, MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from '@angular/material/legacy-snack-bar';
+import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
 import { isRevokeable } from '@goofy-client/command-shared';
 import { isUndefined } from 'lodash-es';
 import { SnackBarData } from '../snackbar.service';
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.spec.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.spec.ts
index 45fd2fc7117ad4921db02c609112d589fcec8448..6112b04d83efea36894a3645ce0a00026a443a04 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.spec.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { TestBed } from '@angular/core/testing';
-import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { faker } from '@faker-js/faker';
 import { CommandResource, CommandStatus } from '@goofy-client/command-shared';
 import { createCommandResource } from 'libs/command-shared/test/command';
diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.ts
index a34f009166b9fa285c94f2c57b4d66763c07eb38..0be39f1519fcdcd02bbf62ce2f52f9e491848fb3 100644
--- a/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.ts
+++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar.service.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Injectable } from '@angular/core';
-import { MatLegacySnackBar as MatSnackBar, MatLegacySnackBarRef as MatSnackBarRef } from '@angular/material/legacy-snack-bar';
+import { MatSnackBar, MatSnackBarRef } from '@angular/material/snack-bar';
 import { CommandResource, CommandStatus } from '@goofy-client/command-shared';
 import { isNotUndefined } from '@goofy-client/tech-shared';
 import { Subscription } from 'rxjs';
diff --git a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.spec.ts
index de93d359672947ea4074784f93fd289ab3329ea4..7a95eaf3689a86fa3672b8dc8f2f8cb9a60031a0 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyButton as MatButton } from '@angular/material/legacy-button';
+import { MatButton } from '@angular/material/button';
 import { MatRipple } from '@angular/material/core';
 import { MatIcon } from '@angular/material/icon';
 import { createEmptyStateResource } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.spec.ts b/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.spec.ts
index 9f8bd76af6d0f168036a859bd4b1b0cd460f6dc3..1e6bb452a975c7cc490872f59a78e4530d020c99 100644
--- a/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { TestBed } from '@angular/core/testing';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
 import { ApiError } from '@goofy-client/tech-shared';
 import { createApiError } from 'libs/tech-shared/test/error';
 import { DialogService } from '../dialog/dialog.service';
diff --git a/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.ts b/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
index 5638da2f53296c26e7ff77c4b245d5cc08ad5cf5..5c56af18c2df3125d144d0e0bb23f06efc0ece65 100644
--- a/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
+++ b/goofy-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
@@ -24,7 +24,7 @@
 import { NoopScrollStrategy } from '@angular/cdk/overlay';
 import { ComponentType } from "@angular/cdk/portal";
 import { Injectable } from "@angular/core";
-import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
 import { ApiError } from "@goofy-client/tech-shared";
 import { FixedDialogComponent } from "@goofy-client/ui";
 import { InternalServerErrorDialogComponent } from "../notification/internal-server-error-dialog/internal-server-error-dialog.component";
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.spec.ts
index bcca27adecaf89d6701dbf7eaadcc8f39bc09fcf..164482f5c7c79ff9a5727dfb4eb8617048b4f0c5 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/autocomplete-editor/autocomplete-editor.component.spec.ts
@@ -22,10 +22,10 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormControl, NgControl, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { NgControl, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
index 6246fbd45785f8a91db1d36b81fe1a8e4ce424bc..8ce87a75152b28817fe85d70a7b11cea3b3bdb1e 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
@@ -25,9 +25,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatNativeDateModule } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.spec.ts
index a6d59ec97a1596eb1c3450ab5ceec0e02d779f03..d957ff6167eb4b98cda406a738d0b66b17ebc455 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/enum-editor/enum-editor.component.spec.ts
@@ -23,9 +23,9 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatMenuModule } from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { IconButtonWithSpinnerComponent } from '@goofy-client/ui';
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.spec.ts
index b1afc7aa8186f5e58981dda509d65d57a62883ae..1f6686885279af5107de18ce9f3088ad26536185 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/file-upload-editor/file-upload-editor.component.spec.ts
@@ -22,12 +22,12 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AbstractControl, UntypedFormBuilder, FormGroupDirective, ReactiveFormsModule } from '@angular/forms';
+import { AbstractControl, FormGroupDirective, ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
 import { MatNativeDateModule } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe, createEmptyStateResource } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
index e74f913c5fac30ed8e71d6f46d8abccdad920d07..f8f69bbca2672f4cac52ae193f9c5ffb93c2f811 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/text-editor/text-editor.component.spec.ts
@@ -22,9 +22,9 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormControl, NgControl, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { NgControl, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
index 656e65f04c6c90e23b0c27a1aa329fe70d2b02a4..8ca66b4042f560b37c9317097e1f44449e751947 100644
--- a/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/editor/textarea-editor/textarea-editor.component.spec.ts
@@ -22,9 +22,9 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormControl, NgControl, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { NgControl, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ConvertForDataTestPipe } from '@goofy-client/tech-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
index 3deacad1e8b12ef9457d4a8367412f1dc58b075d..8140503212de59f7d8443f7f17d57ded8918bd06 100644
--- a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
@@ -22,10 +22,9 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FixedDialogComponent } from './fixed-dialog.component';
-import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
+import { FixedDialogComponent } from './fixed-dialog.component';
 
 describe('FixedDialogComponent', () => {
 	let component: FixedDialogComponent;
diff --git a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
index 9d9ab683783d170caa389ae25a7829b49bf53b6e..374a660110aa936f6345344740b5c9a1395551bb 100644
--- a/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Inject, Injectable, Injector } from '@angular/core';
-import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
 import { FixedDialogData } from './fixed-dialog-data.model';
 
diff --git a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.spec.ts
index 6e79a395c615a791c781ba86ff16e52c7d31e6b3..68082944eb865e6b8974137f3162d3376bcbec2f 100644
--- a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-dialog/connection-timeout-retry-dialog.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
 import { ButtonWithSpinnerComponent } from '@goofy-client/ui';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.spec.ts
index 8be8fca41f864c40030214675bcc4b671cd840f0..d59954fb3290e224b1a8912308a92c8c215803eb 100644
--- a/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/http-error-dialog/connection-timeout-retry-fail-dialog/connection-timeout-retry-fail-dialog.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
 import { ButtonWithSpinnerComponent } from '@goofy-client/ui';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.spec.ts
index 6d7d7d5e9f38b2ecc3e7aabe9627e530444fbb2e..3d4132084a9c673810e72d84cd67fdac03d86559 100644
--- a/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/icon-button-with-spinner/icon-button-with-spinner.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyTooltip as MatTooltip } from '@angular/material/legacy-tooltip';
+import { MatTooltip } from '@angular/material/tooltip';
 import { createEmptyStateResource } from '@goofy-client/tech-shared';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { SpinnerComponent } from '../spinner/spinner.component';
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.spec.ts
index 77a2f1b935af763d0b25bfb808d87ec1d124825f..b7e8cf023faee0fb1bbc404a00aca35292b0257a 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule, MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
 import { faker } from '@faker-js/faker';
 import { mock } from '@goofy-client/test-utils';
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
index 8c5b4e42ed426729be271f250391de19ec3135a5..e20668a46c1f492a8f76c0688e8c9b515c5dd3b8 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Inject } from '@angular/core';
-import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { ApiError, hasExceptionId } from '@goofy-client/tech-shared';
 import { OAuthService } from 'angular-oauth2-oidc';
 
diff --git a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
index b8f81df666f3c762e9007e378adeee09f82ff489..7f6ae1de86bfe2c0bbc182b3280daec48805a4f5 100644
--- a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyProgressBar as MatProgressBar } from '@angular/material/legacy-progress-bar';
+import { MatProgressBar } from '@angular/material/progress-bar';
 import { createEmptyStateResource } from '@goofy-client/tech-shared';
 import { ProgressBarComponent } from './progress-bar.component';
 
diff --git a/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
index 73e42ba20a84b0af673e748fe5269c7c20b71765..ce4f1ef4f206b2a04243db1f3fffcf3919915865 100644
--- a/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatRippleModule } from '@angular/material/core';
-import { MatLegacySlideToggle as MatSlideToggle } from '@angular/material/legacy-slide-toggle';
+import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { MattooltipDirective } from 'libs/ui/src/lib/ui/mattooltip/mattooltip.directive';
 import { SlideToggleComponent } from './slide-toggle.component';
 
diff --git a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
index a0346f9085d2e1530088c7a44483146dafc34c28..bd285254b62e4cd3a00c59e2d2223d288ab46828 100644
--- a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
+++ b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacySpinner as MatSpinner } from '@angular/material/legacy-progress-spinner';
+import { MatSpinner } from '@angular/material/progress-spinner';
 import { createEmptyStateResource } from '@goofy-client/tech-shared';
 import { SpinnerComponent } from './spinner.component';
 
diff --git a/goofy-client/libs/ui/src/lib/ui/ui.module.ts b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
index 9a37578f0a282c7909fd73fefb9bddbf7e5d1bb9..b3e85404fa06e15e7420d2af326162da8d0a055f 100644
--- a/goofy-client/libs/ui/src/lib/ui/ui.module.ts
+++ b/goofy-client/libs/ui/src/lib/ui/ui.module.ts
@@ -25,32 +25,25 @@ import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
-	DateFnsAdapter,
-	MatDateFnsModule
-} from '@angular/material-date-fns-adapter';
+import { DateFnsAdapter, MatDateFnsModule } from '@angular/material-date-fns-adapter';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatBadgeModule } from '@angular/material/badge';
-import {
-	DateAdapter,
-	MatRippleModule,
-	MAT_DATE_LOCALE
-} from '@angular/material/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { DateAdapter, MatRippleModule, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatExpansionModule } from '@angular/material/expansion';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
-import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
-import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar';
-import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
-import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
-import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
-import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatTabsModule } from '@angular/material/tabs';
 import { RouterModule } from '@angular/router';
 import { TechSharedModule } from '@goofy-client/tech-shared';
 import { de } from 'date-fns/locale';
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
index f65bae0ff47e41ed8a1dc8f52a5c62c287ab83f7..9928325a5233dfe27b1573ba8ec098d0d039e42e 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatMenuModule } from '@angular/material/menu';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { createEmptyStateResource, createStateResource } from '@goofy-client/tech-shared';
 import { getElementFromDomRoot, getElementFromFixture } from '@goofy-client/test-utils';
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.spec.ts
index 51553fa74dbed39224689dff51b3dc4ccafa7703..378eb71fbaa31c83af0c470120cd7ba1855efe55 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.spec.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatMenuModule } from '@angular/material/menu';
 import { mock } from '@goofy-client/test-utils';
 import { UserProfileService } from '@goofy-client/user-profile-shared';
 import { MockComponent } from 'ng-mocks';
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.ts b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.ts
index 44c87d508cbf52f0e6b8e51ca373c9eac1f2e2bf..8b70aa8c782078e0e2757439aed3a7d8c423159a 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { Component, Input, ViewChild } from '@angular/core';
-import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu';
+import { MatMenuTrigger } from '@angular/material/menu';
 import { StateResource } from '@goofy-client/tech-shared';
 import { UserProfileResource, UserProfileService } from '@goofy-client/user-profile-shared';
 import { isNil } from 'lodash-es';
diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.spec.ts
index 2acb4ed65266d7e620fa9ddb2acfdaf1d9cb2ef2..4e39de54b68d7a3c71246b7729b65d0a4a4ccb0f 100644
--- a/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.spec.ts
+++ b/goofy-client/libs/user-profile/src/lib/user-profile-search-container/user-profile-search/user-profile-search.component.spec.ts
@@ -22,8 +22,8 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
+import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { mock } from '@goofy-client/test-utils';
 import { AutocompleteEditorComponent } from '@goofy-client/ui';
diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
index 39fcbd342639092bc82bd70cc9a25aa53c21562f..212762c5a8c9e7dfe1005ad02c622b1ebb4880b4 100644
--- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
+++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings.component.spec.ts
@@ -22,8 +22,8 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatButtonModule } from '@angular/material/button';
+import { MatMenuModule } from '@angular/material/menu';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiRootLinkRel } from '@goofy-client/api-root-shared';
 import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
index 8e55b8b9df0256d230c8bac6c633b41c3548ece5..58002fddae8ebbb51cb0924c357d0356d4a793b6 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
@@ -26,7 +26,7 @@ import localeDe from '@angular/common/locales/de';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatRipple } from '@angular/material/core';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyList as MatList, MatLegacyListItem as MatListItem } from '@angular/material/legacy-list';
+import { MatList, MatListItem } from '@angular/material/list';
 import { Antragsteller } from '@goofy-client/vorgang-shared';
 import { getElementFromFixture } from 'libs/test-utils/src/lib/helper';
 import { createAntragsteller } from 'libs/vorgang-shared/test/vorgang';
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
index bc91cb0c31c491f55182b1736d658c0efa6f5d0a..0b2627cf1012a82e0f1cc3c5f9b4dccf68bb6d91 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatDialogModule } from '@angular/material/dialog';
 import { VorgangForwardingContainerComponent } from '@goofy-client/forwarding';
 import { KommentarListInVorgangContainerComponent } from '@goofy-client/kommentar';
 import { PostfachMailListContainerComponent } from '@goofy-client/postfach';
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.spec.ts
index 74391df5218ecafabb5de5e0662dc63e1341ece6..cca1f80e88cf1376c0ba892ef9f6479b33a62f40 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.spec.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-daten/vorgang-detail-formular-daten.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
+import { MatTabsModule } from '@angular/material/tabs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { HistorieContainerComponent } from '@goofy-client/historie';
 import { HasLinkPipe, NotHasLinkPipe } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
index de4c7622f33d4b2e45236e539ce9c383ae5b3ae3..f3ec58feab78207f56efa109e7f32ba8a62cdddd 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
@@ -23,11 +23,11 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatButton } from '@angular/material/button';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete';
-import { MatLegacyButton as MatButton } from '@angular/material/legacy-button';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ConvertForDataTestPipe, createEmptyStateResource, createStateResource, EMPTY_STRING, HasLinkPipe, ToEmbeddedResourcesPipe } from '@goofy-client/tech-shared';
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
index e9f5f63fb572902a1d0cd767228162f65cca2b6f..1742f9f76db8a0e6dce64002d0deace1c81275e1 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
@@ -23,7 +23,7 @@
  */
 import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { MatAutocomplete } from '@angular/material/autocomplete';
-import { MatLegacyButton as MatButton } from '@angular/material/legacy-button';
+import { MatButton } from '@angular/material/button';
 import { isNotNil, StateResource } from '@goofy-client/tech-shared';
 import { VorgangHeaderLinkRel, VorgangListLinkRel, VorgangListResource } from '@goofy-client/vorgang-shared';
 import { VorgangSearchFormService } from './vorgang-search.formservice';
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.spec.ts
index e7f68b2d41653a4e882f0fafd9e2339161829055..39f1e9432fc1f58f9d02a629fdd25e4e364b2f17 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.spec.ts
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.spec.ts
@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatLegacyTooltip as MatTooltip } from '@angular/material/legacy-tooltip';
+import { MatTooltip } from '@angular/material/tooltip';
 import { createStateResource, FormatToPrettyDatePipe, ToTrafficLightTooltipPipe } from '@goofy-client/tech-shared';
 import { mock } from '@goofy-client/test-utils';
 import { WiedervorlageService } from '@goofy-client/wiedervorlage-shared';
diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
index 140790a5c7523026bdabe2e047598f08abd6f196..6fc9d31c6ec0665f4a6347089864f891f38ebc36 100644
--- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
+++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
@@ -23,7 +23,7 @@
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { MatLegacyTooltip as MatTooltip } from '@angular/material/legacy-tooltip';
+import { MatTooltip } from '@angular/material/tooltip';
 import { ToTrafficLightPipe } from '@goofy-client/tech-shared';
 import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
 import { MockDirective } from 'ng-mocks';