diff --git a/frontend/cypress/e2e/checkIn.cy.ts b/frontend/cypress/e2e/checkIn.cy.ts
index 3b4b749edc..6024396ae2 100644
--- a/frontend/cypress/e2e/checkIn.cy.ts
+++ b/frontend/cypress/e2e/checkIn.cy.ts
@@ -374,7 +374,7 @@ describe('OKR Check-in e2e tests', () => {
       cy.wait('@getKeyResultsAfterSave');
 
       cy.getByTestId('add-check-in').first().click();
-      cy.contains('Letzter Wert').siblings('div').contains('10 %');
+      cy.contains('Letzter Wert').siblings('div').contains('10%');
     });
   });
 });
diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
index 56a6727b9b..7204f756a4 100644
--- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
+++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.html
@@ -22,8 +22,7 @@
             <h4 class="col-auto">Wert:</h4>
             <div class="col">
               <ng-container *ngIf="keyResult.keyResultType === 'metric'">
-                {{ getMetricKeyResult().unit | unitLabelTransformation }}
-                {{ +checkIn.value! | unitValueTransformation: getMetricKeyResult().unit }}
+                {{ +checkIn.value! | unitValueTransformation }}{{ getMetricKeyResult().unit | unitLabelTransformation }}
               </ng-container>
               <ng-container *ngIf="keyResult.keyResultType === 'ordinal'">
                 {{ checkIn.value }}
@@ -49,7 +48,7 @@ <h4 class="col-3">Massnahmen:</h4>
 
   <ng-container actions>
     <div class="col-auto">
-      <button mat-flat-button color="primary" mat-dialog-close>Schliessen</button>
+      <button [attr.data-testId]="'closeButton'" mat-flat-button color="primary" mat-dialog-close>Schliessen</button>
     </div>
   </ng-container>
 </app-dialog-template-core>
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 3c796f384f..f66dfb6ea5 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
@@ -27,7 +27,7 @@
     <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="dialog-data-show dialog-form-field py-2">{{ checkIn.value }} {{ generateUnitLabel() }}</div>
+        <div class="dialog-data-show dialog-form-field py-2">{{ checkIn.value }}{{ generateUnitLabel() }}</div>
       </div>
     </div>
   </div>
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 1ed7295b52..783ed85b71 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -25,6 +25,7 @@ import { SpinnerComponent } from './custom/spinner/spinner.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { DialogTemplateCoreComponent } from './custom/dialog-template-core/dialog-template-core.component';
 import { MatDividerModule } from '@angular/material/divider';
+import { UnitLabelTransformationPipe } from './pipes/unit-label-transformation/unit-label-transformation.pipe';
 
 @NgModule({
   declarations: [