diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html
index 22a89ba5b..fbf8b9e0c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html
@@ -1,7 +1,7 @@
 <div class="content-container" iqserHasScrollbar>
     <div class="dialog">
         <div class="dialog-header">
-            <div [translate]="'entity.info.heading'" class="heading-l"></div>
+            <div [translate]="'entity.info.heading'" [attr.help-mode-key]="'entity_info'" class="heading-l"></div>
 
             <div *ngIf="!permissionsService.canEditEntities()" class="read-only-indicator all-caps-label primary">
                 <mat-icon class="mr-8" svgIcon="red:read-only"></mat-icon>
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.html b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.html
index 0e328765d..d8fa1b64c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-details/dossier-template-details.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="componentContext$ | async as ctx">
     <ng-container *ngIf="ctx.dossierTemplate && ctx.stats">
-        <div class="heading-xl mb-24">{{ ctx.dossierTemplate.name }}</div>
+        <div class="heading-xl mb-24" [attr.help-mode-key]="'dossier_templates_info'">{{ ctx.dossierTemplate.name }}</div>
 
         <div class="info-wrapper">
             <div class="created-by-wrapper">
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
index 5ad404b91..7a79edcb1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html
@@ -16,7 +16,7 @@
     </div>
 </div>
 
-<div *ngIf="watermark$ | async" class="right-container" iqserHasScrollbar>
+<div *ngIf="watermark$ | async" class="right-container" [attr.help-mode-key]="'watermarks'" iqserHasScrollbar>
     <form (keyup)="configChanged()" [formGroup]="form">
         <div class="iqser-input-group required w-300">
             <label [translate]="'watermark-screen.form.name-label'"></label>
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html
index 127dafc0b..a6a68b376 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html
@@ -103,7 +103,7 @@
         <iqser-circle-button
             (action)="annotationActionsService.forceAnnotation(annotations)"
             *ngIf="canForceRedaction"
-            [attr.help-mode-key]="helpModeKey('force')"
+            [attr.help-mode-key]="isImageHint ? helpModeKey('redact') : helpModeKey('force')"
             [buttonId]="annotations.length === 1 ? 'annotation-' + annotations[0].id + '-force_redaction' : 'annotations-force_redaction'"
             [icon]="isImageHint ? 'red:pdftron-action-add-redaction' : 'iqser:thumb-up'"
             [tooltipPosition]="tooltipPosition"
diff --git a/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.html b/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.html
index df427a42a..dfb5361f3 100644
--- a/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.html
@@ -1,6 +1,6 @@
 <div #filenameColumn>
     <div
-        [attr.help-mode-key]="'document_list'"
+        [attr.help-mode-key]="'document_in_editor'"
         [class.error]="file.isError"
         [class.initial-processing]="file.isInitialProcessing || (ocrByDefault && !file.lastOCRTime)"
         [matTooltip]="file.filename"
diff --git a/apps/red-ui/src/assets/help-mode/help-mode-keys.json b/apps/red-ui/src/assets/help-mode/help-mode-keys.json
index 160c48874..bab5118aa 100644
--- a/apps/red-ui/src/assets/help-mode/help-mode-keys.json
+++ b/apps/red-ui/src/assets/help-mode/help-mode-keys.json
@@ -59,7 +59,11 @@
   },
   {
     "elementKey": "document_list",
-    "documentKey": "document_list",
+    "documentKey": "document_list"
+  },
+  {
+    "elementKey": "document_in_editor",
+    "documentKey": "document_in_editor",
     "scrollableParentView": "VIRTUAL_SCROLL"
   },
   {
@@ -188,6 +192,12 @@
     "scrollableParentView": "ANNOTATIONS_LIST",
     "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
   },
+  {
+    "elementKey": "hint_redact",
+    "documentKey": "hint_redact",
+    "scrollableParentView": "ANNOTATIONS_LIST",
+    "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
+  },
   {
     "elementKey": "workload_in_editor",
     "documentKey": "workload_in_editor",
@@ -270,6 +280,10 @@
     "elementKey": "entities",
     "documentKey": "entities"
   },
+  {
+    "elementKey": "entity_info",
+    "documentKey": "entity_info"
+  },
   {
     "elementKey": "user_dossier_template_entities",
     "documentKey": "user_dossier_template_entities"
diff --git a/libs/common-ui b/libs/common-ui
index 845c81939..98ac49fbc 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 845c819392bc5f73a5feb584dc879e965107a9c0
+Subproject commit 98ac49fbc81bb9989c14a8ca06c11d98ed042c86