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 cd883f28c..269430b63 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
@@ -7,20 +7,20 @@
     <ng-container *ngIf="resizing && annotationPermissions.canResizeAnnotation">
         <iqser-circle-button
             (action)="acceptResize()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [class.disabled]="!resized"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="resized ? ('annotation-actions.resize-accept.label' | translate) : ''"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:check"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="cancelResize()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.resize-cancel.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:close"
         ></iqser-circle-button>
     </ng-container>
@@ -30,130 +30,130 @@
         <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"
+            icon="iqser: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>
 
         <iqser-circle-button
             (action)="acceptRecommendation()"
             *ngIf="canAcceptRecommendation"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.accept-recommendation.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:check"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.convertHighlights(annotations)"
             *ngIf="viewModeService.isEarmarks()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.convert-highlights.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:convert"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.removeHighlights(annotations)"
             *ngIf="viewModeService.isEarmarks()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.remove-highlights.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="iqser:trash"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.undoDirectAction(annotations)"
             *allow="roles.redactions.deleteManual; if: annotationPermissions.canUndo"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.undo' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:undo"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.undoDirectAction(annotations)"
             *allow="roles.redactions.deleteManual; if: annotationPermissions.canUndo"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.undo' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:undo"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationReferencesService.show(annotations[0])"
             *ngIf="multiSelectService.inactive() && annotations[0].reference.length"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.see-references.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:reference"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.forceAnnotation(annotations)"
             *ngIf="canForceRedaction"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.force-redaction.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
-            icon="red:thumb-up"
+            icon="iqser:thumb-up"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="annotationActionsService.forceAnnotation(annotations, true)"
             *ngIf="canForceHint"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.force-hint.label' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
-            icon="red:thumb-up"
+            icon="iqser:thumb-up"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="hideAnnotation()"
             *ngIf="isImage && isVisible()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [tooltipPosition]="tooltipPosition"
             [tooltip]="'annotation-actions.hide' | translate"
             [type]="buttonType"
-            [attr.help-mode-key]="actionsHelpModeKey"
             icon="red:visibility-off"
         ></iqser-circle-button>
 
         <iqser-circle-button
             (action)="showAnnotation()"
             *ngIf="isImage && !isVisible()"
