diff --git a/apps/red-ui/src/app/common/filter/filter.component.html b/apps/red-ui/src/app/common/filter/filter.component.html
index e074ea531..5f04b1e7b 100644
--- a/apps/red-ui/src/app/common/filter/filter.component.html
+++ b/apps/red-ui/src/app/common/filter/filter.component.html
@@ -18,10 +18,13 @@
             </div>
             <div *ngFor="let filter of filters">
                 <div class="mat-menu-item flex" (click)="toggleFilterExpanded($event, filter)">
-                    <div class="arrow-wrapper" *ngIf="filter.filters && filter.filters.length">
+                    <div class="arrow-wrapper" *ngIf="isExpandable(filter)">
                         <mat-icon *ngIf="filter.expanded" svgIcon="red:arrow-down" color="accent"> </mat-icon>
                         <mat-icon *ngIf="!filter.expanded" color="accent" svgIcon="red:arrow-right"> </mat-icon>
                     </div>
+                    <div class="arrow-wrapper spacer" *ngIf="atLeastOnFilterIsExpandable && !isExpandable(filter)">
+                        &nbsp;
+                    </div>
                     <mat-checkbox
                         [checked]="filter.checked"
                         [indeterminate]="filter.indeterminate"
diff --git a/apps/red-ui/src/app/common/filter/filter.component.ts b/apps/red-ui/src/app/common/filter/filter.component.ts
index e4afdb5f1..0a4097343 100644
--- a/apps/red-ui/src/app/common/filter/filter.component.ts
+++ b/apps/red-ui/src/app/common/filter/filter.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, Output, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, TemplateRef, ViewChild } from '@angular/core';
 import { AppStateService } from '../../state/app-state.service';
 import { FilterModel } from './model/filter.model';
 import { handleCheckedValue } from './utils/filter-utils';
@@ -19,7 +19,7 @@ import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox';
         }
     ]
 })
-export class FilterComponent {
+export class FilterComponent implements OnChanges {
     @Output() filtersChanged = new EventEmitter<FilterModel[]>();
     @Input() filterTemplate: TemplateRef<any>;
     @Input() actionsTemplate: TemplateRef<any>;
@@ -33,8 +33,19 @@ export class FilterComponent {
     mouseOver = true;
     mouseOverTimeout: number;
 
+    atLeastOnFilterIsExpandable: boolean = false;
+
     constructor(public readonly appStateService: AppStateService, private readonly _changeDetectorRef: ChangeDetectorRef) {}
 
+    ngOnChanges(changes: SimpleChanges): void {
+        this.atLeastOnFilterIsExpandable = false;
+        if (this.filters) {
+            this.filters.forEach((f) => {
+                this.atLeastOnFilterIsExpandable = this.atLeastOnFilterIsExpandable || this.isExpandable(f);
+            });
+        }
+    }
+
     filterCheckboxClicked($event: any, filter: FilterModel, parent?: FilterModel) {
         filter.checked = !filter.checked;
         if (parent) {
@@ -99,4 +110,8 @@ export class FilterComponent {
             //   this.trigger.closeMenu();
         }, 1000);
     }
+
+    isExpandable(filter: FilterModel) {
+        return filter.filters && filter.filters.length > 0;
+    }
 }
diff --git a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html
index 85c983f25..cf20d8dea 100644
--- a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html
+++ b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.html
@@ -1,8 +1,8 @@
 <div class="needs-work">
     <redaction-annotation-icon *ngIf="reanalysisRequired()" type="square" label="A" [color]="analysisColor"></redaction-annotation-icon>
     <redaction-annotation-icon *ngIf="hasUpdates" type="square" label="U" [color]="updatedColor"></redaction-annotation-icon>
-    <redaction-annotation-icon *ngIf="needsWorkInput.hasRedactions" type="square" label="R" color="#283241"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="needsWorkInput.hasRedactions" type="square" label="R" [color]="redactionColor"></redaction-annotation-icon>
     <redaction-annotation-icon *ngIf="hasImages" type="square" label="I" [color]="imageColor"></redaction-annotation-icon>
-    <redaction-annotation-icon *ngIf="needsWorkInput.hintsOnly" type="circle" label="H" color="#9398a0"></redaction-annotation-icon>
+    <redaction-annotation-icon *ngIf="needsWorkInput.hintsOnly" type="circle" label="H" [color]="hintColor"></redaction-annotation-icon>
     <redaction-annotation-icon *ngIf="needsWorkInput.hasRequests" type="rhombus" label="S" [color]="suggestionColor"></redaction-annotation-icon>
 </div>
diff --git a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts
index 19969e2f9..2334c9b48 100644
--- a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts
+++ b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts
@@ -40,6 +40,14 @@ export class NeedsWorkBadgeComponent implements OnInit {
         return this._getDictionaryColor('analysis');
     }
 
+    get hintColor() {
+        return this._getDictionaryColor('hint');
+    }
+
+    get redactionColor() {
+        return this._getDictionaryColor('redaction');
+    }
+
     get hasImages() {
         return this.needsWorkInput instanceof FileStatusWrapper && this.needsWorkInput.hasImages;
     }
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 9bdcf77a1..362f55da9 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,7 +1,7 @@
-<redaction-annotation-icon *ngIf="filter.key === 'redaction'" type="square" label="R" color="#283241"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'recommendation'" type="square" label="R" color="#c5d3eb"></redaction-annotation-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="square" label="R" [color]="dictionaryColor"></redaction-annotation-icon>
 <redaction-annotation-icon *ngIf="filter.key === 'analysis'" type="square" label="A" [color]="dictionaryColor"></redaction-annotation-icon>
-<redaction-annotation-icon *ngIf="filter.key === 'hint'" type="circle" label="H" color="#9398a0"></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>
 
@@ -25,7 +25,7 @@
     *ngIf="filter.key === 'add-dictionary' || filter.key === 'remove-dictionary'"
     type="square"
     label="A"
-    color="#dd4d50"
+    [color]="dictionaryColor"
 ></redaction-annotation-icon>
 
 <redaction-annotation-icon *ngIf="filter.key === 'declined-suggestion'" type="rhombus" label="S" [color]="dictionaryColor"></redaction-annotation-icon>
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index a9a96e6d4..79b267256 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -477,8 +477,6 @@ export class AppStateService {
                     virtual: true
                 };
 
-                console.log(colors.manualRedactionColor);
-
                 // dictionary actions
                 dictionaryData['recommendation'] = {
                     hexColor: '#c5d3eb',
@@ -556,7 +554,7 @@ export class AppStateService {
                     virtual: true
                 };
                 dictionaryData['hint'] = {
-                    hexColor: '#9398a0',
+                    hexColor: '#fa98f7',
                     type: 'hint',
                     virtual: true,
                     hint: true