diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
index 0b6be06f3..0dd00996a 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -47,6 +47,7 @@
         <div class="dialog-actions">
             <iqser-icon-button
                 (action)="save()"
+                [buttonId]="'save-dossier-state'"
                 [disabled]="disabled"
                 [label]="'add-edit-dossier-state.save' | translate"
                 [submit]="true"
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 0311a09eb..6f42722e1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -4,12 +4,12 @@
     </div>
 
     <div class="dialog-content">
-        <div [innerHTML]="'confirm-delete-dossier-state.warning' | translate : translateArgs" class="heading"></div>
+        <div [innerHTML]="'confirm-delete-dossier-state.warning' | translate: translateArgs" class="heading"></div>
 
         <form *ngIf="data.dossierCount !== 0 && data.otherStates.length > 0" [formGroup]="form" class="mt-16">
             <div class="iqser-input-group">
                 <mat-checkbox color="primary" formControlName="replace">
-                    {{ 'confirm-delete-dossier-state.question' | translate : { count: data.dossierCount } }}
+                    {{ 'confirm-delete-dossier-state.question' | translate: { count: data.dossierCount } }}
                 </mat-checkbox>
             </div>
 
@@ -30,7 +30,12 @@
     </div>
 
     <div class="dialog-actions">
-        <iqser-icon-button (action)="save()" [label]="label | translate" [type]="iconButtonTypes.primary"></iqser-icon-button>
+        <iqser-icon-button
+            (action)="save()"
+            [buttonId]="'confirm-delete-dossier-state'"
+            [label]="label | translate"
+            [type]="iconButtonTypes.primary"
+        ></iqser-icon-button>
         <div [translate]="'confirm-delete-dossier-state.cancel'" class="all-caps-label cancel" mat-dialog-close></div>
     </div>
 
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html
index 55c248181..1c30af680 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html
@@ -13,18 +13,20 @@
     <span class="small-label">{{ state.dossierCount }}</span>
 </div>
 
-<div class="cell">
+<div [id]="'dossier_' + (state.name | snakeCase)" class="cell">
     <div *ngIf="permissionsService.canPerformDossierStatesActions()" class="action-buttons">
         <div [attr.help-mode-key]="'edit_delete_dossier_state'">
             <iqser-circle-button
                 (action)="openEditStateDialog(state)"
                 [tooltip]="'dossier-states-listing.action.edit' | translate"
+                [buttonId]="'dossier-state-edit-button'"
                 icon="iqser:edit"
             ></iqser-circle-button>
 
             <iqser-circle-button
                 (action)="openConfirmDeleteStateDialog(state)"
                 [tooltip]="'dossier-states-listing.action.delete' | translate"
+                [buttonId]="'dossier-state-delete-button'"
                 icon="iqser:trash"
             ></iqser-circle-button>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts
index 93dad3a49..333590477 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.ts
@@ -14,13 +14,14 @@ import {
 import { MatTooltip } from '@angular/material/tooltip';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgIf } from '@angular/common';
+import { SnakeCasePipe } from '@common-ui/pipes/snake-case.pipe';
 
 @Component({
     selector: 'redaction-dossier-states-table-item',
     templateUrl: './dossier-states-table-item.component.html',
     styleUrls: ['./dossier-states-table-item.component.scss'],
     standalone: true,
-    imports: [MatTooltip, CircleButtonComponent, TranslateModule, NgIf],
+    imports: [MatTooltip, CircleButtonComponent, TranslateModule, NgIf, SnakeCasePipe],
 })
 export class DossierStatesTableItemComponent {
     readonly #dialog = inject(MatDialog);