diff --git a/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.html b/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.html
index d2d3b4ce1..5284b95ee 100644
--- a/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.html
@@ -1,15 +1,19 @@
-<redaction-annotation-icon *ngIf="filter.key === 'redaction'" type="square" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'recommendation'" type="hexagon" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'hint'" type="circle" label="H" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'manual-redaction'" type="square" label="M" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'skipped'" type="square" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="isSuggestion(filter.key)" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="needsAnalysis(filter.key)" type="square" label="A" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'none'" label="-" color="transparent" type="none"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'updated'" type="square" label="U" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'image'" type="square" label="I" [color]="dictionaryColor"></redaction-annotation-icon>
+<ng-container *ngIf="!filter.icon">
+    <redaction-annotation-icon *ngIf="filter.key === 'redaction'" type="square" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'recommendation'" type="hexagon" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'hint'" type="circle" label="H" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'manual-redaction'" type="square" label="M" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'skipped'" type="square" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="isSuggestion(filter.key)" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="needsAnalysis(filter.key)" type="square" label="A" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'none'" label="-" color="transparent" type="none"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'updated'" type="square" label="U" [color]="dictionaryColor"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="filter.key === 'image'" type="square" label="I" [color]="dictionaryColor"></redaction-annotation-icon>
+</ng-container>
 
-<mat-icon *ngIf="!isKey(filter.key) && filter.icon" [svgIcon]="filter.icon"></mat-icon>
+<ng-container *ngIf="filter.icon">
+    <mat-icon [svgIcon]="filter.icon"></mat-icon>
+</ng-container>
 
 {{ filter.label | translate }}
diff --git a/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.ts b/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.ts
index 58d6bdfd8..286b51639 100644
--- a/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/type-filter/type-filter.component.ts
@@ -22,23 +22,9 @@ export class TypeFilterComponent implements OnInit {
         'suggestion-add-dictionary'
     ];
     private _needsAnalysisKeys = ['add-dictionary', 'remove-dictionary', 'remove-only-here', 'pending-analysis', 'analysis'];
-    private _allKeys = [
-        ...this._needsAnalysisKeys,
-        ...this._suggestionsKeys,
-        'redaction',
-        'recommendation',
-        'hint',
-        'manual-redaction',
-        'skipped',
-        'declined-suggestion',
-        'none',
-        'updated',
-        'image'
-    ];
 
     isSuggestion = (key: string) => this._suggestionsKeys.includes(key);
     needsAnalysis = (key: string) => this._needsAnalysisKeys.includes(key);
-    isKey = (key: string) => this._allKeys.includes(key);
 
     constructor(private readonly _appStateService: AppStateService) {}