diff --git a/alfa-client/libs/design-system/src/lib/tooltip/tooltip.component.ts b/alfa-client/libs/design-system/src/lib/tooltip/tooltip.component.ts
index f82fe2102cb07bea080f2b61738c783515d58672..a5e130fefe15bca8001c94c50b93e17a35b01003 100644
--- a/alfa-client/libs/design-system/src/lib/tooltip/tooltip.component.ts
+++ b/alfa-client/libs/design-system/src/lib/tooltip/tooltip.component.ts
@@ -29,7 +29,7 @@ import { TooltipPosition } from './tooltip.directive';
   selector: 'ods-tooltip',
   imports: [NgClass],
   template: `<span
-    class="tooltip fixed z-[100] max-w-md animate-fadeIn cursor-default break-words rounded bg-ozggray-900 px-3 py-2 text-sm text-whitetext before:absolute before:border-l-[0.5rem] before:border-r-[0.5rem] before:border-l-transparent before:border-r-transparent dark:bg-white md:max-w-[calc(90vw)]"
+    class="tooltip fixed z-[100] max-w-md animate-fadeIn cursor-default break-words rounded bg-ozggray-900 px-3 py-2 text-sm font-normal text-whitetext before:absolute before:border-l-[0.5rem] before:border-r-[0.5rem] before:border-l-transparent before:border-r-transparent dark:bg-white md:max-w-[calc(90vw)]"
     [ngClass]="class"
     [class.visible]="show"
     [class.invisible]="!show"
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
index c3a536b79edb8516518911255a4e1d40eeb2448b..6afe4a115c084140ff69e8b5351c1c2fd9804406 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
@@ -1,7 +1,8 @@
 @if (vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_OZGCLOUD) {
   @if (showAsIconButton) {
     <ods-button-with-spinner
-      tooltip="Vorgang weiterleiten"
+      [tooltip]="'Vorgang weiterleiten'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       dataTestId="forward-by-ozgcloud-icon-button"
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
index 277390cf09c47acbb0411587f3f688ed9160f282..1c778f0931410d2a0f9feedd502031b2093a1a50 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
+++ b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
@@ -44,6 +44,7 @@
   <ozgcloud-stroked-button-with-spinner
     dataTestId="forward-button"
     toolTip="Vorgang weiterleiten"
+    tooltipAriaType="aria-labelledby"
     icon="forward"
     type="submit"
     text="Weiterleiten"
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
index bf476f537b1107285627ef7d450f2a6ad8b3a57f..0043c92cb761914b2f64040ff4fd817e60eb9dfa 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
@@ -26,7 +26,8 @@
 @if (showAsIconButton) {
   <ods-button-with-spinner
     data-test-id="endgueltig-loeschen-icon-button"
-    tooltip="Endgültig löschen"
+    [tooltip]="'Endgültig löschen'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     (clickEmitter)="endgueltigLoeschen.emit()"
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
index 66d46e2f07886affa2ff4603762c800b9f04798c..a2a4b7a68f6cf52c46b9fe237fb0446fe66defc5 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
@@ -24,9 +24,9 @@
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DeleteVorgangFinallyIconComponent } from '@ods/system';
+import { DeleteVorgangFinallyIconComponent, TooltipDirective } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button.component';
 
 describe('EndgueltigLoeschenButtonComponent', () => {
@@ -42,6 +42,7 @@ describe('EndgueltigLoeschenButtonComponent', () => {
         EndgueltigLoeschenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(DeleteVorgangFinallyIconComponent),
+        MockDirective(TooltipDirective),
       ],
     }).compileComponents();
 
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
index 3aee95356bb52e42320e94e2dab3b1ec1c5d9aec..a4536cb3f2ced04e06f416a1fc68e69af784e1fa 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.html
@@ -27,7 +27,8 @@
   <ods-button-with-spinner
     [stateResource]="loeschAnforderungZuruecknehmenCommand"
     data-test-id="loesch-anforderung-zuruecknehmen-icon-button"
-    tooltip="Löschanforderung zurücknehmen"
+    [tooltip]="'Löschanforderung zurücknehmen'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     (clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
index f51d85f10159a0572566a4fd917ebc45f36d66f1..83c5f617a40875c913aa54ca0505c59a9cf691c1 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung-zuruecknehmen-button-container/loesch-anforderung-zuruecknehmen-button/loesch-anforderung-zuruecknehmen-button.component.spec.ts
@@ -24,9 +24,9 @@
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { UndoRequestVorgangDeletionIconComponent } from '@ods/system';
+import { TooltipDirective, UndoRequestVorgangDeletionIconComponent } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { LoeschAnforderungZuruecknehmenButtonComponent } from './loesch-anforderung-zuruecknehmen-button.component';
 
 describe('LoeschAnforderungZuruecknehmenButtonComponent', () => {
@@ -42,6 +42,7 @@ describe('LoeschAnforderungZuruecknehmenButtonComponent', () => {
         LoeschAnforderungZuruecknehmenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(UndoRequestVorgangDeletionIconComponent),
+        MockDirective(TooltipDirective),
       ],
     }).compileComponents();
 
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
index 4a7cc9cb40b1f9ed650cb7c5e27723ccb30edbef..869474ca105b45602a1d2449b5f160533b759cd5 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.html
@@ -27,7 +27,8 @@
   <ods-button-with-spinner
     [stateResource]="loeschenAnfordernCommand"
     data-test-id="loeschen-anfordern-icon-button"
-    tooltip="Löschen anfordern"
+    [tooltip]="'Löschen anfordern'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     (clickEmitter)="loeschenAnfordern.emit()"
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
index f859031bafc62e2db38e95d53cbfd3c6b2a3634a..41d80aba2d58565dd62feb31c0b9cc9cf8aa2fd6 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loeschen-anfordern-button-container/loeschen-anfordern-button/loeschen-anfordern-button.component.spec.ts
@@ -24,9 +24,9 @@
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { RequestVorgangDeletionIconComponent } from '@ods/system';
+import { RequestVorgangDeletionIconComponent, TooltipDirective } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button.component';
 
 describe('LoeschenAnfordernButtonComponent', () => {
@@ -42,6 +42,7 @@ describe('LoeschenAnfordernButtonComponent', () => {
         LoeschenAnfordernButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(RequestVorgangDeletionIconComponent),
+        MockDirective(TooltipDirective),
       ],
     }).compileComponents();
 
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 440eb0b7fee2d2fbf322f3c90295e21e83c7f902..eff1422c21167306dee76fb8185217b4475d9a7a 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -29,7 +29,8 @@
     <ods-button
       dataTestId="send-mail-icon-button"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
-      tooltip="Neue Nachricht erstellen"
+      [tooltip]="'Neue Nachricht erstellen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="openPostfachNachrichtenDialog.emit()"
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
index 18d2fef09050fcd571653eb9d72411c7fef4d73d..44d553b95fc0e784b4d66bcd22287e9700325f8a 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
@@ -28,13 +28,10 @@
   <alfa-postfach-mail-pdf-button-container
     [postfachMailListResource]="postfachMailListStateResource.resource"
   ></alfa-postfach-mail-pdf-button-container>
-  <ng-container
-    *ngIf="
-      postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL
-    "
-  >
+  <ng-container *ngIf="postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL">
     <alfa-postfach-mail-button-container
       toolTip="Neue Nachricht erstellen"
+      tooltipAriaType="aria-labelledby"
       [vorgang]="vorgangStateResource.resource"
       data-test-id="postfach-mail-button-container-no-label"
     ></alfa-postfach-mail-button-container>
@@ -44,8 +41,7 @@
 <ozgcloud-spinner [stateResource]="postfachMailListStateResource">
   <alfa-postfach-mail
     *ngFor="
-      let postfachMail of postfachMailListStateResource.resource
-        | toEmbeddedResources: postfachMailListLinkRel.POSTFACH_MAIL_LIST
+      let postfachMail of postfachMailListStateResource.resource | toEmbeddedResources: postfachMailListLinkRel.POSTFACH_MAIL_LIST
     "
     class="postfach"
     [vorgangStateResource]="vorgangStateResource"
@@ -56,10 +52,7 @@
 </ozgcloud-spinner>
 
 <ng-container
-  *ngIf="
-    postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL;
-    else noPostfach
-  "
+  *ngIf="postfachMailListStateResource.resource | hasLink: postfachMailListLinkRel.SEND_POSTFACH_MAIL; else noPostfach"
 >
   <alfa-postfach-mail-button-container
     text="Nachricht"
@@ -69,7 +62,5 @@
 </ng-container>
 
 <ng-template #noPostfach>
-  <span class="no-postfach-text" data-test-id="no-postfach-text"
-    >Dieser Vorgang ist nicht mit einem Postfach verknüpft.</span
-  >
+  <span class="no-postfach-text" data-test-id="no-postfach-text">Dieser Vorgang ist nicht mit einem Postfach verknüpft.</span>
 </ng-template>
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
index 24868baff476b7d90f3eb7e44a5133ac4faf59d2..81e091ce81d24d1f5266b23ed9a3d838c6ab0226 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
@@ -23,8 +23,8 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<a [routerLink]="linkTo" data-test-id="back-button" [tooltip]="label" tooltipAriaType="aria-labelledby" tabindex="-1">
-  <ods-button variant="ghost" size="fit">
+<a [routerLink]="linkTo" data-test-id="back-button" tabindex="-1">
+  <ods-button variant="ghost" size="fit" [tooltip]="label" tooltipAriaType="aria-labelledby">
     <ods-arrow-back-icon icon class="fill-text" />
   </ods-button>
 </a>
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
index f0e6aa37b1b8932034832aa3beeed0f92b4c4ff4..e1e8b8b763439a3af38eac0f8929c7e06dd44809 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
@@ -26,7 +26,8 @@
 @if (vorgang | hasLink: linkRel.ASSIGN) {
   <ods-button-with-spinner
     svgIcon="account_outline"
-    tooltip="Bearbeiter zuordnen"
+    [tooltip]="'Bearbeiter zuordnen'"
+    tooltipAriaType="aria-labelledby"
     data-test-id="assign-user-profile-icon-button"
     variant="ghost"
     size="fit"
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
index 531805961b6eef4f0453f69ca5ebb481c096b1aa..a99b9f0846590b69dd1337fef67519e677ac48b2 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.spec.ts
@@ -27,9 +27,9 @@ import { UserProfileService } from '@alfa-client/user-profile-shared';
 import { VorgangHeaderLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { AccountCircleIconComponent } from '@ods/system';
+import { AccountCircleIconComponent, TooltipDirective } from '@ods/system';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { AssignUserProfileButtonContainerComponent } from './assign-user-profile-button-container.component';
 
 describe('AssignUserProfileButtonContainerComponent', () => {
@@ -47,6 +47,7 @@ describe('AssignUserProfileButtonContainerComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(AccountCircleIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
index e56be799f110d811aa849ebd4db4709e7c644307..a90a52997e2b9343adcd6918d2df1106ef7f74b8 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
@@ -30,7 +30,8 @@
       class="absolute -top-2"
       variant="ghost"
       size="fit"
-      tooltip="Aktenzeichen bearbeiten"
+      [tooltip]="'Aktenzeichen bearbeiten'"
+      tooltipAriaType="aria-labelledby"
       data-test-id="aktenzeichen-editieren"
       (clickEmitter)="onEdit()"
     >
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
index 11982ed18070cf1894cabf09fdf2cb958c9970ff..c930351baf32c30a2f9ee4c40b105e8c53212de0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.spec.ts
@@ -27,10 +27,10 @@ import { DialogService } from '@alfa-client/ui';
 import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { AktenzeichenComponent } from '@alfa-client/vorgang-shared-ui';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent, EditIconComponent } from '@ods/system';
+import { ButtonComponent, EditIconComponent, TooltipDirective } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { AktenzeichenEditDialogComponent } from '../aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component';
 import { AktenzeichenEditableComponent } from './aktenzeichen-editable.component';
 
@@ -50,6 +50,7 @@ describe('AktenzeichenComponent', () => {
         MockComponent(ButtonComponent),
         MockComponent(EditIconComponent),
         MockComponent(AktenzeichenComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 758515c53318532c5950c7d61b75fa296137cabc..0188a0a906cb073b1e2f488c6fb2dd521413852b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -29,7 +29,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       dataTestId="abschliessen-icon-button"
-      tooltip="Vorgang abschließen"
+      [tooltip]="'Vorgang abschließen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="abschliessen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index a7334741a042a9d6cbe14d06d190160bd7bda7c5..599cf99c8d98a06cb0ff158ebc92c0735bae820a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -27,11 +27,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckIconComponent } from '@ods/system';
+import { CheckIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { Observable, of } from 'rxjs';
 import { AbschliessenButtonComponent } from './abschliessen-button.component';
 
@@ -53,6 +53,7 @@ describe('AbschliessenButtonComponent', () => {
         AbschliessenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(CheckIconComponent),
+        MockDirective(TooltipDirective),
         HasLinkPipe,
       ],
       providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index 7e55b9639e4a09b970c98394ad360cf550f80dcd..f643340a8a87e2f809e814f34ede36f2c7860383 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -28,7 +28,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       (clickEmitter)="annehmen()"
-      tooltip="Vorgang annehmen"
+      [tooltip]="'Vorgang annehmen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       dataTestId="annehmen-icon-button"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
index 0b4059086facce657ae46ba5a1c241afc7eb5122..f9798f26d30ca54c26c2a7c48c7cf013b6e4a5b1 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
@@ -31,7 +31,7 @@ import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { AnnehmenButtonComponent } from './annehmen-button.component';
 
@@ -52,9 +52,9 @@ describe('AnnehmenButtonComponent', () => {
       declarations: [
         AnnehmenButtonComponent,
         HasLinkPipe,
-        TooltipDirective,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(CheckCircleIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index 107e3f67c299d7a6199434ebfc4750ae27008242..46880b05312a56ed041fd6c1e3972304f6e10bba 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -29,7 +29,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       dataTestId="bearbeiten-icon-button"
-      tooltip="Vorgang bearbeiten"
+      [tooltip]="'Vorgang bearbeiten'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="bearbeiten()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
index 9691ba2813cd8669f2e959a8d1f412a8ec435b52..382edfc27fcb85f13e0f5b9b44cdb3bd49224ed0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
@@ -26,11 +26,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { EditIconComponent } from '@ods/system';
+import { EditIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { BearbeitenButtonComponent } from './bearbeiten-button.component';
 
@@ -52,6 +52,7 @@ describe('BearbeitenButtonComponent', () => {
         BearbeitenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(EditIconComponent),
+        MockDirective(TooltipDirective),
         HasLinkPipe,
       ],
       providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index 32924b770f3d204f1476521b4fe36050298bdb9f..b3464f415ef1de96ae3b5b9040b01d033083d722 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -29,6 +29,7 @@
       [stateResource]="commandStateResource$ | async"
       (clickEmitter)="bescheiden()"
       [tooltip]="toolTipText"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       data-test-id="bescheiden-icon-button"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index 784ddfbbf353822e8bd5fc423d63a1f86f9f607e..0c3fa80c34898018959613c3aaf227b8281219e8 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -28,7 +28,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       dataTestId="verwerfen-icon-button"
-      tooltip="Vorgang verwerfen"
+      [tooltip]="'Vorgang verwerfen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="verwerfen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index 75b739a2301a0447895e66b8f026c494bd0fb49e..32e09c8c158c73eeed252f39ae3ea824a4b2cfd7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -26,11 +26,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DiscardVorgangIconComponent } from '@ods/system';
+import { DiscardVorgangIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { VerwerfenButtonComponent } from './verwerfen-button.component';
 
@@ -52,6 +52,7 @@ describe('VerwerfenButtonComponent', () => {
         VerwerfenButtonComponent,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(DiscardVorgangIconComponent),
+        MockDirective(TooltipDirective),
         HasLinkPipe,
       ],
       providers: [
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
index 0e3bba543bfdd8404c10c1589b32b1a245e746ed..803643eefddd44bce0fa6ba4e43ce9bdd956a8c7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
@@ -28,7 +28,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       dataTestId="wiedereroeffnen-icon-button"
-      tooltip="Vorgang wiedereröffnen"
+      [tooltip]="'Vorgang wiedereröffnen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="wiedereroeffnen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
index a52280005233c965f956010d03a99c87be471fd3..9ab9c207ac2130f261185304e3cb862dd10794b2 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
@@ -26,11 +26,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { UndoIconComponent } from '@ods/system';
+import { TooltipDirective, UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { WiedereroeffnenButtonComponent } from './wiedereroeffnen-button.component';
 
@@ -52,6 +52,7 @@ describe('WiedereroeffnenButtonComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(UndoIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index d2ac600887aa0ea31937090134e620cdc2c92b0b..8ee807e66333b167a0e6313fba94bfe10cd10265 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -30,7 +30,8 @@
       dataTestId="zurueckholen-icon-button"
       variant="ghost"
       size="fit"
-      tooltip="Vorgang zurückholen"
+      [tooltip]="'Vorgang zurückholen'"
+      tooltipAriaType="aria-labelledby"
       (clickEmitter)="zurueckholen()"
     >
       <ods-undo-icon icon class="fill-text" />
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
index f91b5423f7f409c523592849dacc6c52126e5c92..80f81d1d5d5642d69dd03aaee0ca35aa9b3467c8 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
@@ -26,11 +26,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { UndoIconComponent } from '@ods/system';
+import { TooltipDirective, UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { ZurueckholenButtonComponent } from './zurueckholen-button.component';
 
@@ -53,6 +53,7 @@ describe('ZurueckholenButtonComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(UndoIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
index 843b20963ed5baf2cf596165d889f9d4b405e232..d87c88a1a703eef1b5067af8de775f835f4b089b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
@@ -29,7 +29,8 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       dataTestId="zurueckstellen-icon-button"
-      tooltip="Vorgang zurückstellen"
+      [tooltip]="'Vorgang zurückstellen'"
+      tooltipAriaType="aria-labelledby"
       variant="ghost"
       size="fit"
       (clickEmitter)="zurueckstellen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
index 4f9a74edc4eff2593b3cea73015e57f11e0f18a9..51f20cf81bc614ac1d8ebbe805042db6709aff56 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
@@ -26,11 +26,11 @@ import { mock } from '@alfa-client/test-utils';
 import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { UndoIconComponent } from '@ods/system';
+import { TooltipDirective, UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { of } from 'rxjs';
 import { ZurueckstellenButtonComponent } from './zurueckstellen-button.component';
 
@@ -53,6 +53,7 @@ describe('ZurueckstellenButtonComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(UndoIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index 71fb146636883062d7fc3759a4cd120df047aa2e..49f1ca7b954d454668ee3c45f28a2ad9c50e85a4 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -27,7 +27,8 @@
   <ods-button-with-spinner
     dataTestId="erledigen-icon-button"
     [stateResource]="erledigenCommand$ | async"
-    tooltip="Als erledigt markieren"
+    [tooltip]="'Als erledigt markieren'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     (clickEmitter)="erledigen()"
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
index 81eec1106509121cb069b014fe64ac1077d5e96e..f87fc191ba1bce5908e1f9958e3a2060f9343010 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
@@ -26,10 +26,10 @@ import { mock } from '@alfa-client/test-utils';
 import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent } from '@ods/system';
+import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { ErledigenButtonContainerComponent } from './erledigen-button-container.component';
 
 describe('ErledigenButtonContainerComponent', () => {
@@ -47,6 +47,7 @@ describe('ErledigenButtonContainerComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(CheckCircleIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
index df18f4361bbd25449d00c65d6ae30df918cc7617..231640ded0433d236945ca15247c90bdc3273231 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.html
@@ -27,7 +27,8 @@
   <ods-button-with-spinner
     [stateResource]="submitInProgress$ | async"
     (clickEmitter)="submit()"
-    tooltip="Wiedervorlage speichern"
+    [tooltip]="'Wiedervorlage speichern'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     dataTestId="speichern-icon-button"
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
index 12ccae7d16777c95b80eff8e1d266316f462e35f..89e6c8cfe103025f4bf10a587d9f5273e06ffa3f 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
@@ -27,7 +27,8 @@
   <ods-button-with-spinner
     data-test-id="wiedereroeffnen-icon-button"
     [stateResource]="wiedereroeffnenCommand$ | async"
-    tooltip="Als offen markieren"
+    [tooltip]="'Als offen markieren'"
+    tooltipAriaType="aria-labelledby"
     variant="ghost"
     size="fit"
     (clickEmitter)="wiedereroeffnen()"
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
index af8e1281a01dfdefb228d6011700b5cecd64f35b..c80ebee9420238cdf300e9c23e389764c4774b8e 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.spec.ts
@@ -26,9 +26,9 @@ import { mock } from '@alfa-client/test-utils';
 import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiedervorlage-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
-import { CheckCircleIconComponent } from '@ods/system';
+import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
 import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { WiedereroeffnenButtonContainerComponent } from './wiedereroeffnen-button-container.component';
 
 describe('WiedereroeffnenButtonContainerComponent', () => {
@@ -46,6 +46,7 @@ describe('WiedereroeffnenButtonContainerComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonWithSpinnerComponent),
         MockComponent(CheckCircleIconComponent),
+        MockDirective(TooltipDirective),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
index c37de121c882aeb26bbdb25b36ae69bc0ed11c37..6fde7ac98e2140dbdf500d44ae877b8b66a3234a 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-create-button/wiedervorlage-create-button.component.html
@@ -32,7 +32,8 @@
           data-test-id="create-wiedervorlage-icon-button"
           variant="ghost"
           size="fit"
-          tooltip="Wiedervorlage erstellen"
+          [tooltip]="'Wiedervorlage erstellen'"
+          tooltipAriaType="aria-labelledby"
         >
           <ods-update-icon icon class="fill-text" />
         </ods-button-with-spinner>