diff --git a/src/lib/empty-states/empty-state.module.ts b/src/lib/empty-states/empty-state.module.ts
index 46257c1..e337407 100644
--- a/src/lib/empty-states/empty-state.module.ts
+++ b/src/lib/empty-states/empty-state.module.ts
@@ -3,8 +3,9 @@ import { CommonModule } from '@angular/common';
 import { IqserIconsModule } from '../icons';
 import { EmptyStateComponent } from './empty-state/empty-state.component';
 import { IqserButtonsModule } from '../buttons';
+import { IqserHelpModeModule } from '../help-mode';
 
-const modules = [IqserIconsModule, IqserButtonsModule];
+const modules = [IqserIconsModule, IqserButtonsModule, IqserHelpModeModule];
 const components = [EmptyStateComponent];
 
 @NgModule({
diff --git a/src/lib/empty-states/empty-state/empty-state.component.html b/src/lib/empty-states/empty-state/empty-state.component.html
index 1729aaa..82397d5 100644
--- a/src/lib/empty-states/empty-state/empty-state.component.html
+++ b/src/lib/empty-states/empty-state/empty-state.component.html
@@ -17,5 +17,6 @@
         [icon]="buttonIcon"
         [label]="buttonLabel"
         [type]="iconButtonTypes.primary"
+        [iqserHelpMode]="helpModeKey"
     ></iqser-icon-button>
 </div>
diff --git a/src/lib/empty-states/empty-state/empty-state.component.ts b/src/lib/empty-states/empty-state/empty-state.component.ts
index 25b7f3c..658b1ed 100644
--- a/src/lib/empty-states/empty-state/empty-state.component.ts
+++ b/src/lib/empty-states/empty-state/empty-state.component.ts
@@ -17,6 +17,7 @@ export class EmptyStateComponent implements OnInit {
     @Input() buttonLabel?: string;
     @Input() horizontalPadding = 100;
     @Input() verticalPadding = 120;
+    @Input() helpModeKey?: string;
     @Output() readonly action = new EventEmitter();
 
     ngOnInit(): void {
diff --git a/src/lib/listing/table-header/table-header.component.html b/src/lib/listing/table-header/table-header.component.html
index 340bcf8..11a8a53 100644
--- a/src/lib/listing/table-header/table-header.component.html
+++ b/src/lib/listing/table-header/table-header.component.html
@@ -1,14 +1,16 @@
 <div [class.selection-enabled]="selectionEnabled" class="header-item">
-    <iqser-round-checkbox
-        (click)="listingService.selectAll()"
-        *ngIf="selectionEnabled"
-        [active]="listingService.areAllSelected$ | async"
-        [indeterminate]="listingService.notAllSelected$ | async"
-    ></iqser-round-checkbox>
+    <div [iqserHelpMode]="helpModeKey" class="header-title">
+        <iqser-round-checkbox
+            (click)="listingService.selectAll()"
+            *ngIf="selectionEnabled"
+            [active]="listingService.areAllSelected$ | async"
+            [indeterminate]="listingService.notAllSelected$ | async"
+        ></iqser-round-checkbox>
 
-    <span class="all-caps-label" [iqserHelpMode]="helpModeKey">
-        {{ tableHeaderLabel | translate: { length: totalSize || (listingService.displayedLength$ | async) } }}
-    </span>
+        <span class="all-caps-label">
+            {{ tableHeaderLabel | translate: { length: totalSize || (listingService.displayedLength$ | async) } }}
+        </span>
+    </div>
 
     <ng-container [ngTemplateOutlet]="bulkActions"></ng-container>
 
diff --git a/src/lib/listing/table-header/table-header.component.scss b/src/lib/listing/table-header/table-header.component.scss
index 1a0c691..400617e 100644
--- a/src/lib/listing/table-header/table-header.component.scss
+++ b/src/lib/listing/table-header/table-header.component.scss
@@ -17,6 +17,12 @@
     box-sizing: border-box;
     padding: 0 24px;
 
+    .header-title {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+    }
+
     &.selection-enabled {
         padding: 0 24px 0 10px;
     }