diff --git a/src/lib/listing/table-column-name/table-column-name.component.html b/src/lib/listing/table-column-name/table-column-name.component.html
index b9331ee..745d01d 100644
--- a/src/lib/listing/table-column-name/table-column-name.component.html
+++ b/src/lib/listing/table-column-name/table-column-name.component.html
@@ -3,7 +3,7 @@
 
     <span class="all-caps-label">{{ label }}</span>
 
-    <mat-icon *ngIf="!!rightIcon" [matTooltip]="rightIconTooltip" [svgIcon]="rightIcon" matTooltipPosition="above"></mat-icon>
+    <mat-icon *ngIf="!!rightIcon" [matTooltip]="rightIconTooltip | translate" [svgIcon]="rightIcon" matTooltipPosition="above"></mat-icon>
 
     <ng-container *ngIf="sortingService?.sortingOption$ | async as sortingOption">
         <div *ngIf="!!sortByKey" [class.force-display]="sortingOption.column === sortByKey" class="sort-arrows-container">
diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html
index fa8d2c1..9aea9f6 100644
--- a/src/lib/listing/table/table.component.html
+++ b/src/lib/listing/table/table.component.html
@@ -11,6 +11,7 @@
 <iqser-empty-state
     (action)="noDataAction.emit()"
     *ngIf="listingComponent.entitiesService.noData$ | async"
+    [buttonIcon]="noDataButtonIcon"
     [buttonLabel]="noDataButtonLabel"
     [icon]="noDataIcon"
     [showButton]="showNoDataButton"
diff --git a/src/lib/listing/table/table.component.ts b/src/lib/listing/table/table.component.ts
index 956d5f1..f5eae39 100644
--- a/src/lib/listing/table/table.component.ts
+++ b/src/lib/listing/table/table.component.ts
@@ -34,6 +34,7 @@ export class TableComponent<T extends Listable> implements OnInit {
     @Input() classes?: string;
     @Input() noDataText?: string;
     @Input() noDataIcon?: string;
+    @Input() noDataButtonIcon?: string;
     @Input() noDataButtonLabel?: string;
     @Input() showNoDataButton = false;
     @Output() readonly noDataAction = new EventEmitter<void>();
@@ -91,7 +92,7 @@ export class TableComponent<T extends Listable> implements OnInit {
         for (const config of this.tableColumnConfigs) {
             gridTemplateColumnsHover += `${config.width || '1fr'} `;
         }
-        gridTemplateColumnsHover += this.emptyColumnWidth || ''; // TODO: Check if it's always 1fr
+        gridTemplateColumnsHover += this.emptyColumnWidth || '';
         const gridTemplateColumns = `${gridTemplateColumnsHover} ${SCROLLBAR_WIDTH}px`;
 
         element.style.setProperty('--gridTemplateColumns', gridTemplateColumns);