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 729b06b22c08f27ebb821ba9e2b53ead995d582b..ef41584d1740a7b004e4a10655217c334d9269d8 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
@@ -2,7 +2,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       tooltip="Vorgang weiterleiten"
-      variant="icon"
+      variant="ghost"
       size="fit"
       dataTestId="forward-by-ozgcloud-icon-button"
     >
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 bdc9f478ca55abce043910ee3954e868dc39c245..4b20817356f5fa17fda9018c70a4ba3d8c9265af 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
@@ -27,7 +27,7 @@
   <ods-button-with-spinner
     data-test-id="endgueltig-loeschen-icon-button"
     tooltip="Endgültig löschen"
-    variant="icon"
+    variant="ghost"
     size="fit"
     (clickEmitter)="endgueltigLoeschen.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.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 59a0e021de90760fb0177bfb6eb3e1868a6a562e..70f002e91401e1c621e01c635856a642644a4e4d 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
@@ -28,7 +28,7 @@
     [stateResource]="loeschAnforderungZuruecknehmenCommand"
     data-test-id="loesch-anforderung-zuruecknehmen-icon-button"
     tooltip="Löschanforderung zurücknehmen"
-    variant="icon"
+    variant="ghost"
     size="fit"
     (clickEmitter)="loeschAnforderungZuruecknehmen.emit()"
   >
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 d56365f101ab4f435838cdf5ac4fd1f5c8af3f9f..0598d5dfae5a8bfc2a58fdce5a3d3c0ff3d5cd1f 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
@@ -28,7 +28,7 @@
     [stateResource]="loeschenAnfordernCommand"
     data-test-id="loeschen-anfordern-icon-button"
     tooltip="Löschen anfordern"
-    variant="icon"
+    variant="ghost"
     size="fit"
     (clickEmitter)="loeschenAnfordern.emit()"
   >
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 b47984d0cbaa2a20e3c6db48a7e684df14b76bac..22f3399935b8a21914e31c9b62e5bf85488a34c2 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
@@ -30,7 +30,7 @@
       data-test-id="send-mail-icon-button"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       tooltip="Neue Nachricht erstellen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="openPostfachNachrichtenDialog.emit()"
     >
@@ -51,7 +51,7 @@
       data-test-id="create-mail-button-without-text"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       [tooltip]="toolTip"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="openPostfachNachrichtenDialog.emit()"
     >
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 77c62e38084d7d1dff969fc65a28c7e6bd050c53..44e7788d550b32ba98c4fefb1a90ec33101d4a4c 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
@@ -24,7 +24,7 @@
 
 -->
 <a [routerLink]="linkTo" data-test-id="back-button" [tooltip]="label" tooltipAriaType="aria-labelledby">
-  <ods-button variant="icon" size="fit">
+  <ods-button variant="ghost" size="fit">
     <ods-arrow-left-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 6469c2a6d834f41c2394fb92149b0b18c359f518..f0e6aa37b1b8932034832aa3beeed0f92b4c4ff4 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
@@ -28,7 +28,7 @@
     svgIcon="account_outline"
     tooltip="Bearbeiter zuordnen"
     data-test-id="assign-user-profile-icon-button"
-    variant="icon"
+    variant="ghost"
     size="fit"
     (clickEmitter)="showUserProfileSearch()"
   >
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 2c7b3f41e954a4f51089077f4dc8ed711c96c471..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
@@ -30,7 +30,7 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="abschliessen-icon-button"
       tooltip="Vorgang abschließen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="abschliessen()"
     >
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 b82f8fd9e49ea62956ff3d3f4aab3ea8e2d7ee04..28ef66f3d4acbb6b933ed26cc68d0c294a02e7d4 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
@@ -29,7 +29,7 @@
       [stateResource]="commandStateResource$ | async"
       (clickEmitter)="annehmen()"
       tooltip="Vorgang annehmen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       data-test-id="annehmen-icon-button"
     >
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 b395e746cf068f3664ef5e51b410c291a125ddf8..d1de12ab8c6736dc07dd9d96d8490451e297467f 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
@@ -30,7 +30,7 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="bearbeiten-icon-button"
       tooltip="Vorgang bearbeiten"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="bearbeiten()"
     >
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 de88c613de69d3346e4540ff9879c5ac190a0990..da120283e6d6c4fdd7e7688c457261b9757d04a6 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,7 +29,7 @@
       [stateResource]="commandStateResource$ | async"
       (clickEmitter)="bescheiden()"
       [tooltip]="toolTipText"
-      variant="icon"
+      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 e5609f8f079ef8060f4516fb804f4d50f0b3022b..b5e8bd07fb1c361b05b1f809f97f95ab1c68cd5f 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
@@ -29,7 +29,7 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="verwerfen-icon-button"
       tooltip="Vorgang verwerfen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="verwerfen()"
     >
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 6c98b512c3e436c716b6ac4d840ca7a0d4190c74..68384c5436942a253e28a209b7e358e793590d38 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
@@ -29,7 +29,7 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="wiedereroeffnen-icon-button"
       tooltip="Vorgang wiedereröffnen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="wiedereroeffnen()"
     >
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 8ce7dcfcd4933e7ca385988cac8f92324fd50e67..e89caeeded1dc4dcccce91a6e3d8602ab50cf0d7 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
@@ -28,7 +28,7 @@
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
       data-test-id="zurueckholen-icon-button"
-      variant="icon"
+      variant="ghost"
       size="fit"
       tooltip="Vorgang zurückholen"
       (clickEmitter)="zurueckholen()"
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 549e0ec770121545d0d078b477ab7519a23b8c1b..abb4132e0f462dc934c84e3627dca7b07fdba891 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
@@ -30,7 +30,7 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="zurueckstellen-icon-button"
       tooltip="Vorgang zurückstellen"
-      variant="icon"
+      variant="ghost"
       size="fit"
       (clickEmitter)="zurueckstellen()"
     >
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 0998d200a493339516db6b6f35f967ec6ae1b9ec..c37de121c882aeb26bbdb25b36ae69bc0ed11c37 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
@@ -30,7 +30,7 @@
       @if (showAsIconButton) {
         <ods-button-with-spinner
           data-test-id="create-wiedervorlage-icon-button"
-          variant="icon"
+          variant="ghost"
           size="fit"
           tooltip="Wiedervorlage erstellen"
         >