diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
index 04d03eabd..cdb189220 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
@@ -18,6 +18,7 @@
         [id]="'assign-reviewer'"
         [translate]="'file-preview.assign-reviewer'"
         class="assign-reviewer pointer"
+        iqserStopPropagation
     ></div>
 
     <redaction-assign-user-dropdown
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
index e067c2f5f..52328de72 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dictionary-dialog/edit-dictionary-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, HostListener } from '@angular/core';
 import {
     CircleButtonComponent,
     IconButtonComponent,
@@ -59,6 +59,11 @@ export class EditDictionaryDialogComponent extends IqserDialogComponent<EditDict
         super();
     }
 
+    @HostListener('window:keydown.Escape')
+    closeOnEscape(): void {
+        this.close();
+    }
+
     async save() {
         this._loadingService.start();
         try {
@@ -68,12 +73,13 @@ export class EditDictionaryDialogComponent extends IqserDialogComponent<EditDict
                 this.data.dossierId,
                 this.form.controls.addToDictionaryAction.value,
             );
+            this.close(this.form.value as ReturnType);
         } catch (error) {
             console.error(error);
             this._toaster.error(_('edit-dossier-dialog.dictionary.edit-dialog.error.generic'));
+            this.close();
         }
 
         this._loadingService.stop();
-        this.close(this.form.value as ReturnType);
     }
 }
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
index 32956edf3..727bec369 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
@@ -39,6 +39,7 @@
                             *ngIf="selectedDictionary.dossierDictionaryOnly && selectedDictionary.hasDictionary"
                             (action)="openEditDictionaryModal()"
                             [size]="20"
+                            [tooltip]="'edit-dossier-dialog.dictionary.edit-button-tooltip' | translate"
                             icon="iqser:edit"
                             class="p-left-8"
                         ></iqser-circle-button>
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
index c0e90fa3c..d517176d8 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts
@@ -118,7 +118,9 @@ export class EditDossierDictionaryComponent implements OnInit {
             })
             .result();
 
-        this.selectedDictionary = { ...this.selectedDictionary, addToDictionaryAction: result.addToDictionaryAction } as Dictionary;
+        if (result) {
+            this.selectedDictionary = { ...this.selectedDictionary, addToDictionaryAction: result.addToDictionaryAction } as Dictionary;
+        }
         await this.#retrieveDictionaries();
     }
 
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 0e26ac601..860838595 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -1142,6 +1142,7 @@
     "change-successful": "Dossier wurde aktualisiert.",
     "delete-successful": "Dossier wurde gelöscht.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "Available in add/edit dialogs in this dossier",
         "cancel": "Cancel",
@@ -1999,7 +2000,7 @@
         "revert-text": "Revert to selected text",
         "type": "Type",
         "type-placeholder": "Select type...",
-        "unchanged": ""
+        "unchanged": "Unchanged"
       },
       "title": "Redact text"
     }
@@ -2064,15 +2065,15 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of this dossier.",
-            "description-bulk": "Do not auto-redact the selected term in this dossier.",
+            "description": "Do not {type, select, hint{annotate} other{auto-redact}} the selected term in any document of this dossier.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{auto-redact}} the selected terms in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
             "label-bulk": "Remove from dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in this document.",
-            "description-bulk": "Do not redact the selected terms at this position in this document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in the current document.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{redact}} the selected terms at this position in the current document.",
             "label": "Remove here"
           }
         }
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index e86ebf3a0..47ba6ea5a 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -1142,6 +1142,7 @@
     "change-successful": "Dossier {dossierName} was updated.",
     "delete-successful": "Dossier {dossierName} was deleted.",
     "dictionary": {
+      "edit-button-tooltip": "Edit dossier dictionary settings",
       "edit-dialog": {
         "add-to-dictionary-action": "Available in add/edit dialogs in this dossier",
         "cancel": "Cancel",
@@ -2064,15 +2065,15 @@
             "label": "Remove from dossier in this context"
           },
           "in-dossier": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the selected term in any document of this dossier.",
-            "description-bulk": "Do not auto-redact the selected term in this dossier.",
+            "description": "Do not {type, select, hint{annotate} other{auto-redact}} the selected term in any document of this dossier.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{auto-redact}} the selected terms in this dossier.",
             "extraOptionLabel": "Apply to all active and future dossiers",
             "label": "Remove from dossier",
             "label-bulk": "Remove from dossier"
           },
           "only-here": {
-            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in this document.",
-            "description-bulk": "Do not redact the selected terms at this position in this document.",
+            "description": "Do not {type, select, hint{annotate} other{redact}} the term at this position in the current document.",
+            "description-bulk": "Do not {type, select, hint{annotate} other{redact}} the selected terms at this position in the current document.",
             "label": "Remove here"
           }
         }
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index a18f19a8b..f50f33814 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -1142,6 +1142,7 @@
     "change-successful": "Dossier wurde aktualisiert.",
     "delete-successful": "Dossier wurde gelöscht.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "",
         "cancel": "",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 59eef38e6..918b40680 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -1142,6 +1142,7 @@
     "change-successful": "Dossier {dossierName} was updated.",
     "delete-successful": "Dossier {dossierName} was deleted.",
     "dictionary": {
+      "edit-button-tooltip": "",
       "edit-dialog": {
         "add-to-dictionary-action": "",
         "cancel": "",
diff --git a/apps/red-ui/src/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss
index 6db455dfe..12edd9c34 100644
--- a/apps/red-ui/src/assets/styles/red-theme.scss
+++ b/apps/red-ui/src/assets/styles/red-theme.scss
@@ -1,4 +1,3 @@
-@use 'ngx-toastr/toastr';
 @use 'red-material-theme';
 @use 'red-components';
 @use 'red-editor';