diff --git a/src/assets/styles/common-help-mode.scss b/src/assets/styles/common-help-mode.scss
index b6102ce..95b824f 100644
--- a/src/assets/styles/common-help-mode.scss
+++ b/src/assets/styles/common-help-mode.scss
@@ -1,5 +1,5 @@
 .help-mode {
-    z-index: 3000;
+    z-index: 1100;
     position: absolute;
     transition: all 0.25s;
 }
diff --git a/src/lib/buttons/help-button/help-button.component.scss b/src/lib/buttons/help-button/help-button.component.scss
index b44b7c1..e69de29 100644
--- a/src/lib/buttons/help-button/help-button.component.scss
+++ b/src/lib/buttons/help-button/help-button.component.scss
@@ -1,7 +0,0 @@
-.help-button {
-    transition: 0.2s;
-
-    &:hover {
-        background-color: var(--iqser-helpmode-primary);
-    }
-}
diff --git a/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.scss b/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.scss
index 9bb7007..d0953d1 100644
--- a/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.scss
+++ b/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.scss
@@ -1,16 +1,16 @@
  section {
-        background: #ecedf0;
-        display: flex;
-        justify-content: center;
+    background: #ecedf0;
+    display: flex;
+    justify-content: center;
 
-        .content {
-            width: 440px;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            text-align: center;
-            padding-top: 20px;
-            padding-bottom: 30px;
-            line-height: 18px;
-        }
+    .content {
+        width: 440px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        padding-top: 20px;
+        padding-bottom: 30px;
+        line-height: 18px;
+    }
  }
diff --git a/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.ts b/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.ts
index 9d3fecc..92bd84c 100644
--- a/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.ts
+++ b/src/lib/help-mode/help-mode-dialog/help-mode-dialog.component.ts
@@ -1,5 +1,8 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 
+const HIGHER_CDK_OVERLAY_CONTAINER_ZINDEX = '1200';
+const DEFAULT_CDK_OVERLAY_CONTAINER_ZINDEX = '800';
+
 @Component({
     templateUrl: './help-mode-dialog.component.html',
     styleUrls: ['./help-mode-dialog.component.scss'],
@@ -8,11 +11,11 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/
 export class HelpModeDialogComponent implements OnInit, OnDestroy {
 
     ngOnInit(): void {
-        this._setCdkOverlayContainerZindex('5000');
+        this._setCdkOverlayContainerZindex(HIGHER_CDK_OVERLAY_CONTAINER_ZINDEX);
     }
 
     ngOnDestroy(): void {
-        this._setCdkOverlayContainerZindex('800');
+        this._setCdkOverlayContainerZindex(DEFAULT_CDK_OVERLAY_CONTAINER_ZINDEX);
     }
 
     private _setCdkOverlayContainerZindex(zIndex: string): void {
diff --git a/src/lib/help-mode/help-mode.service.ts b/src/lib/help-mode/help-mode.service.ts
index 39e100a..ba8304c 100644
--- a/src/lib/help-mode/help-mode.service.ts
+++ b/src/lib/help-mode/help-mode.service.ts
@@ -16,7 +16,7 @@ export const ScrollableParentViews = {
 
 export type ScrollableParentView = keyof typeof ScrollableParentViews;
 
-export interface Helper {
+interface Helper {
     readonly element: HTMLElement;
     readonly helperElement: HTMLElement;
     readonly scrollableParentView: ScrollableParentView;
diff --git a/src/lib/help-mode/help-mode/help-mode.component.html b/src/lib/help-mode/help-mode/help-mode.component.html
index 7f33678..0c15be4 100644
--- a/src/lib/help-mode/help-mode/help-mode.component.html
+++ b/src/lib/help-mode/help-mode/help-mode.component.html
@@ -6,7 +6,7 @@
         </a>
         <div class="close">
             (esc)
-            <iqser-circle-button icon="iqser:close" (click)="helpModeService.deactivateHelpMode()"></iqser-circle-button>
+            <iqser-circle-button icon="iqser:close" type="help" (click)="helpModeService.deactivateHelpMode()"></iqser-circle-button>
         </div>
     </div>
 </div>
diff --git a/src/lib/help-mode/help-mode/help-mode.component.scss b/src/lib/help-mode/help-mode/help-mode.component.scss
index 79090eb..e73a56b 100644
--- a/src/lib/help-mode/help-mode/help-mode.component.scss
+++ b/src/lib/help-mode/help-mode/help-mode.component.scss
@@ -42,7 +42,7 @@
     border-right: 8px solid var(--iqser-helpmode-primary);
     border-top: 8px solid var(--iqser-helpmode-primary);
     border-bottom: 60px solid var(--iqser-helpmode-primary);
-    z-index: 2000;
+    z-index: 1000;
     position: absolute;
     display: flex;
     justify-content: center;