diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
index 1b3b7c66a..47e3f849e 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
@@ -70,7 +70,7 @@
             <p class="download-includes">{{ 'download-includes' | translate }}</p>
             <div class="d-flex">
                 <redaction-select
-                    [height]="150"
+                    [height]="165"
                     [label]="'report-type.label' | translate: { length: reportTemplateIdsLength }"
                     [optionTemplate]="reportTemplateOptionTemplate"
                     [options]="availableReportTypes"
@@ -79,7 +79,7 @@
                     formControlName="reportTemplateIds"
                 ></redaction-select>
                 <redaction-select
-                    [height]="150"
+                    [height]="165"
                     [label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
                     [options]="downloadTypes"
                     formControlName="downloadFileTypes"
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
index 00e585c58..9ef9e3101 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
@@ -67,7 +67,7 @@
                 <input formControlName="classification" name="classification" type="text" />
             </div>
 
-            <div [class.required]="!isDocumentAdmin" class="iqser-input-group w-300">
+            <div [class.required]="commentIsMandatory" class="iqser-input-group w-300">
                 <label translate="manual-annotation.dialog.content.comment"></label>
                 <textarea formControlName="comment" name="comment" redactionHasScrollbar rows="4" type="text"></textarea>
             </div>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index 593e776ab..cd7c01318 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -113,11 +113,15 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
             dictionary: this.isDictionaryRequest
                 ? [this.isFalsePositiveRequest ? 'false_positive' : null, Validators.required]
                 : ['manual', Validators.required],
-            comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
+            comment: this.commentIsMandatory ? [null, Validators.required] : [null],
             classification: ['non-readable content'],
         });
     }
 
+    get commentIsMandatory() {
+        return !this.isDocumentAdmin && !this.isDictionaryRequest;
+    }
+
     private _enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
         const legalOption: LegalBasisOption = this.form.get('reason').value;
         addRedactionRequest.type = this.form.get('dictionary').value;
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
index 287629e70..2b53655ae 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
@@ -39,7 +39,7 @@
                 </li>
             </ul>
 
-            <div [class.required]="!permissionsService.isApprover(this.data.dossier)" class="iqser-input-group w-300">
+            <div [class.required]="commentIsMandatory" class="iqser-input-group w-300">
                 <label translate="manual-annotation.dialog.content.comment"></label>
                 <textarea formControlName="comment" iqserHasScrollbar name="comment" rows="4" type="text"></textarea>
             </div>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
index 16591d344..644798066 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
@@ -29,7 +29,7 @@ export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
     ) {
         super(_injector, _dialogRef);
         this.form = this._formBuilder.group({
-            comment: this.permissionsService.isApprover(this.data.dossier) ? [null] : [null, Validators.required],
+            comment: this.commentIsMandatory ? [null, Validators.required] : [null],
         });
         this.initialFormValue = this.form.getRawValue();
     }
@@ -38,6 +38,14 @@ export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
         this._dialogRef.close({ comment: this.form.getRawValue().comment });
     }
 
+    get disabled(): boolean {
+        return !this.valid;
+    }
+
+    get commentIsMandatory() {
+        return !this.permissionsService.isApprover(this.data.dossier) && !this.data.removeFromDictionary;
+    }
+
     printable(annotation: AnnotationWrapper) {
         if (annotation.isImage) {
             return this._translateService.instant('remove-annotations-dialog.image-type', {
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
index 9ae92f1b8..d53cd243f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
@@ -1,7 +1,7 @@
 <div class="needs-work">
     <redaction-annotation-icon *ngIf="file.analysisRequired" [color]="analysisColor" label="A" type="square"></redaction-annotation-icon>
     <redaction-annotation-icon
-        *ngIf="file.hasUpdates && file.assignee === userService.currentUser.id"
+        *ngIf="file.hasUpdates && file.assignee === userService.currentUser.id && !file.isApproved"
         [color]="updatedColor"
         label="U"
         type="square"
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss
index b7ca8fa44..502187c53 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss
@@ -1,3 +1,11 @@
+@use 'variables';
+
 :host {
     display: contents;
 }
+
+.disabled {
+    background-color: variables.$grey-6;
+    color: variables.$grey-3;
+    cursor: default;
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index 006d1700e..94c953662 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -10,6 +10,7 @@ import {
     ErrorService,
     FilterService,
     LoadingService,
+    NestedFilter,
     OnAttach,
     OnDetach,
     processFilters,
@@ -652,12 +653,15 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             return;
         }
 
+        const currentFilters = this._filterService.getGroup('primaryFilters')?.filters || [];
         this.rebuildFilters();
 
         if (this.viewModeService.viewMode === 'STANDARD') {
             const startTime = new Date().getTime();
             const newAnnotations = newAnnotationsFilter ? this.visibleAnnotations.filter(newAnnotationsFilter) : this.visibleAnnotations;
-            this._handleDeltaAnnotationFilters(currentAnnotations ?? [], newAnnotations);
+            if (currentFilters) {
+                this._handleDeltaAnnotationFilters(currentFilters, this.visibleAnnotations);
+            }
             await this._redrawAnnotations(newAnnotations);
             console.log(
                 `[REDACTION] Annotations redraw time: ${new Date().getTime() - startTime} ms for ${newAnnotations.length} annotations`,
@@ -675,7 +679,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         );
     }
 
-    private _handleDeltaAnnotationFilters(currentPageAnnotations: AnnotationWrapper[], newPageAnnotations: AnnotationWrapper[]) {
+    private _handleDeltaAnnotationFilters(currentFilters: NestedFilter[], newAnnotations: AnnotationWrapper[]) {
         const primaryFilterGroup = this._filterService.getGroup('primaryFilters');
         const primaryFilters = primaryFilterGroup.filters;
         const secondaryFilters = this._filterService.getGroup('secondaryFilters').filters;
@@ -685,10 +689,9 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             return;
         }
 
-        const oldPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(currentPageAnnotations);
-        const newPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(newPageAnnotations);
+        const newPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(newAnnotations);
 
-        handleFilterDelta(oldPageSpecificFilters, newPageSpecificFilters, primaryFilters);
+        handleFilterDelta(currentFilters, newPageSpecificFilters, primaryFilters);
         this._filterService.addFilterGroup({
             ...primaryFilterGroup,
             filters: primaryFilters,
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
index 11117e8b3..d0dbfeaa8 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
@@ -21,7 +21,8 @@
 
         .mat-chip-list-wrapper {
             height: 100%;
-            overflow: scroll;
+            overflow-x: hidden;
+            overflow-y: auto;
         }
     }
 }
diff --git a/apps/red-ui/src/app/utils/filter-utils.ts b/apps/red-ui/src/app/utils/filter-utils.ts
index 1b08223df..073584694 100644
--- a/apps/red-ui/src/app/utils/filter-utils.ts
+++ b/apps/red-ui/src/app/utils/filter-utils.ts
@@ -23,6 +23,8 @@ export function handleFilterDelta(oldFilters: INestedFilter[], newFilters: INest
         }
     }
 
+    console.log(newFiltersDelta);
+
     for (const key of Object.keys(newFiltersDelta)) {
         const foundFilter = allFilters.find(f => f.id === key);
         if (foundFilter) {
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index 1a8b3d270..582fde488 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -31,7 +31,7 @@ export function hexToRgb(hex) {
 export function getFirstRelevantTextPart(text, direction: 'FORWARD' | 'BACKWARD') {
     let spaceCount = 0;
     let accumulator = '';
-    const breakChars = ['/', ':', ' '];
+    const breakChars = [':', ' '];
 
     const handle = i => {
         const char = text[i];