diff --git a/modules/ui/src/app/components/simple-dialog/simple-dialog.component.scss b/modules/ui/src/app/components/simple-dialog/simple-dialog.component.scss
index 57eefe1fd..9491aa3ab 100644
--- a/modules/ui/src/app/components/simple-dialog/simple-dialog.component.scss
+++ b/modules/ui/src/app/components/simple-dialog/simple-dialog.component.scss
@@ -28,8 +28,7 @@
 }
 
 .simple-dialog-title {
-  font-size: 18px;
-  line-height: 24px;
+  @include mixins.headline-small();
   padding: 0;
   text-align: center;
   color: colors.$on-surface;
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.html b/modules/ui/src/app/pages/testrun/testrun.component.html
index 9a8ec38bd..b38c0eb3b 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.html
+++ b/modules/ui/src/app/pages/testrun/testrun.component.html
@@ -72,8 +72,10 @@
         (click)="openStopTestrunDialog(vm.systemStatus)"
         class="stop-button"
         aria-label="Stop testrun"
-        color="warn"
         mat-flat-button>
+        <mat-icon fontSet="material-symbols-outlined" class="filled">
+          cancel
+        </mat-icon>
         Stop
       </button>
     </ng-container>
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.scss b/modules/ui/src/app/pages/testrun/testrun.component.scss
index fcc61c103..e1f26c7c8 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.scss
+++ b/modules/ui/src/app/pages/testrun/testrun.component.scss
@@ -139,15 +139,22 @@
 }
 
 .stop-button {
-  // styles to be updated
   position: absolute;
-  right: 24px;
-  bottom: 24px;
+  right: 40px;
+  bottom: 32px;
+  background-color: colors.$error;
+  padding: 26px;
+  border-radius: variables.$corner-large;
+  font-weight: 400;
+  font-size: 22px;
+  line-height: 28px;
+  height: 80px;
 }
 
-.stop-button {
-  letter-spacing: 0.25px;
-  padding: 0 24px;
+.stop-button mat-icon {
+  font-size: 28px;
+  width: 28px;
+  height: 28px;
 }
 
 .progress-table {
@@ -161,3 +168,7 @@
   position: relative;
   overflow-y: hidden;
 }
+
+::ng-deep .stop-testrun app-simple-dialog {
+  width: 329px;
+}
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.ts b/modules/ui/src/app/pages/testrun/testrun.component.ts
index e6f986f1e..23704007d 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.ts
+++ b/modules/ui/src/app/pages/testrun/testrun.component.ts
@@ -113,11 +113,12 @@ export class TestrunComponent implements OnInit, OnDestroy {
         title: `Stop testrun ${this.getTestRunName(systemStatus)}?`,
         content:
           'Are you sure you would like to stop testrun without a report generation?',
+        confirmName: 'Stop',
       },
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
-      panelClass: 'simple-dialog',
+      panelClass: ['simple-dialog', 'stop-testrun'],
     });
 
     dialogRef
diff --git a/modules/ui/src/app/pages/testrun/testrun.store.ts b/modules/ui/src/app/pages/testrun/testrun.store.ts
index 17423bdc0..6dea261d6 100644
--- a/modules/ui/src/app/pages/testrun/testrun.store.ts
+++ b/modules/ui/src/app/pages/testrun/testrun.store.ts
@@ -41,7 +41,6 @@ import {
   TestsData,
   TestsResponse,
 } from '../../model/testrun-status';
-import { FocusManagerService } from '../../services/focus-manager.service';
 import { LoaderService } from '../../services/loader.service';
 import { TestModule } from '../../model/device';
 
@@ -56,7 +55,6 @@ export interface TestrunComponentState {
 @Injectable()
 export class TestrunStore extends ComponentStore<TestrunComponentState> {
   private store = inject<Store<AppState>>(Store);
-  private readonly focusManagerService = inject(FocusManagerService);
   private readonly loaderService = inject(LoaderService);
 
   private dataSource$ = this.select(state => state.dataSource);