diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
index edfd9e7ae..10baea1b0 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
@@ -1,6 +1,6 @@
 <section class="dialog">
     <form (submit)="save()" [formGroup]="form">
-        <div [translate]="'edit-redaction.dialog.title-edit-text'" class="dialog-header heading-l"></div>
+        <div [translate]="'edit-redaction.dialog.title'" class="dialog-header heading-l"></div>
 
         <div class="dialog-content redaction">
             <div *ngIf="redactedText" class="iqser-input-group w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
index c1f7dba7a..f272c2b53 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
@@ -1,13 +1,8 @@
 <section class="dialog">
     <form (submit)="save()" [formGroup]="form">
         <div
-            [translate]="
-                isImage
-                    ? 'edit-redaction.dialog.title-edit-image'
-                    : isHint
-                    ? 'edit-redaction.dialog.title-hint'
-                    : 'edit-redaction.dialog.title-edit-text'
-            "
+            [translateParams]="{ type: isImage ? 'image' : isHint ? 'hint' : 'redaction' }"
+            [translate]="'edit-redaction.dialog.title'"
             class="dialog-header heading-l"
         ></div>
 
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts
index e7f904677..912a2b4fd 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.ts
@@ -92,7 +92,7 @@ export class EditRedactionDialogComponent
 
     save(): void {
         const value = this.form.value;
-        this.dialogRef.close({
+        this.close({
             legalBasis: value.reason?.legalBasis ?? '',
             section: value.section,
             comment: value.comment,
diff --git a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts
index 1e18dd0e3..43e6136a1 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts
@@ -134,7 +134,11 @@ export class AnnotationActionsService {
             requests.push(this._manualRedactionService.recategorizeRedactions(recategorizeBody, dossierId, fileId));
         }
 
-        if (result.comment && requests.length) {
+        if (!requests.length) {
+            return;
+        }
+
+        if (result.comment) {
             requests.push(
                 from(Promise.all(annotations.map(a => this._manualRedactionService.addComment(result.comment, a.id, dossierId, fileId)))),
             );
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index 27c9f3c29..42bf5941f 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,7 +1,7 @@
 {
   "ADMIN_CONTACT_NAME": null,
   "ADMIN_CONTACT_URL": null,
-  "API_URL": "https://qa2.iqser.cloud",
+  "API_URL": "https://dan.iqser.cloud",
   "APP_NAME": "RedactManager",
   "IS_DOCUMINE": false,
   "RULE_EDITOR_DEV_ONLY": false,
@@ -13,7 +13,7 @@
   "MAX_RETRIES_ON_SERVER_ERROR": 3,
   "OAUTH_CLIENT_ID": "redaction",
   "OAUTH_IDP_HINT": null,
-  "OAUTH_URL": "https://qa2.iqser.cloud/auth",
+  "OAUTH_URL": "https://dan.iqser.cloud/auth",
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural",
   "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 2efc7d673..74e19c919 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -1239,9 +1239,7 @@
         "section": "",
         "type": ""
       },
-      "title-edit-image": "",
-      "title-edit-text": "",
-      "title-hint": ""
+      "title": ""
     }
   },
   "entities-listing": {
@@ -1927,9 +1925,9 @@
         "search": ""
       }
     },
+    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers",
     "toggle-readable-redactions": "",
-    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen",
-    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers"
+    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen"
   },
   "permissions-screen": {
     "dossier": {
@@ -1958,8 +1956,7 @@
       "auto-expand-filters-on-action": "",
       "load-all-annotations-warning": "",
       "open-structured-view-by-default": "",
-      "table-extraction-type": "",
-      "unapproved-suggestions-warning": ""
+      "table-extraction-type": ""
     },
     "label": "",
     "title": "",
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 748f217ba..a65c84d65 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -1239,9 +1239,7 @@
         "section": "Paragraph / Location",
         "type": "Type"
       },
-      "title-edit-image": "Edit image",
-      "title-edit-text": "Edit redaction",
-      "title-hint": "Edit hint"
+      "title": "Edit {type, select, image{Image} hint{Hint} other{Redaction}}"
     }
   },
   "entities-listing": {
@@ -1927,9 +1925,9 @@
         "search": "Search for selection"
       }
     },
+    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers",
     "toggle-readable-redactions": "Show redactions {active, select, true{as in final document} false{in preview color} other{}}",
-    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} annotation tooltips",
-    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers"
+    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} annotation tooltips"
   },
   "permissions-screen": {
     "dossier": {
@@ -1958,8 +1956,7 @@
       "auto-expand-filters-on-action": "Auto-expand filters on my actions",
       "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview",
       "open-structured-view-by-default": "Display structured component management modal by default",
-      "table-extraction-type": "Table extraction type",
-      "unapproved-suggestions-warning": "Warning regarding unapproved suggestions in document Preview mode"
+      "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
     "title": "Edit preferences",
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 39ee9563b..6745e76d0 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -1239,9 +1239,7 @@
         "section": "",
         "type": ""
       },
-      "title-edit-image": "",
-      "title-edit-text": "",
-      "title-hint": ""
+      "title": ""
     }
   },
   "entities-listing": {
@@ -1927,9 +1925,9 @@
         "search": ""
       }
     },
+    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers grid",
     "toggle-readable-redactions": "",
-    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen",
-    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers grid"
+    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} Kurzinfos für Anmerkungen"
   },
   "permissions-screen": {
     "dossier": {
@@ -1958,8 +1956,7 @@
       "auto-expand-filters-on-action": "",
       "load-all-annotations-warning": "",
       "open-structured-view-by-default": "",
-      "table-extraction-type": "",
-      "unapproved-suggestions-warning": ""
+      "table-extraction-type": ""
     },
     "label": "",
     "title": "",
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index a188b3726..80fb466b0 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -1239,9 +1239,7 @@
         "section": "",
         "type": "Type"
       },
-      "title-edit-image": "",
-      "title-edit-text": "Edit annotation",
-      "title-hint": ""
+      "title": "Edit annotation"
     }
   },
   "entities-listing": {
@@ -1927,9 +1925,9 @@
         "search": "Search for selection"
       }
     },
+    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers grid",
     "toggle-readable-redactions": "Show components {active, select, true{as in final document} false{in preview color} other{}}",
-    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} annotation tooltips",
-    "toggle-layers": "{active, select, true{Disable} false{Enable} other{}} layers grid"
+    "toggle-tooltips": "{active, select, true{Disable} false{Enable} other{}} annotation tooltips"
   },
   "permissions-screen": {
     "dossier": {
@@ -1958,8 +1956,7 @@
       "auto-expand-filters-on-action": "Auto expand filters on my actions",
       "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview",
       "open-structured-view-by-default": "Display Component View by default when opening a document",
-      "table-extraction-type": "Table extraction type",
-      "unapproved-suggestions-warning": "Warning regarding unapproved suggestions in document Preview mode"
+      "table-extraction-type": "Table extraction type"
     },
     "label": "Preferences",
     "title": "Edit preferences",