diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.html b/apps/red-ui/src/app/components/notifications/notifications.component.html
index 8b65174a4..5f2b7e66b 100644
--- a/apps/red-ui/src/app/components/notifications/notifications.component.html
+++ b/apps/red-ui/src/app/components/notifications/notifications.component.html
@@ -1,8 +1,8 @@
 <iqser-circle-button
     [matMenuTriggerFor]="menu"
     [showDot]="hasUnreadNotifications$ | async"
-    [tooltip]="'notifications.button-text' | translate"
     [tooltipPosition]="'below'"
+    [tooltip]="'notifications.button-text' | translate"
     buttonId="notification-button"
     icon="red:notification"
 ></iqser-circle-button>
@@ -25,7 +25,7 @@
                         *ngIf="(hasUnreadNotifications$ | async) && first"
                         class="view-all"
                         id="notifications-mark-all-as-read-btn"
-                        stopPropagation
+                        iqserStopPropagation
                     >
                         {{ 'notifications.mark-all-as-read' | translate }}
                     </div>
@@ -37,8 +37,8 @@
                     [class.unread]="!notification.readDate"
                     [id]="'notifications-mark-as-read-' + notification.id + '-btn'"
                     class="notification"
+                    iqserStopPropagation
                     mat-menu-item
-                    stopPropagation
                 >
                     <iqser-initials-avatar [user]="notification.userId"></iqser-initials-avatar>
 
@@ -51,9 +51,9 @@
                         (click)="markRead([notification], !notification.readDate)"
                         [id]="'notifications-mark-' + notification.id"
                         class="dot"
+                        iqserStopPropagation
                         matTooltip="{{ 'notifications.mark-as' | translate : { type: notification.readDate ? 'unread' : 'read' } }}"
                         matTooltipPosition="before"
-                        stopPropagation
                     ></div>
                 </div>
             </div>
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
index de7e1d214..5242f5f5a 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="configService.listingMode$ | async as mode">
-    <div class="file-attribute" [ngClass]="{ 'workflow-attribute': mode === 'workflow' }" (click)="editFileAttribute($event)">
-        <div class="value" [ngClass]="{ 'workflow-value': mode === 'workflow' }">
+    <div (click)="editFileAttribute($event)" [ngClass]="{ 'workflow-attribute': mode === 'workflow' }" class="file-attribute">
+        <div [ngClass]="{ 'workflow-value': mode === 'workflow' }" class="value">
             <b *ngIf="mode === 'workflow' && !isInEditMode"> {{ fileAttribute.label }}: </b>
             <span *ngIf="!isDate; else date" [ngClass]="{ hide: isInEditMode, 'clamp-3': mode !== 'workflow' }">
                 {{ fileAttributeValue || '-' }}</span
@@ -20,14 +20,14 @@
             "
         >
             <div
-                *ngIf="!isInEditMode; else input"
-                class="action-buttons edit-button"
-                [ngClass]="{ 'workflow-edit-button': mode === 'workflow' }"
-                [class.help-mode-button]="helpModeService.isHelpModeActive$ | async"
                 (click)="editFileAttribute($event)"
+                *ngIf="!isInEditMode; else input"
                 [attr.help-mode-key]="'edit-file-attributes'"
+                [class.help-mode-button]="helpModeService.isHelpModeActive$ | async"
+                [ngClass]="{ 'workflow-edit-button': mode === 'workflow' }"
+                class="action-buttons edit-button"
             >
-                <div class="edit-icon" [ngClass]="{ 'workflow-edit-icon': mode === 'workflow' }">
+                <div [ngClass]="{ 'workflow-edit-icon': mode === 'workflow' }" class="edit-icon">
                     <mat-icon [svgIcon]="'iqser:edit'"></mat-icon>
                 </div>
             </div>
@@ -35,15 +35,15 @@
     </div>
 
     <ng-template #input>
-        <div class="edit-input" [ngClass]="{ 'workflow-edit-input': mode === 'workflow' }" stopPropagation>
+        <div [ngClass]="{ 'workflow-edit-input': mode === 'workflow' }" class="edit-input" iqserStopPropagation>
             <form (submit)="save()" [formGroup]="form">
                 <iqser-dynamic-input
                     (closedDatepicker)="closedDatepicker = $event"
                     (keydown.escape)="close()"
                     [formControlName]="fileAttribute.id"
                     [id]="fileAttribute.id"
-                    [type]="fileAttribute.type"
                     [ngClass]="{ 'workflow-input': mode === 'workflow' }"
+                    [type]="fileAttribute.type"
                 ></iqser-dynamic-input>
 
                 <iqser-circle-button
@@ -54,7 +54,7 @@
                     class="save"
                 ></iqser-circle-button>
 
-                <iqser-circle-button (action)="close()" [size]="mode === 'workflow' ? 15 : 34" [icon]="'iqser:close'"></iqser-circle-button>
+                <iqser-circle-button (action)="close()" [icon]="'iqser:close'" [size]="mode === 'workflow' ? 15 : 34"></iqser-circle-button>
             </form>
         </div>
     </ng-template>
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
index 40cd96b34..2c0632a24 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
@@ -1,10 +1,10 @@
-<div class="workflow-item" [class.help-mode-active]="helpModeService?.isHelpModeActive$ | async">
+<div [class.help-mode-active]="helpModeService?.isHelpModeActive$ | async" class="workflow-item">
     <div class="details-wrapper">
         <div class="details">
             <div
+                [attr.help-mode-key]="'workflow_view'"
                 [matTooltip]="file.filename"
                 [routerLink]="file.routerLink | tenant"
-                [attr.help-mode-key]="'workflow_view'"
                 class="filename pointer"
                 matTooltipPosition="above"
             >
