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 f9670cbee8d9949a13cc84197077346f2c4025a6..8b4f93ab8424a3645b7d98945542f432b182d0ff 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
@@ -41,10 +41,10 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="abschliessen-button"
       text="Abschließen"
-      variant="outline"
+      variant="primary"
       (clickEmitter)="abschliessen()"
     >
-      <ods-check-icon icon />
+      <ods-check-icon icon class="fill-white" />
     </ods-button-with-spinner>
   }
 }
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 d1de12ab8c6736dc07dd9d96d8490451e297467f..a380dac9d3371f63ac2de38ae397e9b72df018ee 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
@@ -41,10 +41,10 @@
       [stateResource]="commandStateResource$ | async"
       data-test-id="bearbeiten-button"
       text="Bearbeiten"
-      variant="outline"
+      variant="primary"
       (clickEmitter)="bearbeiten()"
     >
-      <ods-edit-icon icon />
+      <ods-edit-icon icon class="fill-white"/>
     </ods-button-with-spinner>
   }
 }
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 da120283e6d6c4fdd7e7688c457261b9757d04a6..f98bc5bc4bad9facd13081d972de5b977303ce63 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
@@ -40,10 +40,10 @@
       [stateResource]="commandStateResource$ | async"
       (clickEmitter)="bescheiden()"
       [text]="buttonText"
-      variant="outline"
+      variant="primary"
       data-test-id="bescheiden-button"
     >
-      <ods-stamp-icon icon class="fill-primary" size="medium" />
+      <ods-stamp-icon icon class="fill-white" size="medium" />
     </ods-button-with-spinner>
   }
 }
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index bc73d5f4c84ba402f5d5abb81ba5d26e2d8d15e0..772fdbd05969b74f6fe626e05d5b74123f595f02 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -35,8 +35,11 @@
         data-test-id="vorgang-detail-header"
       ></alfa-vorgang-detail-header>
 
+
       <div class="section one-column">
-        <alfa-vorgang-detail-formular-daten [vorgangWithEingang]="vorgangResource"></alfa-vorgang-detail-formular-daten>
+        <alfa-vorgang-detail-formular-buttons [vorgangWithEingang]="vorgangResource" />
+
+        <alfa-vorgang-detail-formular-daten [vorgangWithEingang]="vorgangResource" />
 
         <div *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.BESCHEIDE">
           <ozgcloud-expansion-panel headline="Bescheid" data-test-id="bescheid-expansion-panel">
@@ -44,8 +47,6 @@
             </alfa-bescheid-list-in-vorgang-container>
           </ozgcloud-expansion-panel>
         </div>
-
-        <alfa-vorgang-detail-formular-buttons [vorgangWithEingang]="vorgangResource"></alfa-vorgang-detail-formular-buttons>
       </div>
 
       <div class="section one-column" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.COLLABORATIONS">
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
index 908b73de5edb6b5e3d57dcce910e9b85d8bb9339..a38e9190c06e39852996506fc4a0d801a4df5ea4 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
@@ -27,7 +27,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'alfa-vorgang-detail-formular-buttons',
   templateUrl: './vorgang-detail-formular-buttons.component.html',
-  styles: [':host {@apply ml-12 flex gap-4}'],
+  styles: [':host {@apply ml-14 flex gap-4 mb-6}'],
 })
 export class VorgangDetailFormularButtonsComponent {
   @Input() vorgangWithEingang: VorgangWithEingangResource;