diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index 7c4b75ff775819c23d3e73e5c25d80a18f2eb15a..4841c7b2b27decf170b93076d58369f9aa9d4a58 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -31,6 +31,7 @@ import { ButtonWithSpinnerComponent } from '@ods/component';
 import {
   DeleteVorgangFinallyIconComponent,
   RequestVorgangDeletionIconComponent,
+  TooltipDirective,
   UndoRequestVorgangDeletionIconComponent,
 } from '@ods/system';
 import { EndgueltigLoeschenButtonContainerComponent } from './endgueltig-loeschen-button-container/endgueltig-loeschen-button-container.component';
@@ -51,6 +52,7 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
     ButtonWithSpinnerComponent,
     DeleteVorgangFinallyIconComponent,
     UndoRequestVorgangDeletionIconComponent,
+    TooltipDirective,
   ],
   declarations: [
     LoeschenAnfordernButtonContainerComponent,
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index e6030c3cc32e0e6ffc0b3f8ef4890cdd04fe02d5..e206c35d6c8efaad6336bf8f3740e1f075f5ada7 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -29,7 +29,7 @@ import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { ButtonComponent, MailboxIconComponent, PlusIconComponent } from '@ods/system';
+import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
 import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
 import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
 import { PostfachMailFormComponent } from './postfach-mail-form/postfach-mail-form.component';
@@ -71,6 +71,7 @@ const routes: Routes = [
     ButtonComponent,
     PlusIconComponent,
     MailboxIconComponent,
+    TooltipDirective,
   ],
   declarations: [
     PostfachMailListContainerComponent,
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 6d9599fdd1a6ac07b215a0b53195566c458f7fe2..f9670cbee8d9949a13cc84197077346f2c4025a6 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
@@ -44,7 +44,7 @@
       variant="outline"
       (clickEmitter)="abschliessen()"
     >
-      <ods-check-icon icon class="fill-whitetext" />
+      <ods-check-icon icon />
     </ods-button-with-spinner>
   }
 }
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
index 8da0edfd4e7c0cce005e53e94a060b699dd6436f..4f426425898e3a46ad5e1735476cae2975baef1c 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
@@ -1,4 +1,4 @@
-<div class="flex gap-1 items-center">
-  <ods-archive-icon class="fill-black"/>
+<div class="flex items-center gap-1">
+  <ods-archive-icon class="fill-text" />
   <span>in Archivierung</span>
 </div>
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 317445e1419b7f1f9a856a4b361c17986598cbe7..322b8313078161b76335fcbb5936987686522411 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
@@ -41,6 +41,6 @@
     variant="outline"
     (clickEmitter)="submit()"
   >
-    <ods-save-icon icon class="fill-whitetext" />
+    <ods-save-icon icon />
   </ods-button-with-spinner>
 }