diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html
index c339395..be690b5 100644
--- a/src/lib/listing/page-header/page-header.component.html
+++ b/src/lib/listing/page-header/page-header.component.html
@@ -72,7 +72,7 @@
             <ng-content select="[slot=right]"></ng-content>
 
             <iqser-circle-button
-                [buttonId]="closeButtonId"
+                buttonId="close-view-btn"
                 (action)="closeAction.emit()"
                 *ngIf="showCloseButton"
                 [class.ml-6]="actionConfigs"
diff --git a/src/lib/listing/page-header/page-header.component.ts b/src/lib/listing/page-header/page-header.component.ts
index 408e2b7..bd2023e 100644
--- a/src/lib/listing/page-header/page-header.component.ts
+++ b/src/lib/listing/page-header/page-header.component.ts
@@ -35,10 +35,6 @@ export class PageHeaderComponent<T extends IListable> {
 
     constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService<T>) {}
 
-    get closeButtonId() {
-        return this.pageLabel?.toLowerCase()?.replace(/ /g, '-') + '-close-view-btn';
-    }
-
     get filterHelpModeKey() {
         return this.helpModeKey ? `filter_${this.helpModeKey}_list` : '';
     }
diff --git a/src/lib/listing/table-header/table-header.component.html b/src/lib/listing/table-header/table-header.component.html
index 627d236..181afc9 100644
--- a/src/lib/listing/table-header/table-header.component.html
+++ b/src/lib/listing/table-header/table-header.component.html
@@ -1,7 +1,7 @@
 <div [class.selection-enabled]="selectionEnabled" class="header-item">
     <div [iqserHelpMode]="helpModeKey" class="header-title">
         <iqser-round-checkbox
-            [id]="selectAllId"
+            id="select-all-entities-toggle"
             (click)="listingService.selectAll()"
             *ngIf="selectionEnabled"
             [active]="listingService.areAllSelected$ | async"
diff --git a/src/lib/listing/table-header/table-header.component.ts b/src/lib/listing/table-header/table-header.component.ts
index a678f86..7c0212b 100644
--- a/src/lib/listing/table-header/table-header.component.ts
+++ b/src/lib/listing/table-header/table-header.component.ts
@@ -28,8 +28,4 @@ export class TableHeaderComponent<T extends IListable<PrimaryKey>, PrimaryKey ex
         readonly listingService: ListingService<T>,
         readonly filterService: FilterService,
     ) {}
-
-    get selectAllId() {
-        return this.tableHeaderLabel.split('.')[0].replace(/ /g, '-') + '-select-all-check';
-    }
 }