diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
index e82b1ed37..88f644372 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -46,7 +46,7 @@
 
         <div class="dialog-actions">
             <iqser-icon-button
-                (click)="save()"
+                (action)="save()"
                 [disabled]="disabled"
                 [label]="'add-edit-dossier-state.save' | translate"
                 [submit]="true"
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html
index 69bb70b4b..3b86f6063 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html
@@ -14,7 +14,6 @@
 
     <div class="dialog-actions">
         <iqser-icon-button
-            (click)="save()"
             [disabled]="disabled"
             [label]="'add-entity.save' | translate"
             [submit]="true"
@@ -23,5 +22,5 @@
         <iqser-help-button *deny="roles.getRss" helpButtonKey="create_new_entity"></iqser-help-button>
     </div>
 
-    <iqser-circle-button (click)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
+    <iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
 </section>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
index 0d11fa52f..a66270114 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
@@ -23,7 +23,7 @@
     <div class="dialog-actions">
         <ng-container *ngIf="!isInConfiguration">
             <iqser-icon-button
-                (click)="toggleIsInConfiguration()"
+                (action)="toggleIsInConfiguration()"
                 [label]="'digital-signature-dialog.actions.continue' | translate"
                 [type]="iconButtonTypes.primary"
             ></iqser-icon-button>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
index 341b91181..d392e69e3 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.html
@@ -29,7 +29,7 @@
 
         <div class="dialog-actions">
             <iqser-icon-button
-                (click)="save()"
+                (action)="save()"
                 [disabled]="disabled"
                 [label]="'edit-color-dialog.save' | translate"
                 [submit]="true"
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
index fdbb645b9..06770fbad 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
@@ -75,7 +75,7 @@
                     </div>
                     <div class="actions">
                         <iqser-circle-button
-                            (click)="isSearchOpen = !isSearchOpen"
+                            (action)="isSearchOpen = !isSearchOpen"
                             [attr.aria-expanded]="isSearchOpen"
                             icon="iqser:search"
                         ></iqser-circle-button>
@@ -132,7 +132,7 @@
                 <div class="csv-part-header">
                     <div [translate]="'file-attributes-csv-import.csv-column'" class="all-caps-label"></div>
                     <iqser-circle-button
-                        (click)="previewExpanded = !previewExpanded"
+                        (action)="previewExpanded = !previewExpanded"
                         [icon]="previewExpanded ? 'iqser:expand' : 'iqser:collapse'"
                     ></iqser-circle-button>
                 </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index 2ca5f31e4..5b12e3b78 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -45,7 +45,7 @@
 
 <ng-template #bulkActions>
     <iqser-circle-button
-        (click)="openConfirmDeleteAttributeDialog($event)"
+        (action)="openConfirmDeleteAttributeDialog($event)"
         *ngIf="permissionsService.canEditGlobalFileAttributes() && (listingService.areSomeSelected$ | async)"
         [tooltip]="'file-attributes-listing.bulk-actions.delete' | translate"
         [type]="circleButtonTypes.dark"
@@ -87,8 +87,8 @@
             (action)="openAddEditAttributeDialog($event)"
             *ngIf="permissionsService.canEditGlobalFileAttributes()"
             [iqserHelpMode]="'create_new_file_attribute'"
-            [overlappingElements]="['USER_MENU']"
             [label]="'file-attributes-listing.add-new' | translate"
+            [overlappingElements]="['USER_MENU']"
             [type]="iconButtonTypes.primary"
             icon="iqser:plus"
         ></iqser-icon-button>
diff --git a/libs/common-ui b/libs/common-ui
index daa92eecc..a2bde131a 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit daa92eeccf25713f75f674ab0b8a4df0becdb083
+Subproject commit a2bde131ad18b2278d7564a22c15b7dab5bed069