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 f483491fb..cd883f28c 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
@@ -11,6 +11,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="resized ? ('annotation-actions.resize-accept.label' | translate) : ''"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:check"
         ></iqser-circle-button>
 
@@ -19,6 +20,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.resize-cancel.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:close"
         ></iqser-circle-button>
     </ng-container>
@@ -28,20 +30,20 @@
         <iqser-circle-button
             (action)="resize()"
             *ngIf="canResize"
-            [attr.help-mode-key]="helpModeKey('resize')"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.resize.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="helpModeKey('resize')"
             icon="red:resize"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.editRedaction(annotations)"
             *ngIf="canEdit"
-            [attr.help-mode-key]="helpModeKey('edit')"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.edit-redaction.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="helpModeKey('edit')"
             icon="iqser:edit"
         ></iqser-circle-button>
 
@@ -51,6 +53,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.accept-recommendation.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:check"
         ></iqser-circle-button>
 
@@ -60,6 +63,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.convert-highlights.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:convert"
         ></iqser-circle-button>
 
@@ -69,6 +73,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.remove-highlights.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:trash"
         ></iqser-circle-button>
 
@@ -78,6 +83,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.undo' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:undo"
         ></iqser-circle-button>
 
@@ -87,6 +93,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.undo' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:undo"
         ></iqser-circle-button>
 
@@ -96,6 +103,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.see-references.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:reference"
         ></iqser-circle-button>
 
@@ -105,6 +113,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.force-redaction.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:thumb-up"
         ></iqser-circle-button>
 
@@ -114,6 +123,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.force-hint.label' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:thumb-up"
         ></iqser-circle-button>
 
@@ -123,6 +133,7 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.hide' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:visibility-off"
         ></iqser-circle-button>
 
@@ -132,16 +143,17 @@
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.show' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:visibility"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="removeRedaction()"
             *ngIf="canRemoveRedaction"
-            [attr.help-mode-key]="helpModeKey('remove')"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.remove-annotation.remove-redaction' | translate"
             [type]="buttonType"
+            [attr.help-mode-key]="helpModeKey('remove')"
             icon="iqser:trash"
         ></iqser-circle-button>
     </ng-container>
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts
index 219ad821b..bb4f0ebb2 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts
@@ -31,6 +31,7 @@ export class AnnotationActionsComponent implements OnChanges {
     @Input() tooltipPosition: 'before' | 'above' = 'before';
     @Input() canPerformAnnotationActions: boolean;
     @Input() alwaysVisible: boolean;
+    @Input() actionsHelpModeKey: string;
     readonly roles = Roles;
     annotationPermissions: AnnotationPermissions;
     isImage = true;
@@ -156,7 +157,7 @@ export class AnnotationActionsComponent implements OnChanges {
     }
 
     helpModeKey(action: string) {
-        return this.#isDocumine ? `${action}_annotation` : '';
+        return this.#isDocumine ? `${action}_annotation` : this.actionsHelpModeKey;
     }
 
     #setPermissions() {
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
index b86f9db37..962c48416 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html
@@ -23,7 +23,7 @@
         <div *ngIf="multiSelectService.inactive()" class="actions">
             <redaction-annotation-actions
                 [annotations]="[annotation.item]"
-                [attr.help-mode-key]="actionsHelpModeKey"
+                [actionsHelpModeKey]="actionsHelpModeKey"
                 [canPerformAnnotationActions]="pdfProxyService.canPerformActions()"
             ></redaction-annotation-actions>
         </div>
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
index 3b2c9775c..33f94a0ec 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts
@@ -18,7 +18,7 @@ export class AnnotationWrapperComponent implements OnChanges {
     @Input({ required: true }) annotation!: ListItem<AnnotationWrapper>;
     @HostBinding('attr.annotation-id') annotationId: string;
     @HostBinding('class.active') active = false;
-    actionsHelpModeKey?: string;
+    actionsHelpModeKey: string;
     showComments = false;
 
     ngOnChanges() {
diff --git a/apps/red-ui/src/app/modules/file-preview/utils/constants.ts b/apps/red-ui/src/app/modules/file-preview/utils/constants.ts
index 3abcf54fc..066da5374 100644
--- a/apps/red-ui/src/app/modules/file-preview/utils/constants.ts
+++ b/apps/red-ui/src/app/modules/file-preview/utils/constants.ts
@@ -15,8 +15,8 @@ export const ActionsHelpModeKeys = {
     skipped: 'skipped',
     hint: 'hint_text',
     'hint-ocr': 'hint_picture',
-    'hint-formula': 'picture',
-    'hint-image': 'hint_images',
+    'hint-formula': 'hint_picture',
+    'hint-image': 'hint_picture',
 } as const;
 
 export const ALL_HOTKEYS: List = ['Escape', 'F', 'f', 'ArrowUp', 'ArrowDown', 'H', 'h'] as const;
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index 4ff625fef..14f119496 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -54,7 +54,8 @@
                             <ng-container *ngFor="let dossierTemplate of dossierTemplates">
                                 <mat-option
                                     [value]="dossierTemplate"
-                                    *ngIf="!currentDossierTemplateId || dossierTemplate?.id !== selectedDossierTemplate.id"
+                                    *ngIf="!initialDossierTemplateId || dossierTemplate?.id !== selectedDossierTemplate.id"
+                                    [class.mat-mdc-option-active]="false"
                                 >
                                     {{ dossierTemplate.id ? dossierTemplate.name : (dossierTemplate.name | translate) }}
                                 </mat-option>
@@ -71,7 +72,7 @@
                             [placeholder]="selectedDossier.dossierId ? selectedDossier.dossierName : (selectDictionary.label | translate)"
                         >
                             <ng-container *ngFor="let dossier of dossiers; let index = index">
-                                <mat-option *ngIf="dossier.dossierId !== selectedDossier.dossierId" [value]="dossier">
+                                <mat-option *ngIf="dossier.dossierId !== selectedDossier.dossierId" [value]="dossier" [class.mat-mdc-option-active]="false">
                                     {{ dossier.dossierName }}
                                 </mat-option>
                                 <mat-divider
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 9aee6a98a..c601cb320 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
@@ -134,18 +134,6 @@
     "scrollableParentView": "ANNOTATIONS_LIST",
     "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
   },
-  {
-    "elementKey": "picture",
-    "documentKey": "picture",
-    "scrollableParentView": "ANNOTATIONS_LIST",
-    "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
-  },
-  {
-    "elementKey": "hint_images",
-    "documentKey": "hint_images",
-    "scrollableParentView": "ANNOTATIONS_LIST",
-    "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
-  },
   {
     "elementKey": "workload_in_editor",
     "documentKey": "workload_in_editor",