diff --git a/apps/red-ui/src/app/components/type-filter/type-filter.component.html b/apps/red-ui/src/app/components/type-filter/type-filter.component.html
index f545a04c6..873e399f1 100644
--- a/apps/red-ui/src/app/components/type-filter/type-filter.component.html
+++ b/apps/red-ui/src/app/components/type-filter/type-filter.component.html
@@ -1,6 +1,28 @@
-<redaction-annotation-icon *ngIf="filter.key === 'analysis'" type="square" label="A" color="#dd4d50"></redaction-annotation-icon>
 <redaction-annotation-icon *ngIf="filter.key === 'redaction'" type="square" label="R" color="#283241"></redaction-annotation-icon>
 <redaction-annotation-icon *ngIf="filter.key === 'hint'" type="round" label="H" color="#9398a0"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'suggestion'" type="rhombus" label="S" [color]="suggestionColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'suggestion-remove'" type="rhombus" label="S" [color]="suggestionColor"></redaction-annotation-icon>
+
+<redaction-annotation-icon *ngIf="filter.key === 'manual'" type="square" label="M" [color]="dictionaryColor"></redaction-annotation-icon>
+
+<redaction-annotation-icon *ngIf="filter.key === 'ignore'" type="square" label="I" [color]="dictionaryColor"></redaction-annotation-icon>
+<redaction-annotation-icon
+    *ngIf="
+        filter.key === 'suggestion-remove' ||
+        filter.key === 'suggestion-add' ||
+        filter.key === 'suggestion-remove-dictionary' ||
+        filter.key === 'suggestion-add-dictionary'
+    "
+    type="rhombus"
+    label="S"
+    [color]="dictionaryColor"
+></redaction-annotation-icon>
+
+<redaction-annotation-icon
+    *ngIf="filter.key === 'add-dictionary' || filter.key === 'remove-dictionary'"
+    type="square"
+    label="A"
+    color="#dd4d50"
+></redaction-annotation-icon>
+
+<redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
+
 {{ filter.label | translate }}
diff --git a/apps/red-ui/src/app/components/type-filter/type-filter.component.ts b/apps/red-ui/src/app/components/type-filter/type-filter.component.ts
index 82a7e1c22..6f460abee 100644
--- a/apps/red-ui/src/app/components/type-filter/type-filter.component.ts
+++ b/apps/red-ui/src/app/components/type-filter/type-filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { FilterModel } from '../../common/filter/model/filter.model';
 import { AppStateService } from '../../state/app-state.service';
 
@@ -7,12 +7,14 @@ import { AppStateService } from '../../state/app-state.service';
     templateUrl: './type-filter.component.html',
     styleUrls: ['./type-filter.component.scss']
 })
-export class TypeFilterComponent {
+export class TypeFilterComponent implements OnInit {
     @Input() filter: FilterModel;
 
+    dictionaryColor: string;
+
     constructor(public appStateService: AppStateService) {}
 
-    get suggestionColor() {
-        return this.appStateService.getDictionaryColor('suggestion');
+    ngOnInit(): void {
+        this.dictionaryColor = this.appStateService.getDictionaryColor(this.filter.key);
     }
 }
diff --git a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
index ee84bba0b..687b7c81d 100644
--- a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
+++ b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
@@ -32,9 +32,10 @@ export class AnnotationProcessingService {
                 key: key,
                 topLevelFilter: true,
                 label: 'annotation-type.' + key,
+                checked: key === 'manual',
                 filters: Array.from(availableAnnotationTypes[key]).map((dc: string) => {
-                    // const defaultFilter = this._appStateService.dictionaryData[dc]?.defaultFilter;
-                    return { key: dc, checked: false, filters: [] };
+                    const defaultFilter = this._appStateService.dictionaryData[dc]?.defaultFilter;
+                    return { key: dc, checked: defaultFilter, filters: [] };
                 })
             };
             handleCheckedValue(filter);
diff --git a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
index 1ced9018b..6b2911a91 100644
--- a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
@@ -120,8 +120,8 @@ export class ManualAnnotationService {
                     .declineRequest(this._appStateService.activeProjectId, this._appStateService.activeFileId, annotationWrapper.id)
                     .pipe(
                         tap(
-                            () => this._notify(this._getMessage('decline', removeFromDictionary)),
-                            (error) => this._notify(this._getMessage('decline', removeFromDictionary, true), NotificationType.ERROR, error)
+                            () => this._notify(this._getMessage('decline', false)),
+                            (error) => this._notify(this._getMessage('decline', false, true), NotificationType.ERROR, error)
                         )
                     );
             } else {