@@ -20,7 +20,7 @@
     </div>
 
     <div *ngFor="let config of displayedAttributes" class="small-label mt-8 attribute">
-        <redaction-file-attribute [file]="file" [dossier]="dossier" [fileAttribute]="config"></redaction-file-attribute>
+        <redaction-file-attribute [dossier]="dossier" [fileAttribute]="config" [file]="file"></redaction-file-attribute>
     </div>
 
     <redaction-file-workload [file]="file"></redaction-file-workload>
@@ -31,10 +31,11 @@
         <div #actionsWrapper class="actions-wrapper">
             <redaction-file-actions
                 *ngIf="!file.isProcessing"
+                [attr.help-mode-key]="'workflow_view'"
                 [dossier]="dossier"
                 [file]="file"
                 [maxWidth]="width"
-                [attr.help-mode-key]="'workflow_view'"
+                iqserDisableStopPropagation
                 type="dossier-overview-workflow"
             ></redaction-file-actions>
         </div>
diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
index 01c5b3038..972364348 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import {
     CircleButtonComponent,
+    DisableStopPropagationDirective,
     DynamicInputComponent,
     HasScrollbarDirective,
     IqserAllowDirective,
@@ -70,6 +71,7 @@ const routes: IqserRoutes = [
         DynamicInputComponent,
         IqserAllowDirective,
         TenantPipe,
+        DisableStopPropagationDirective,
     ],
 })
 export class DossierOverviewModule {}
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
index dfd222f5e..7482014ca 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
@@ -13,8 +13,8 @@
             (click)="comments.toggleExpandComments()"
             [matTooltip]="'comments.comments' | translate : { count: annotation.item.comments?.length }"
             class="comments-counter"
+            iqserStopPropagation
             matTooltipPosition="above"
-            stopPropagation
         >
             <mat-icon svgIcon="red:comment"></mat-icon>
             {{ annotation.item.comments.length }}
diff --git a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html
index 8ddd05bf0..3b7c4a0a2 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.html
@@ -33,7 +33,7 @@
     <div
         (click)="toggleExpandComments()"
         class="all-caps-label pointer hide-comments"
-        stopPropagation
+        iqserStopPropagation
         translate="comments.hide-comments"
     ></div>
 </ng-container>
diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
index 771002e53..78c824d35 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
@@ -29,9 +29,9 @@
                 *ngIf="documentInfoService.hidden()"
                 [actionsTemplate]="annotationFilterActionTemplate"
                 [attr.help-mode-key]="'workload_in_editor'"
+                [fileId]="state.file()?.id"
                 [primaryFiltersSlug]="'primaryFilters'"
                 [secondaryFiltersSlug]="'secondaryFilters'"
-                [fileId]="state.file()?.id"
             ></iqser-popup-filter>
         </div>
     </div>
@@ -217,6 +217,6 @@
         *ngIf="filter.id === 'skipped'"
         [icon]="skippedService.hideSkipped() ? 'red:visibility-off' : 'red:visibility'"
         [type]="circleButtonTypes.dark"
-        preventDefault
+        iqserPreventDefault
     ></iqser-circle-button>
 </ng-template>
diff --git a/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html b/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html
index e6a250561..ead328b06 100644
--- a/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html
+++ b/apps/red-ui/src/app/modules/search/search-item-template/search-item-template.component.html
@@ -22,7 +22,7 @@
             {{ 'search-screen.missing' | translate }}:<span *ngFor="let term of unmatched"
                 >&nbsp;<s>{{ term }}</s></span
             >.&nbsp;{{ 'search-screen.must-contain' | translate }}:
-            <span (click)="mustContain.emit(term)" *ngFor="let term of unmatched" stopPropagation
+            <span (click)="mustContain.emit(term)" *ngFor="let term of unmatched" iqserStopPropagation
                 >&nbsp;<u>{{ term }}</u></span
             >
         </span>
@@ -50,7 +50,7 @@
 <div class="cell small-label full-opacity stats-subtitle">
     <div>
         <mat-icon *ngIf="item.archived" svgIcon="red:archive"></mat-icon>
-        <a [routerLink]="routerLink | tenant" stopPropagation> {{ item.dossierName }}</a>
+        <a [routerLink]="routerLink | tenant" iqserStopPropagation> {{ item.dossierName }}</a>
     </div>
 </div>
 
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
index a39644661..b444ecbf5 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
@@ -67,7 +67,7 @@
                         (click)="!disabled && toggleApprover(userId)"
                         *ngIf="!disabled || isApprover(userId)"
                         class="make-approver"
-                        stopPropagation
+                        iqserStopPropagation
                     >
                         <iqser-round-checkbox
                             [active]="isApprover(userId)"
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
index 008b6dea9..783dbda92 100644
--- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
@@ -36,7 +36,7 @@
             [matTooltip]="btn.tooltip | translate"
             [ngClass]="btn.class"
             color="primary"
-            stopPropagation
+            iqserStopPropagation
         ></mat-slide-toggle>
     </div>
 </ng-container>
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.html b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
index ebdd68eaf..8eac16b2a 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
@@ -5,14 +5,14 @@
             (click)="selectAll()"
             [class.disabled]="disabled"
             class="all-caps-label primary pointer"
-            stopPropagation
+            iqserStopPropagation
             translate="actions.all"
         ></div>
         <div
             (click)="deselectAll()"
             [class.disabled]="disabled"
             class="all-caps-label primary pointer"
-            stopPropagation
+            iqserStopPropagation
             translate="actions.none"
         ></div>
     </div>
diff --git a/libs/common-ui b/libs/common-ui
index f33ada72f..137a62338 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit f33ada72f4fe41dc8eb2f51142b657c2b7e856b8
+Subproject commit 137a62338ce5c890fe337ab8da8bbe9279463730