diff --git a/frontend/src/app/components/action-plan/action-plan.component.html b/frontend/src/app/components/action-plan/action-plan.component.html
index 3b6357dc29..4d7b642f9e 100644
--- a/frontend/src/app/components/action-plan/action-plan.component.html
+++ b/frontend/src/app/components/action-plan/action-plan.component.html
@@ -1,4 +1,4 @@
-<div class="okr-form-row">
+<div class="okr-form-row okr-form-label-input-container">
   <label for="actionlist" class="okr-form-label">Action Plan (optional)</label>
   <div
     cdkDropList
diff --git a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
index 5843997be5..b7af0b9bf2 100644
--- a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
+++ b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
@@ -1,4 +1,4 @@
-<div class="okr-form-row">
+<div class="okr-form-row okr-form-label-input-container">
   <label class="okr-form-label okr-form-col" for="value">Neuer Wert</label>
   <div class="col">
     <form [formGroup]="dialogForm" class="okr-form-row align-items-center">
@@ -20,7 +20,7 @@
   </mat-error>
 </div>
 
-<div *ngIf="checkIn.value" class="okr-form-row">
+<div *ngIf="checkIn.value" class="okr-form-row okr-form-label-input-container">
   <p class="okr-form-label okr-form-col">Letzter Wert</p>
   <div class="okr-form-col text-black">
     <div class="bg-display-element w-100 px-2 py-1">{{ checkIn.value }} {{ generateUnitLabel() }}</div>
diff --git a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.html b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.html
index cd3befd9bc..8a5af56f89 100644
--- a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.html
+++ b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="dialogForm">
-  <div class="okr-form-row">
+  <div class="okr-form-row okr-form-label-input-container">
     <label class="okr-form-label okr-form-col" for="ordinal-radio-group">Erreichte Zone wählen:</label>
     <mat-radio-group formControlName="value" class="d-flex flex-column gap-2" id="ordinal-radio-group">
       <mat-radio-button [attr.data-testId]="'fail-radio'" value="{{ Zone.FAIL }}" class="ordinal-zone">
diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
index 5b6617079b..b9df9a4d87 100644
--- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
+++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.html
@@ -1,12 +1,12 @@
 <app-dialog-template-core [title]="getDialogTitle()">
   <ng-container content>
     <form [formGroup]="dialogForm">
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <h4 class="okr-form-label okr-form-col">Key Result</h4>
         <p class="okr-form-label okr-form-col linebreak bg-display-element fs-6 fw-normal">{{ keyResult.title }}</p>
       </div>
 
-      <div *ngIf="getActions().length > 0" class="okr-form-row">
+      <div *ngIf="getActions().length > 0" class="okr-form-row okr-form-label-input-container">
         <p class="okr-form-label okr-form-col">Action Plan:</p>
         <div class="col">
           <span *ngFor="let action of getActions(); let i = index" class="okr-form-row">
@@ -22,7 +22,7 @@ <h4 class="okr-form-label okr-form-col">Key Result</h4>
         </div>
       </div>
 
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="changeInfo"
           >Kommentar/ Veränderung seit letztem Check-in (optional):</label
         >
@@ -53,7 +53,7 @@ <h4 class="okr-form-label okr-form-col">Key Result</h4>
         [keyResult]="getKeyResultOrdinal()"
       ></app-check-in-form-ordinal>
 
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="initiatives">Massnahmen (optional):</label>
         <div class="okr-form-input">
           <textarea
@@ -69,7 +69,7 @@ <h4 class="okr-form-label okr-form-col">Key Result</h4>
         </div>
       </div>
 
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <p class="okr-form-label okr-form-col confidence-label">
           Confidence um Target Zone
           <span *ngIf="keyResult.keyResultType === 'metric' && getKeyResultMetric() as kr">
diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.html b/frontend/src/app/components/key-result-form/key-result-form.component.html
index 6dea3d3799..1697565fe0 100644
--- a/frontend/src/app/components/key-result-form/key-result-form.component.html
+++ b/frontend/src/app/components/key-result-form/key-result-form.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="keyResultForm">
-  <div class="okr-form-row">
+  <div class="okr-form-row okr-form-label-input-container">
     <label class="okr-form-label okr-form-col" for="title">Titel</label>
     <div class="okr-form-input">
       <textarea
@@ -21,7 +21,7 @@
     [keyResultForm]="keyResultForm"
   ></app-keyresult-type>
 
-  <div class="okr-form-row">
+  <div class="okr-form-row okr-form-label-input-container">
     <label class="okr-form-label okr-form-col" for="owner">Owner</label>
     <div class="okr-form-input">
       <input
@@ -44,7 +44,7 @@
     </div>
   </div>
 
-  <div class="okr-form-row">
+  <div class="okr-form-row okr-form-label-input-container">
     <label class="okr-form-label okr-form-col" for="description">Beschreibung (optional)</label>
     <div class="okr-form-input">
       <textarea
diff --git a/frontend/src/app/shared/dialog/complete-dialog/complete-dialog.component.html b/frontend/src/app/shared/dialog/complete-dialog/complete-dialog.component.html
index dce5477779..0d061a3e57 100644
--- a/frontend/src/app/shared/dialog/complete-dialog/complete-dialog.component.html
+++ b/frontend/src/app/shared/dialog/complete-dialog/complete-dialog.component.html
@@ -6,7 +6,7 @@ <h4 class="okr-form-label okr-form-col">Objective</h4>
     </div>
 
     <form [formGroup]="completeForm">
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <p class="okr-form-label okr-form-col">Bewertung</p>
         <div class="okr-form-row mx-0">
           <button
@@ -38,7 +38,7 @@ <h4 class="okr-form-label okr-form-col">Objective</h4>
         </div>
       </div>
 
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="comment">Kommentar (optional)</label>
         <div class="okr-form-input">
           <textarea
diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html
index c2eb897e1e..f2e33de3f5 100644
--- a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html
+++ b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html
@@ -1,7 +1,7 @@
 <app-dialog-template-core [title]="getDialogTitle((this.currentTeam | async)?.name || '')">
   <ng-container content>
     <form [formGroup]="objectiveForm">
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="title">Titel</label>
         <div class="okr-form-input">
           <textarea
@@ -17,7 +17,7 @@
         </div>
       </div>
 
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="title">Beschreibung (optional)</label>
         <div class="okr-form-input">
           <textarea
@@ -34,7 +34,7 @@
 
       <div class="okr-form-row row-cols-1 row-cols-md-2 gx-2">
         <div class="col">
-          <div class="okr-form-row">
+          <div class="okr-form-row okr-form-label-input-container">
             <label class="okr-form-label okr-form-col" for="quarter">Quartal</label>
             <div class="okr-form-input pe-5">
               <select
diff --git a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.html b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.html
index 76fb0de7b6..a74ff3dbd5 100644
--- a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.html
+++ b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.html
@@ -1,7 +1,7 @@
 <app-dialog-template-core [title]="getDialogTitle()">
   <ng-container content>
     <form [formGroup]="teamForm">
-      <div class="okr-form-row">
+      <div class="okr-form-row okr-form-label-input-container">
         <label class="okr-form-label okr-form-col" for="name">Teamname</label>
         <div class="okr-form-input">
           <input