diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
index 6d0f99f30..74c84e850 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
@@ -15,6 +15,7 @@
                 [noDataText]="'trash.no-data.title' | translate"
                 [noMatchText]="'trash.no-match.title' | translate"
                 [selectionEnabled]="true"
+                [tableItemClasses]="{ disabled: disabledFn }"
                 noDataIcon="red:template"
             ></iqser-table>
         </div>
@@ -22,23 +23,21 @@
 </section>
 
 <ng-template #bulkActions>
-    <div class="bulk-actions">
-        <iqser-circle-button
-            (action)="restore()"
-            *ngIf="canRestoreSelected$ | async"
-            [tooltip]="'trash.bulk.restore' | translate"
-            [type]="circleButtonTypes.dark"
-            icon="red:put-back"
-        ></iqser-circle-button>
+    <iqser-circle-button
+        (action)="restore()"
+        *ngIf="canRestoreSelected$ | async"
+        [tooltip]="'trash.bulk.restore' | translate"
+        [type]="circleButtonTypes.dark"
+        icon="red:put-back"
+    ></iqser-circle-button>
 
-        <iqser-circle-button
-            (action)="hardDelete()"
-            *ngIf="entitiesService.areSomeSelected$ | async"
-            [tooltip]="'trash.bulk.delete' | translate"
-            [type]="circleButtonTypes.dark"
-            icon="red:trash"
-        ></iqser-circle-button>
-    </div>
+    <iqser-circle-button
+        (action)="hardDelete()"
+        *ngIf="entitiesService.areSomeSelected$ | async"
+        [tooltip]="'trash.bulk.delete' | translate"
+        [type]="circleButtonTypes.dark"
+        icon="red:trash"
+    ></iqser-circle-button>
 </ng-template>
 
 <ng-template #filenameTemplate let-entity="entity">
@@ -70,8 +69,10 @@
 </ng-template>
 
 <ng-template #deletedTimeTemplate let-entity="entity">
-    <div class="cell small-label">
-        {{ entity.softDeletedTime | date: 'd MMM. yyyy, hh:mm a' }}
+    <div class="cell">
+        <span class="small-label">
+            {{ entity.softDeletedTime | date: 'd MMM. yyyy, hh:mm a' }}
+        </span>
     </div>
 </ng-template>
 
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss
index 9a9a94345..e69de29bb 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss
@@ -1,17 +0,0 @@
-@import '../../../../../assets/styles/variables';
-
-.bulk-actions {
-    display: flex;
-    align-items: center;
-
-    > *:not(:last-child) {
-        margin-right: 2px;
-    }
-}
-
-.disabled {
-    > div {
-        background-color: $grey-2;
-        color: $grey-7;
-    }
-}
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
index dbba78b24..6dcf85ce1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
@@ -3,11 +3,11 @@ import { Dossier } from '@redaction/red-ui-http';
 import {
     CircleButtonTypes,
     DefaultListingServices,
+    Listable,
     ListingComponent,
     LoadingService,
-    Listable,
-    TableColumnConfig,
-    SortingOrders
+    SortingOrders,
+    TableColumnConfig
 } from '@iqser/common-ui';
 import { AppConfigKey, AppConfigService } from '@app-config/app-config.service';
 import * as moment from 'moment';
@@ -65,6 +65,8 @@ export class TrashScreenComponent extends ListingComponent<DossierListItem> impl
         );
     }
 
+    disabledFn = (dossier: DossierListItem) => !dossier.canRestore;
+
     async ngOnInit(): Promise<void> {
         this._configureTableColumns();
         this._loadingService.start();
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
index a34e4ee96..fc5b1acfe 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
@@ -16,23 +16,21 @@
 </ng-template>
 
 <ng-template #bulkActions>
-    <div class="bulk-actions">
-        <iqser-circle-button
-            (action)="restore()"
-            *ngIf="canRestoreSelected$ | async"
-            [tooltip]="'edit-dossier-dialog.deleted-documents.bulk.restore' | translate"
-            [type]="circleButtonTypes.dark"
-            icon="red:put-back"
-        ></iqser-circle-button>
+    <iqser-circle-button
+        (action)="restore()"
+        *ngIf="canRestoreSelected$ | async"
+        [tooltip]="'edit-dossier-dialog.deleted-documents.bulk.restore' | translate"
+        [type]="circleButtonTypes.dark"
+        icon="red:put-back"
+    ></iqser-circle-button>
 
-        <iqser-circle-button
-            (action)="hardDelete()"
-            *ngIf="entitiesService.areSomeSelected$ | async"
-            [tooltip]="'edit-dossier-dialog.deleted-documents.bulk.delete' | translate"
-            [type]="circleButtonTypes.dark"
-            icon="red:trash"
-        ></iqser-circle-button>
-    </div>
+    <iqser-circle-button
+        (action)="hardDelete()"
+        *ngIf="entitiesService.areSomeSelected$ | async"
+        [tooltip]="'edit-dossier-dialog.deleted-documents.bulk.delete' | translate"
+        [type]="circleButtonTypes.dark"
+        icon="red:trash"
+    ></iqser-circle-button>
 </ng-template>
 
 <ng-template #filenameTemplate let-file="entity">
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss
index c27f06787..38c543ba0 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss
@@ -14,12 +14,3 @@
         @include line-clamp(1);
     }
 }
-
-.bulk-actions {
-    display: flex;
-    align-items: center;
-
-    > *:not(:last-child) {
-        margin-right: 2px;
-    }
-}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
index 4b6a10bf8..5a0559734 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
@@ -5,17 +5,6 @@
 }
 
 :host ::ng-deep iqser-table cdk-virtual-scroll-viewport .cdk-virtual-scroll-content-wrapper .table-item {
-    &.disabled {
-        > div {
-            background-color: $grey-2;
-            color: $grey-7;
-        }
-
-        redaction-file-actions {
-            color: initial;
-        }
-    }
-
     &.last-opened {
         > .selection-column {
             padding-left: 6px !important;
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index 4e961c043..1a87cc9d9 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -28,7 +28,7 @@ export class PermissionsService {
     }
 
     canToggleAnalysis(fileStatus: FileStatusWrapper): boolean {
-        return this._userService.currentUser.isManager && ['UNASSIGNED', 'UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status);
+        return this.isReviewerOrApprover(fileStatus) && ['UNASSIGNED', 'UNDER_REVIEW', 'UNDER_APPROVAL'].includes(fileStatus.status);
     }
 
     canReanalyseFile(fileStatus = this._activeFile): boolean {
diff --git a/libs/common-ui b/libs/common-ui
index 35f1a8d19..6c0f123bd 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 35f1a8d19f78e6be0e54de67735228ba7fc7b883
+Subproject commit 6c0f123bd97148f8696038f63c9951c241b71990