+            [attr.help-mode-key]="actionsHelpModeKey"
             [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/services/pdf-annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts
index 5bc948141..dae0111cf 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts
@@ -33,7 +33,7 @@ export class PdfAnnotationActionsService {
             const firstAnnotation = annotations[0];
             // if we already entered resize-mode previously
             if (firstAnnotation.id === this.#annotationManager.resizingAnnotationId) {
-                let acceptResizeButton;
+                let acceptResizeButton: IHeaderElement;
                 if (this.#annotationManager.annotationHasBeenResized) {
                     acceptResizeButton = this.#getButton('check', _('annotation-actions.resize-accept.label'), () =>
                         this.#annotationActionsService.acceptResize(firstAnnotation),
@@ -107,7 +107,7 @@ export class PdfAnnotationActionsService {
     #getButton(icon: string, title: string, action: () => void | Promise<void>): IHeaderElement {
         return {
             type: 'actionButton',
-            img: this.#convertPath(`/assets/icons/general/${icon}.svg`),
+            img: this.#convertPath(`/assets/icons/${icon}.svg`),
             title: this.#translateService.instant(title),
             onClick: () => this.#ngZone.run(async () => action()),
         };
diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts
index d634861b4..45e74b71f 100644
--- a/apps/red-ui/src/app/modules/icons/icons.module.ts
+++ b/apps/red-ui/src/app/modules/icons/icons.module.ts
@@ -12,7 +12,10 @@ import { getConfig } from '@common-ui/services';
 export class IconsModule {
     readonly config = getConfig();
 
-    constructor(private readonly _iconRegistry: MatIconRegistry, private readonly _sanitizer: DomSanitizer) {
+    constructor(
+        private readonly _iconRegistry: MatIconRegistry,
+        private readonly _sanitizer: DomSanitizer,
+    ) {
         const icons = [
             'ai',
             'alert-circle',
@@ -70,7 +73,6 @@ export class IconsModule {
             'reference',
             'remove-from-dict',
             'report',
-            'resize',
             'rotation',
             'rss',
             'rule',
@@ -79,8 +81,6 @@ export class IconsModule {
             'status',
             'status-info',
             'template',
-            'thumb-down',
-            'thumb-up',
             'under-construction',
             'undo',
             'user',
diff --git a/apps/red-ui/src/assets/icons/general/check.svg b/apps/red-ui/src/assets/icons/general/check.svg
deleted file mode 100644
index 65f074eb0..000000000
--- a/apps/red-ui/src/assets/icons/general/check.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Capa_1" style="enable-background:new 0 0 426.667 426.667;" version="1.1"
-     viewBox="0 0 426.667 426.667" x="0px"
-     xml:space="preserve" xmlns="http://www.w3.org/2000/svg" y="0px">
-<g>
-	<g>
-		<path d="M421.876,56.307c-6.548-6.78-17.352-6.968-24.132-0.42c-0.142,0.137-0.282,0.277-0.42,0.42L119.257,334.375
-			l-90.334-90.334c-6.78-6.548-17.584-6.36-24.132,0.42c-6.388,6.614-6.388,17.099,0,23.713l102.4,102.4
-			c6.665,6.663,17.468,6.663,24.132,0L421.456,80.44C428.236,73.891,428.424,63.087,421.876,56.307z" />
-	</g>
-</g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/close.svg b/apps/red-ui/src/assets/icons/general/close.svg
deleted file mode 100644
index d12857ac2..000000000
--- a/apps/red-ui/src/assets/icons/general/close.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
-     xmlns="http://www.w3.org/2000/svg">
-    <g fill="currentColor" fill-rule="evenodd" id="close" stroke="none" stroke-width="1">
-        <path
-            d="M93,0 L100,7 L57,50 L100,93 L93,100 L50,57 L7,100 L3.55271368e-15,93 L43,50 L3.55271368e-15,7 L7,0 L50,43 L93,0 Z"
-            fill-rule="nonzero" id="Combined-Shape"></path>
-    </g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/edit.svg b/apps/red-ui/src/assets/icons/general/edit.svg
deleted file mode 100644
index 7f137cee2..000000000
--- a/apps/red-ui/src/assets/icons/general/edit.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
-     xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="edit" stroke="none" stroke-width="1">
-        <path
-            d="M97.0465218,17 L83.0398073,3 C79.0378889,-1 72.5347714,-1 69.0330928,3 L0,71.5 L0,100 L28.5136688,100 L97.0465218,31 C102.54916,25.5 99.047481,19 97.0465218,17 Z M24.0115105,90 L10.0047961,90 L10.0047961,76 L62.0297356,24 L76.03645,38 L24.0115105,90 Z M83.0398073,31 L69.0330928,17 L76.03645,10 L90.0431645,24 L83.0398073,31 Z"
-            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
-    </g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/resize.svg b/apps/red-ui/src/assets/icons/general/resize.svg
deleted file mode 100644
index d0bd1e4c2..000000000
--- a/apps/red-ui/src/assets/icons/general/resize.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="14px" version="1.1" viewBox="0 0 14 14" width="14px" xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="Styleguide" stroke="none" stroke-width="1">
-        <g fill="currentColor" id="Styleguide-Actions" transform="translate(-979.000000, -630.000000)">
-            <g id="reference" transform="translate(969.000000, 620.000000)">
-                <g id="status" transform="translate(10.000000, 10.000000)">
-                    <path
-                        d="M1.4,9.8 L1.4,12.6 L4.2,12.6 L4.2,14 L0,14 L0,9.8 L1.4,9.8 Z M14,9.8 L14,14 L9.8,14 L9.8,12.6 L12.6,12.6 L12.6,9.8 L14,9.8 Z M4.2,0 L4.2,1.4 L1.4,1.4 L1.4,4.2 L0,4.2 L0,0 L4.2,0 Z M14,0 L14,4.2 L12.6,4.2 L12.6,1.4 L9.8,1.4 L9.8,0 L14,0 Z"
-                        fill-rule="nonzero" id="OCR"></path>
-                    <path d="M4.2,0 L0,0 L0,4.2 L4.2,4.2 L4.2,0 Z M2.8,1.4 L2.8,2.8 L1.4,2.8 L1.4,1.4 L2.8,1.4 Z" fill-rule="nonzero"
-                          id="Path"></path>
-                    <path d="M4.2,9.8 L0,9.8 L0,14 L4.2,14 L4.2,9.8 Z M2.8,11.2 L2.8,12.6 L1.4,12.6 L1.4,11.2 L2.8,11.2 Z" fill-rule="nonzero"
-                          id="Path"></path>
-                    <path d="M14,0 L9.8,0 L9.8,4.2 L14,4.2 L14,0 Z M12.6,1.4 L12.6,2.8 L11.2,2.8 L11.2,1.4 L12.6,1.4 Z" fill-rule="nonzero"
-                          id="Path"></path>
-                    <path d="M14,9.8 L9.8,9.8 L9.8,14 L14,14 L14,9.8 Z M12.6,11.2 L12.6,12.6 L11.2,12.6 L11.2,11.2 L12.6,11.2 Z" fill-rule="nonzero"
-                          id="Path"></path>
-                    <rect height="1.4" id="Rectangle" width="5.6" x="4.2" y="1.4"></rect>
-                    <rect height="1.4" id="Rectangle" width="5.6" x="4.2" y="11.2"></rect>
-                    <rect height="5.6" id="Rectangle" width="1.4" x="11.2" y="4.2"></rect>
-                    <rect height="5.6" id="Rectangle" width="1.4" x="1.4" y="4.2"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/thumb-down.svg b/apps/red-ui/src/assets/icons/general/thumb-down.svg
deleted file mode 100644
index 30dc2d870..000000000
--- a/apps/red-ui/src/assets/icons/general/thumb-down.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
-     xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="false_positive" stroke="none" stroke-width="1">
-        <path
-            d="M70.0540046,8 L70.0540046,13 L18.1476125,13 C13.6557132,13 9.16381388,16.5 8.16561403,21 L0.180015248,61 C-0.319084676,64 0.180015248,67 2.17641494,69.5 C4.17281464,71.5 7.16741418,73 10.1620137,73 L23.1386117,73 C18.6467124,78.5 18.1476125,86 22.1404119,91.5 C24.6359115,95.5 29.1278108,98 34.1188101,98 C38.1116095,98 42.1044088,96.5 44.5999085,93.5 L65.0630053,73 L70.0540046,73 L70.0540046,78 L100,78 L100,8 L70.0540046,8 Z M61.0702059,63 L37.6125095,86.5 C36.6143097,87.5 35.6161098,88 34.1188101,88 C32.6215103,88 31.1242105,87 30.1260107,86 C28.6287109,84 29.1278108,81 31.1242105,79 L47.0954081,63 L10.1620137,63 L18.1476125,23 L70.0540046,23 L70.0540046,63 L61.0702059,63 Z M90.0180015,68 L80.036003,68 L80.036003,18 L90.0180015,18 L90.0180015,68 Z"
-            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
-    </g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/thumb-up.svg b/apps/red-ui/src/assets/icons/general/thumb-up.svg
deleted file mode 100644
index bcbc3ae06..000000000
--- a/apps/red-ui/src/assets/icons/general/thumb-up.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
-     xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="false_negative" stroke="none" stroke-width="1">
-        <path
-            d="M29.9459954,92 L29.9459954,87 L81.8523875,87 C86.3442868,87 90.8361861,83.5 91.834386,79 L99.8199848,39 C100.319085,36 99.8199848,33 97.8235851,30.5 C95.8271854,28.5 92.8325858,27 89.8379863,27 L76.8613883,27 C81.3532876,21.5 81.8523875,14 77.8595881,8.5 C75.3640885,4.5 70.8721892,2 65.8811899,2 C61.8883905,2 57.8955912,3.5 55.4000915,6.5 L34.9369947,27 L29.9459954,27 L29.9459954,22 L0,22 L0,92 L29.9459954,92 Z M38.9297941,37 L62.3874905,13.5 C63.3856903,12.5 64.3838902,12 65.8811899,12 C67.3784897,12 68.8757895,13 69.8739893,14 C71.3712891,16 70.8721892,19 68.8757895,21 L52.9045919,37 L89.8379863,37 L81.8523875,77 L29.9459954,77 L29.9459954,37 L38.9297941,37 Z M9.98199848,32 L19.963997,32 L19.963997,82 L9.98199848,82 L9.98199848,32 Z"
-            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
-    </g>
-</svg>
diff --git a/apps/red-ui/src/assets/icons/general/trash.svg b/apps/red-ui/src/assets/icons/general/trash.svg
deleted file mode 100644
index 8916c8532..000000000
--- a/apps/red-ui/src/assets/icons/general/trash.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
-     xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd" id="trash" stroke="none" stroke-width="1">
-        <path
-            d="M85,10 L65,10 L65,0 L35,0 L35,10 L15,10 C12,10 10,12 10,15 C10,18 12,20 15,20 L15,85 C15,93.5 21.5,100 30,100 L70,100 C78.5,100 85,93.5 85,85 L85,20 C88,20 90,18 90,15 C90,12 88,10 85,10 Z M75,85 C75,88 73,90 70,90 L30,90 C27,90 25,88 25,85 L25,20 L75,20 L75,85 Z"
-            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
-    </g>
-</svg>
diff --git a/libs/common-ui b/libs/common-ui
index 7c7cdfda5..b4007f3fe 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 7c7cdfda51edc8896061a633814cfd36fc1b5a16
+Subproject commit b4007f3fe5ff4b82dfad5f4aa83298889fd12570