diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 67bccd9105..189d203256 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -58,6 +58,7 @@ import { ThemedPageInternalServerErrorComponent } from './page-internal-server-e
 import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
 
 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
+import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
 
 export function getConfig() {
   return environment;
@@ -167,6 +168,7 @@ const DECLARATIONS = [
   RootComponent,
   ThemedRootComponent,
   HeaderComponent,
+  ContextHelpToggleComponent,
   ThemedHeaderComponent,
   HeaderNavbarWrapperComponent,
   ThemedHeaderNavbarWrapperComponent,
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
new file mode 100644
index 0000000000..caf1bf5daf
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -0,0 +1,8 @@
+<div>
+  <a href="javascript:void(0);"
+     role="button"
+     (click)="onClick()"
+  >
+    <i class="fas fa-question-circle ds-context-help-toggle"></i>
+  </a>
+</div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
new file mode 100644
index 0000000000..ba34ba8b89
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -0,0 +1,8 @@
+.ds-context-help-toggle {
+  color: var(--ds-header-icon-color);
+  background-color: var(--ds-header-bg);
+}
+
+.ds-context-help-toggle:hover {
+  color: var(--ds-header-icon-color-hover);
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
new file mode 100644
index 0000000000..16d82f1a0a
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContextHelpToggleComponent } from './context-help-toggle.component';
+
+describe('ContextHelpToggleComponent', () => {
+  let component: ContextHelpToggleComponent;
+  let fixture: ComponentFixture<ContextHelpToggleComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ContextHelpToggleComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ContextHelpToggleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
new file mode 100644
index 0000000000..cc5e779d6e
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { ContextHelpService } from '../../shared/context-help.service';
+
+@Component({
+  selector: 'ds-context-help-toggle',
+  templateUrl: './context-help-toggle.component.html',
+  styleUrls: ['./context-help-toggle.component.scss']
+})
+export class ContextHelpToggleComponent implements OnInit {
+
+  constructor(
+    private contextHelpService: ContextHelpService
+  ) { }
+
+  ngOnInit(): void {
+  }
+
+  onClick() {
+    console.log('toggling icons');
+    this.contextHelpService.toggleIcons();
+  }
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index c7b979d266..d04f095156 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -8,6 +8,7 @@
       <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
         <ds-search-navbar></ds-search-navbar>
         <ds-lang-switch></ds-lang-switch>
+        <ds-context-help-toggle></ds-context-help-toggle>
         <ds-auth-nav-menu></ds-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
         <div class="pl-2">
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index bb43cdc678..fe72c78d92 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,4 +1,5 @@
 <div class="page-internal-server-error container">
+  <ds-context-help-toggle></ds-context-help-toggle>
   <h1>500</h1>
   <h2><small *dsContextHelp="{content: 'context-help.multi-para.test', id: 'server-error'}">{{"500.page-internal-server-error" | translate}}</small></h2>
   <br/>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index e4e22d7ebc..4639c12086 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -69,10 +69,11 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
 
   ngOnInit() {
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
+    this.subs.push(this.shouldShowIcon$.subscribe());
   }
 
   ngAfterViewInit() {
-    this.subs = [
+    this.subs.push(
       this.contextHelpService.getContextHelp$(this.id)
         .pipe(hasValueOperator())
         .subscribe((ch: ContextHelp) => {
@@ -90,7 +91,7 @@ export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDes
       this.tooltip.hidden.subscribe(() => {
         this.contextHelpService.hideTooltip(this.id);
       })
-    ];
+    );
   }
 
   ngOnDestroy() {
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
index b705c797ac..5176da0adc 100644
--- a/src/app/shared/context-help.reducer.ts
+++ b/src/app/shared/context-help.reducer.ts
@@ -16,7 +16,7 @@ const initialState: ContextHelpState = {allIconsVisible: true, models: {}};
 export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
   switch (action.type) {
     case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
-      return {...state, allIconsVisible: true};
+      return {...state, allIconsVisible: !state.allIconsVisible};
     }
     case ContextHelpActionTypes.CONTEXT_HELP_ADD: {
       const newModels = {...state.models, [action.model.id]: action.model};