diff --git a/src/app/sections/analytics/components/base/components/fraud-summary-list/components/fraud-summary-item/fraud-summary-item.component.scss b/src/app/sections/analytics/components/base/components/fraud-summary-list/components/fraud-summary-item/fraud-summary-item.component.scss
index e9884051..80a17210 100644
--- a/src/app/sections/analytics/components/base/components/fraud-summary-list/components/fraud-summary-item/fraud-summary-item.component.scss
+++ b/src/app/sections/analytics/components/base/components/fraud-summary-list/components/fraud-summary-item/fraud-summary-item.component.scss
@@ -1,9 +1,5 @@
 @import '../fraud-summary-grid';
 
-.fb-list-item {
-    height: 48px !important;
-}
-
 .fraud-summary-grid {
     @include fraud-summary-grid;
 }
diff --git a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-header/reference-header.component.html b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-header/reference-header.component.html
index 60904469..4e006d74 100644
--- a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-header/reference-header.component.html
+++ b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-header/reference-header.component.html
@@ -3,6 +3,6 @@
     <div class="fb-body-2" fxFlex fxGrow="2">Group ID</div>
     <div class="fb-body-2" fxFlex>Party ID</div>
     <div class="fb-body-2" fxFlex>Shop ID</div>
-    <div class="fb-body-2" fxFlex="168px">Updated At</div>
-    <div fxFlex="40px"></div>
+    <div class="fb-body-2" fxFlex="0 0 160px">Updated At</div>
+    <div fxFlex="0 0 20px"></div>
 </fb-list-header>
diff --git a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.html b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.html
index b390a200..2488fac5 100644
--- a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.html
+++ b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.html
@@ -3,9 +3,9 @@
     <div class="fb-body-2 wrap" fxFlex fxGrow="2">{{ reference.groupId }}</div>
     <div class="fb-body-2 wrap" fxFlex>{{ reference.partyId }}</div>
     <div class="fb-body-2 wrap" fxFlex>{{ reference.shopId }}</div>
-    <div class="fb-body-2 wrap" fxFlex="160px">{{ reference.lastUpdateDate | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+    <div class="fb-body-2 wrap" fxFlex="0 0 160px">{{ reference.lastUpdateDate | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
     <ng-container>
-        <button mat-icon-button [matMenuTriggerFor]="menu">
+        <button mat-icon-button fxFlex="0 0 20px" [matMenuTriggerFor]="menu">
             <mat-icon>more_vert</mat-icon>
         </button>
         <mat-menu #menu="matMenu">
diff --git a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.scss b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.scss
index 21dc2c61..655681f4 100644
--- a/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.scss
+++ b/src/app/sections/groups/components/group-references/components/group-references-list/components/reference-item/reference-item.component.scss
@@ -1,7 +1,3 @@
-.fb-list-item {
-    height: 48px !important;
-}
-
 .wrap {
     word-wrap: anywhere;
 }
diff --git a/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-header/group-header.component.html b/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-header/group-header.component.html
index d261a34f..db2711ac 100644
--- a/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-header/group-header.component.html
+++ b/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-header/group-header.component.html
@@ -1,4 +1,4 @@
-<fb-list-header>
+<fb-list-header [reserveToggleSpace]="true">
     <div class="fb-body-2" fxFlex>Name</div>
-    <div class="fb-body-2" fxFlex="168px">Updated At</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">Updated At</div>
 </fb-list-header>
diff --git a/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-item/group-item.component.html b/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-item/group-item.component.html
index 844de99c..843f8821 100644
--- a/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-item/group-item.component.html
+++ b/src/app/sections/groups/components/payments-groups/components/groups-list/components/group-item/group-item.component.html
@@ -1,8 +1,8 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
             <div class="fb-body-2" fxFlex>{{ group.groupId }}</div>
-            <div class="fb-body-2" fxFlex="160px">
+            <div class="fb-body-2" fxFlex="0 0 160px">
                 {{ group.priorityTemplates[0].lastUpdateTime | date : 'yyyy-MM-dd HH:mm:ss' }}
             </div>
         </div>
diff --git a/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-header/historical-data-chargeback-header.component.html b/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-header/historical-data-chargeback-header.component.html
index 691d3c7c..d0e1a15e 100644
--- a/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-header/historical-data-chargeback-header.component.html
+++ b/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-header/historical-data-chargeback-header.component.html
@@ -1,13 +1,13 @@
-<fb-list-header>
-    <div class="fb-body-checkbox" fxFlex="30px" matTooltip="Select only shown rows!">
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-checkbox" fxFlex="0 0 30px" matTooltip="Select only shown rows!">
         <mat-checkbox color="primary" (change)="changeAll($event)"></mat-checkbox>
     </div>
-    <div class="fb-body-2" fxFlex="120px">ID</div>
-    <div class="fb-body-2" fxFlex="120px">STATUS</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">ID</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">STATUS</div>
     <div class="fb-body-2" fxFlex>PARTY ID</div>
     <div class="fb-body-2" fxFlex>SHOP ID</div>
-    <div class="fb-body-2" fxFlex="120px">CATEGORY</div>
-    <div class="fb-body-2" fxFlex="120px">CODE</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">CATEGORY</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">CODE</div>
     <div class="fb-body-2" fxFlex>EMAIL</div>
-    <div class="fb-body-2" fxFlex="168px">EVENT TIME</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">EVENT TIME</div>
 </fb-list-header>
diff --git a/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-item/historical-data-chargeback-item.component.html b/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-item/historical-data-chargeback-item.component.html
index 9cad9b59..d34abd51 100644
--- a/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-item/historical-data-chargeback-item.component.html
+++ b/src/app/sections/historical-data/components/chargebacks/historical-chargeback-list/components/template-item/historical-data-chargeback-item.component.html
@@ -1,19 +1,19 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header #exppanel>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-checkbox" fxFlex="30px" (click)="!exppanel._toggle()">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-checkbox" fxFlex="0 0 30px" (click)="!exppanel._toggle()">
                 <mat-checkbox color="primary" (change)="emmitChange()" [checked]="enabled"> </mat-checkbox>
             </div>
-            <div class="fb-body-2" fxFlex="120px">{{ chargeback.id }}</div>
-            <div class="fb-body-2" fxFlex="120px">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ chargeback.id }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">
                 <fb-tag [color]="chargeback.status | chargebackStatusToColor" [title]="chargeback.status"></fb-tag>
             </div>
             <div class="fb-body-2" fxFlex>{{ chargeback.merchantInfo.partyId }}</div>
             <div class="fb-body-2" fxFlex>{{ chargeback.merchantInfo.shopId }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ chargeback.category }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ chargeback.chargebackCode }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ chargeback.category }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ chargeback.chargebackCode }}</div>
             <div class="fb-body-2" fxFlex>{{ chargeback.clientInfo.email }}</div>
-            <div class="fb-body-2" fxFlex="160px">{{ chargeback.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+            <div class="fb-body-2" fxFlex="0 0 160px">{{ chargeback.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
         </div>
     </mat-expansion-panel-header>
     <div class="panel-content" fxLayout="column" [fxLayoutGap]="layoutGapM">
diff --git a/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.html b/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.html
index 578d4963..083bfe67 100644
--- a/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.html
+++ b/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.html
@@ -20,7 +20,7 @@
         <fb-show-more-continuation-panel
             *ngIf="hasMore$ | async"
             [isLoading]="inProgress$ | async"
-            (showMore)="fetchMore($event)"
+            (showMore)="fetchMore()"
         ></fb-show-more-continuation-panel>
     </div>
     <ng-template #Empty>
diff --git a/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.ts b/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.ts
index f7c9c71d..693cc758 100644
--- a/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.ts
+++ b/src/app/sections/historical-data/components/chargebacks/historical-chargebacks-data.component.ts
@@ -32,8 +32,8 @@ export class HistoricalChargebacksDataComponent {
         this.fetchHistoricalChargebacksService.search(this.initParams(event));
     }
 
-    fetchMore(event) {
-        this.fetchHistoricalChargebacksService.fetchMore(this.initParams(event));
+    fetchMore() {
+        this.fetchHistoricalChargebacksService.fetchMore();
     }
 
     checkChargebacks($event) {
diff --git a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.html b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.html
index 658e9a5e..21c856a5 100644
--- a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.html
+++ b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.html
@@ -11,7 +11,7 @@
         <fb-show-more-continuation-panel
             *ngIf="hasMore$ | async"
             [isLoading]="inProgress$ | async"
-            (showMore)="fetchMore($event)"
+            (showMore)="fetchMore()"
         ></fb-show-more-continuation-panel>
     </div>
     <ng-template #Empty>
diff --git a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.ts b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.ts
index 296d3ae6..e7eea3d9 100644
--- a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.ts
+++ b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-data.component.ts
@@ -24,8 +24,8 @@ export class HistoricalFraudPaymentsDataComponent {
         this.fetchHistoricalFraudPaymentsService.search(this.initParams(event));
     }
 
-    fetchMore(event) {
-        this.fetchHistoricalFraudPaymentsService.fetchMore(this.initParams(event));
+    fetchMore() {
+        this.fetchHistoricalFraudPaymentsService.fetchMore();
     }
 
     loadFraudPayments() {
diff --git a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-header/historical-data-fraud-payments-header.component.html b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-header/historical-data-fraud-payments-header.component.html
index b784e8d3..5c777456 100644
--- a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-header/historical-data-fraud-payments-header.component.html
+++ b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-header/historical-data-fraud-payments-header.component.html
@@ -1,11 +1,11 @@
-<fb-list-header>
-    <div class="fb-body-2" fxFlex="120px">ID</div>
-    <div class="fb-body-2" fxFlex="120px">STATUS</div>
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-2" fxFlex="0 0 120px">ID</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">STATUS</div>
     <div class="fb-body-2" fxFlex>PARTY ID</div>
     <div class="fb-body-2" fxFlex>SHOP ID</div>
-    <div class="fb-body-2" fxFlex="120px">AMOUNT</div>
-    <div class="fb-body-2" fxFlex="120px">CURRENCY</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">AMOUNT</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">CURRENCY</div>
     <div class="fb-body-2" fxFlex>EMAIL</div>
-    <div class="fb-body-2" fxFlex="120px">TYPE</div>
-    <div class="fb-body-2" fxFlex="168px">EVENT TIME</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">TYPE</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">EVENT TIME</div>
 </fb-list-header>
diff --git a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-item/historical-data-fraud-payments-item.component.html b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-item/historical-data-fraud-payments-item.component.html
index f1ff6c05..265231e2 100644
--- a/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-item/historical-data-fraud-payments-item.component.html
+++ b/src/app/sections/historical-data/components/fraud-payments/historical-fraud-payments-list/components/template-item/historical-data-fraud-payments-item.component.html
@@ -1,8 +1,8 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-2" fxFlex="120px">{{ fraudPayment.payment.id }}</div>
-            <div class="fb-body-2" fxFlex="120px">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ fraudPayment.payment.id }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">
                 <fb-tag
                     [color]="fraudPayment.payment.status | paymentStatusToColor"
                     [title]="fraudPayment.payment.status"
@@ -10,11 +10,11 @@
             </div>
             <div class="fb-body-2" fxFlex>{{ fraudPayment.payment.merchantInfo.partyId }}</div>
             <div class="fb-body-2" fxFlex>{{ fraudPayment.payment.merchantInfo.shopId }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ fraudPayment.payment.amount }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ fraudPayment.payment.currency }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ fraudPayment.payment.amount }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ fraudPayment.payment.currency }}</div>
             <div class="fb-body-2" fxFlex>{{ fraudPayment.payment.clientInfo.email }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ fraudPayment.type }}</div>
-            <div class="fb-body-2" fxFlex="160px">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ fraudPayment.type }}</div>
+            <div class="fb-body-2" fxFlex="0 0 160px">
                 {{ fraudPayment.payment.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}
             </div>
         </div>
diff --git a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.html b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.html
index d8c6ed6e..a90c7e4b 100644
--- a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.html
+++ b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.html
@@ -8,7 +8,7 @@
         <fb-show-more-continuation-panel
             *ngIf="hasMore$ | async"
             [isLoading]="inProgress$ | async"
-            (showMore)="fetchMore($event)"
+            (showMore)="fetchMore()"
         ></fb-show-more-continuation-panel>
     </div>
     <ng-template #Empty>
diff --git a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.ts b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.ts
index 145abd22..b2d690e4 100644
--- a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.ts
+++ b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-data.component.ts
@@ -22,8 +22,8 @@ export class HistoricalInspectResultsDataComponent {
         this.fetchHistoricalInspectResultsService.search(this.initParams(event));
     }
 
-    fetchMore(event) {
-        this.fetchHistoricalInspectResultsService.fetchMore(this.initParams(event));
+    fetchMore() {
+        this.fetchHistoricalInspectResultsService.fetchMore();
     }
 
     private initParams(event) {
diff --git a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-header/historical-data-inspect-results-header.component.html b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-header/historical-data-inspect-results-header.component.html
index b35c08f9..0dd6fee1 100644
--- a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-header/historical-data-inspect-results-header.component.html
+++ b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-header/historical-data-inspect-results-header.component.html
@@ -1,10 +1,10 @@
-<fb-list-header>
-    <div class="fb-body-2" fxFlex="120px">ID</div>
-    <div class="fb-body-2" fxFlex="120px">RESULT STATUS</div>
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-2" fxFlex="0 0 120px">ID</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">RESULT STATUS</div>
     <div class="fb-body-2" fxFlex>PARTY ID</div>
     <div class="fb-body-2" fxFlex>SHOP ID</div>
     <div class="fb-body-2" fxFlex>EMAIL</div>
     <div class="fb-body-2" fxFlex>TEMPLATE</div>
     <div class="fb-body-2" fxFlex>RULE</div>
-    <div class="fb-body-2" fxFlex="168px">EVENT TIME</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">EVENT TIME</div>
 </fb-list-header>
diff --git a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-item/historical-data-inspect-results-item.component.html b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-item/historical-data-inspect-results-item.component.html
index a11532bc..51e38768 100644
--- a/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-item/historical-data-inspect-results-item.component.html
+++ b/src/app/sections/historical-data/components/inspect-results/historical-inspect-results-list/components/template-item/historical-data-inspect-results-item.component.html
@@ -1,8 +1,8 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-2" fxFlex="120px">{{ inspectResult.payment.id }}</div>
-            <div class="fb-body-2" fxFlex="120px">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ inspectResult.payment.id }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">
                 <fb-tag
                     [color]="inspectResult.resultStatus | inspectResultToColor"
                     [title]="inspectResult.resultStatus"
@@ -20,7 +20,7 @@
                 <div *ngIf="inspectResult.checkedTemplate === 'RULE_NOT_CHECKED'">-</div>
             </div>
             <div class="fb-body-2" fxFlex>{{ inspectResult.ruleChecked }}</div>
-            <div class="fb-body-2" fxFlex="160px">
+            <div class="fb-body-2" fxFlex="0 0 160px">
                 {{ inspectResult.payment.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}
             </div>
         </div>
diff --git a/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-header/historical-data-payment-header.component.html b/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-header/historical-data-payment-header.component.html
index 6d6ebbfc..a2d37487 100644
--- a/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-header/historical-data-payment-header.component.html
+++ b/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-header/historical-data-payment-header.component.html
@@ -1,13 +1,13 @@
-<fb-list-header>
-    <div class="fb-body-checkbox" fxFlex="30px" matTooltip="Select only shown rows!">
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-checkbox" fxFlex="0 0 30px" matTooltip="Select only shown rows!">
         <mat-checkbox color="primary" (change)="changeAll($event)"></mat-checkbox>
     </div>
-    <div class="fb-body-2" fxFlex="120px">ID</div>
-    <div class="fb-body-2" fxFlex="120px">STATUS</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">ID</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">STATUS</div>
     <div class="fb-body-2" fxFlex>PARTY ID</div>
     <div class="fb-body-2" fxFlex>SHOP ID</div>
-    <div class="fb-body-2" fxFlex="120px">AMOUNT</div>
-    <div class="fb-body-2" fxFlex="120px">CURRENCY</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">AMOUNT</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">CURRENCY</div>
     <div class="fb-body-2" fxFlex>EMAIL</div>
-    <div class="fb-body-2" fxFlex="168px">EVENT TIME</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">EVENT TIME</div>
 </fb-list-header>
diff --git a/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-item/historical-data-payment-item.component.html b/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-item/historical-data-payment-item.component.html
index a9c68044..14343c92 100644
--- a/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-item/historical-data-payment-item.component.html
+++ b/src/app/sections/historical-data/components/payments/historical-payment-list/components/template-item/historical-data-payment-item.component.html
@@ -1,19 +1,19 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header #exppanel>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-checkbox" fxFlex="30px" (click)="!exppanel._toggle()">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-checkbox" fxFlex="0 0 30px" (click)="!exppanel._toggle()">
                 <mat-checkbox color="primary" (change)="emmitChange()" [checked]="enabled"> </mat-checkbox>
             </div>
-            <div class="fb-body-2" fxFlex="120px">{{ payment.id }}</div>
-            <div class="fb-body-2" fxFlex="120px">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ payment.id }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">
                 <fb-tag [color]="payment.status | paymentStatusToColor" [title]="payment.status"></fb-tag>
             </div>
             <div class="fb-body-2" fxFlex>{{ payment.merchantInfo.partyId }}</div>
             <div class="fb-body-2" fxFlex>{{ payment.merchantInfo.shopId }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ payment.amount }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ payment.currency }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ payment.amount }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ payment.currency }}</div>
             <div class="fb-body-2" fxFlex>{{ payment.clientInfo.email }}</div>
-            <div class="fb-body-2" fxFlex="160px">{{ payment.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+            <div class="fb-body-2" fxFlex="0 0 160px">{{ payment.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
         </div>
     </mat-expansion-panel-header>
     <div class="panel-content" fxLayout="column" [fxLayoutGap]="layoutGapM">
diff --git a/src/app/sections/historical-data/components/payments/historical-payments-data.component.html b/src/app/sections/historical-data/components/payments/historical-payments-data.component.html
index f9a58255..ba00cf8c 100644
--- a/src/app/sections/historical-data/components/payments/historical-payments-data.component.html
+++ b/src/app/sections/historical-data/components/payments/historical-payments-data.component.html
@@ -15,7 +15,7 @@
         <fb-show-more-continuation-panel
             *ngIf="hasMore$ | async"
             [isLoading]="inProgress$ | async"
-            (showMore)="fetchMore($event)"
+            (showMore)="fetchMore()"
         ></fb-show-more-continuation-panel>
     </div>
     <ng-template #Empty>
diff --git a/src/app/sections/historical-data/components/payments/historical-payments-data.component.ts b/src/app/sections/historical-data/components/payments/historical-payments-data.component.ts
index ac7c08ef..152f5f26 100644
--- a/src/app/sections/historical-data/components/payments/historical-payments-data.component.ts
+++ b/src/app/sections/historical-data/components/payments/historical-payments-data.component.ts
@@ -32,8 +32,8 @@ export class HistoricalPaymentsDataComponent {
         this.fetchPaymentsService.search(this.initParams(event));
     }
 
-    fetchMore(event) {
-        this.fetchPaymentsService.fetchMore(this.initParams(event));
+    fetchMore() {
+        this.fetchPaymentsService.fetchMore();
     }
 
     checkPayments($event) {
diff --git a/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.html b/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.html
index 68837c2d..edbc2d34 100644
--- a/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.html
+++ b/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.html
@@ -8,7 +8,7 @@
         <fb-show-more-continuation-panel
             *ngIf="hasMore$ | async"
             [isLoading]="inProgress$ | async"
-            (showMore)="fetchMore($event)"
+            (showMore)="fetchMore()"
         ></fb-show-more-continuation-panel>
     </div>
     <ng-template #Empty>
diff --git a/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.ts b/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.ts
index cba0e82a..24398ab3 100644
--- a/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.ts
+++ b/src/app/sections/historical-data/components/refunds/historical-refunds-data.component.ts
@@ -22,8 +22,8 @@ export class HistoricalRefundsDataComponent {
         this.fetchPaymentsSefetchHistoricalRefundsServicevice.search(this.initParams(event));
     }
 
-    fetchMore(event) {
-        this.fetchPaymentsSefetchHistoricalRefundsServicevice.fetchMore(this.initParams(event));
+    fetchMore() {
+        this.fetchPaymentsSefetchHistoricalRefundsServicevice.fetchMore();
     }
 
     private initParams(event) {
diff --git a/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-header/historical-data-refunds-header.component.html b/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-header/historical-data-refunds-header.component.html
index f2a6ef59..c7a1d124 100644
--- a/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-header/historical-data-refunds-header.component.html
+++ b/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-header/historical-data-refunds-header.component.html
@@ -1,10 +1,10 @@
-<fb-list-header>
-    <div class="fb-body-2" fxFlex="120px">ID</div>
-    <div class="fb-body-2" fxFlex="120px">STATUS</div>
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-2" fxFlex="0 0 120px">ID</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">STATUS</div>
     <div class="fb-body-2" fxFlex>PARTY ID</div>
     <div class="fb-body-2" fxFlex>SHOP ID</div>
-    <div class="fb-body-2" fxFlex="120px">AMOUNT</div>
-    <div class="fb-body-2" fxFlex="120px">CURRENCY</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">AMOUNT</div>
+    <div class="fb-body-2" fxFlex="0 0 120px">CURRENCY</div>
     <div class="fb-body-2" fxFlex>EMAIL</div>
-    <div class="fb-body-2" fxFlex="168px">EVENT TIME</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">EVENT TIME</div>
 </fb-list-header>
diff --git a/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-item/historical-data-refunds-item.component.html b/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-item/historical-data-refunds-item.component.html
index 9838b86f..a479c374 100644
--- a/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-item/historical-data-refunds-item.component.html
+++ b/src/app/sections/historical-data/components/refunds/historical-refunds-list/components/template-item/historical-data-refunds-item.component.html
@@ -1,16 +1,16 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-2" fxFlex="120px">{{ refund.id }}</div>
-            <div class="fb-body-2" fxFlex="120px">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ refund.id }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">
                 <fb-tag [color]="refund.status | refundStatusToColor" [title]="refund.status"></fb-tag>
             </div>
             <div class="fb-body-2" fxFlex>{{ refund.merchantInfo.partyId }}</div>
             <div class="fb-body-2" fxFlex>{{ refund.merchantInfo.shopId }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ refund.amount }}</div>
-            <div class="fb-body-2" fxFlex="120px">{{ refund.currency }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ refund.amount }}</div>
+            <div class="fb-body-2" fxFlex="0 0 120px">{{ refund.currency }}</div>
             <div class="fb-body-2" fxFlex>{{ refund.clientInfo.email }}</div>
-            <div class="fb-body-2" fxFlex="160px">{{ refund.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+            <div class="fb-body-2" fxFlex="0 0 160px">{{ refund.eventTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
         </div>
     </mat-expansion-panel-header>
     <div class="panel-content" fxLayout="column" [fxLayoutGap]="layoutGapM">
diff --git a/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-header/candidates-batches-table-header.component.html b/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-header/candidates-batches-table-header.component.html
index 935870cb..d9c8b75b 100644
--- a/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-header/candidates-batches-table-header.component.html
+++ b/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-header/candidates-batches-table-header.component.html
@@ -1,5 +1,5 @@
 <fb-list-header>
-    <div class="fb-body-checkbox" fxFlex="30px" matTooltip="Select only shown rows!">
+    <div class="fb-body-checkbox" fxFlex="0 0 30px" matTooltip="Select only shown rows!">
         <mat-checkbox color="primary" (change)="changeAll($event)"></mat-checkbox>
     </div>
     <div class="fb-body-2" fxFlex>List Type</div>
diff --git a/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-item/candidates-batches-table-item.component.html b/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-item/candidates-batches-table-item.component.html
index 1eeaf056..e28a2da8 100644
--- a/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-item/candidates-batches-table-item.component.html
+++ b/src/app/sections/lists-candidates-batches/components/approve-lists-raws/components/candidates-list/components/candidates-batches-table-item/candidates-batches-table-item.component.html
@@ -1,6 +1,6 @@
 <mat-card class="fb-list-item" fxLayout fxFlexFill fxLayoutAlign="center center" [fxLayoutGap]="layoutGapM">
     <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-        <div class="fb-body-checkbox" fxFlex="30px">
+        <div class="fb-body-checkbox" fxFlex="0 0 30px">
             <mat-checkbox color="primary" (change)="emmitChange()" [checked]="enabled"> </mat-checkbox>
         </div>
         <div class="fb-body-2" fxFlex>{{ candidate.listType }}</div>
diff --git a/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-header/candidate-header.component.html b/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-header/candidate-header.component.html
index 62a9b831..7a6b435c 100644
--- a/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-header/candidate-header.component.html
+++ b/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-header/candidate-header.component.html
@@ -1,6 +1,6 @@
-<fb-list-header>
+<fb-list-header [reserveToggleSpace]="true">
     <div class="fb-body-2" fxFlex>Source</div>
     <div class="fb-body-2" fxFlex>Size</div>
     <div class="fb-body-2" fxFlex>Fields</div>
-    <div class="fb-body-2" fxFlex="168px">Updated At</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">Updated At</div>
 </fb-list-header>
diff --git a/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-item/candidate-item.component.html b/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-item/candidate-item.component.html
index d26e986b..4276646e 100644
--- a/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-item/candidate-item.component.html
+++ b/src/app/sections/lists/components/candidates/components/candidates-list/components/candidate-item/candidate-item.component.html
@@ -1,10 +1,10 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
             <div class="fb-body-2" fxFlex>{{ candidate.source }}</div>
             <div class="fb-body-2" fxFlex>{{ candidate.size }}</div>
             <div class="fb-body-2" fxFlex>{{ candidate.fields }}</div>
-            <div class="fb-body-2" fxFlex="160px">
+            <div class="fb-body-2" fxFlex="0 0 160px">
                 {{ candidate.createdAt | date : 'yyyy-MM-dd HH:mm:ss' }}
             </div>
         </div>
diff --git a/src/app/sections/notifications/components/channels/channels-list/components/channel-header/channel-header.component.html b/src/app/sections/notifications/components/channels/channels-list/components/channel-header/channel-header.component.html
index f92f5551..9ba64ff7 100644
--- a/src/app/sections/notifications/components/channels/channels-list/components/channel-header/channel-header.component.html
+++ b/src/app/sections/notifications/components/channels/channels-list/components/channel-header/channel-header.component.html
@@ -2,6 +2,6 @@
     <div class="fb-body-2" fxFlex>NAME</div>
     <div class="fb-body-2" fxFlex>TYPE</div>
     <div class="fb-body-2" fxFlex>DESTINATION</div>
-    <div class="fb-body-2" fxFlex="160px">CREATED AT</div>
-    <div fxFlex="56px"></div>
+    <div class="fb-body-2" fxFlex="0 0 160px">CREATED AT</div>
+    <div fxFlex="0 0 20px"></div>
 </fb-list-header>
diff --git a/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.html b/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.html
index 6a51587e..127389bb 100644
--- a/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.html
+++ b/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.html
@@ -2,9 +2,9 @@
     <div class="fb-body-2" fxFlex>{{ channel.name }}</div>
     <div class="fb-body-2" fxFlex>{{ channel.type }}</div>
     <div class="fb-body-2" fxFlex>{{ channel.destination }}</div>
-    <div class="fb-body-2" fxFlex="160px">{{ channel.createdAt | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">{{ channel.createdAt | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
     <ng-container>
-        <button mat-icon-button [matMenuTriggerFor]="menu">
+        <button mat-icon-button fxFlex="0 0 20px" [matMenuTriggerFor]="menu">
             <mat-icon>more_vert</mat-icon>
         </button>
         <mat-menu #menu="matMenu">
diff --git a/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.scss b/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.scss
index 21dc2c61..655681f4 100644
--- a/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.scss
+++ b/src/app/sections/notifications/components/channels/channels-list/components/channel-item/channel-item.component.scss
@@ -1,7 +1,3 @@
-.fb-list-item {
-    height: 48px !important;
-}
-
 .wrap {
     word-wrap: anywhere;
 }
diff --git a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-header/notification-header.component.html b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-header/notification-header.component.html
index a42a095f..010f2608 100644
--- a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-header/notification-header.component.html
+++ b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-header/notification-header.component.html
@@ -5,7 +5,7 @@
     <div class="fb-body-2 wrap" fxFlex>CHANNEL</div>
     <div class="fb-body-2 wrap" fxFlex>FREQUENCY</div>
     <div class="fb-body-2 wrap" fxFlex>STATUS</div>
-    <div class="fb-body-2 wrap" fxFlex="240px">SUBJECT</div>
-    <div class="fb-body-2 wrap" fxFlex="160px">CREATED</div>
-    <div fxFlex="56px"></div>
+    <div class="fb-body-2 wrap" fxFlex="0 0 240px">SUBJECT</div>
+    <div class="fb-body-2 wrap" fxFlex="0 0 160px">CREATED</div>
+    <div fxFlex="0 0 20px"></div>
 </fb-list-header>
diff --git a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.html b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.html
index 35a7f91f..c556f8b4 100644
--- a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.html
+++ b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.html
@@ -7,10 +7,10 @@
     <div class="fb-body-2 wrap" fxFlex>
         <fb-tag [color]="notification.status | notificationStatusToColor" [title]="notification.status"></fb-tag>
     </div>
-    <div class="fb-body-2 wrap" fxFlex="240px">{{ notification.subject }}</div>
-    <div class="fb-body-2 wrap" fxFlex="160px">{{ notification.createdAt | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+    <div class="fb-body-2 wrap" fxFlex="0 0 240px">{{ notification.subject }}</div>
+    <div class="fb-body-2 wrap" fxFlex="0 0 160px">{{ notification.createdAt | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
     <ng-container>
-        <button mat-icon-button [matMenuTriggerFor]="menu">
+        <button mat-icon-button fxFlex="0 0 20px" [matMenuTriggerFor]="menu">
             <mat-icon>more_vert</mat-icon>
         </button>
         <mat-menu #menu="matMenu">
diff --git a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.scss b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.scss
index 21dc2c61..655681f4 100644
--- a/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.scss
+++ b/src/app/sections/notifications/components/periodical/periodical-notifications-list/components/notification-item/notification-item.component.scss
@@ -1,7 +1,3 @@
-.fb-list-item {
-    height: 48px !important;
-}
-
 .wrap {
     word-wrap: anywhere;
 }
diff --git a/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-header/template-header.component.html b/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-header/template-header.component.html
index c4afdce1..95f0b9c7 100644
--- a/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-header/template-header.component.html
+++ b/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-header/template-header.component.html
@@ -1,4 +1,4 @@
-<fb-list-header>
+<fb-list-header [reserveToggleSpace]="true">
     <div class="fb-body-2" fxFlex>ID</div>
     <div class="fb-body-2" fxFlex>Updated At</div>
 </fb-list-header>
diff --git a/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-item/template-item.component.html b/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-item/template-item.component.html
index 0ae225b5..eaf838aa 100644
--- a/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-item/template-item.component.html
+++ b/src/app/sections/templates/components/payment-templates/payment-templates-list/components/template-item/template-item.component.html
@@ -1,6 +1,6 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
             <div class="fb-body-2" fxFlex>{{ template.id }}</div>
             <div class="fb-body-2" fxFlex>{{ template.lastUpdateDate | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
         </div>
diff --git a/src/app/sections/testing/components/emulation/template/emulation-template.component.html b/src/app/sections/testing/components/emulation/template/emulation-template.component.html
index 48953d3e..13ef3238 100644
--- a/src/app/sections/testing/components/emulation/template/emulation-template.component.html
+++ b/src/app/sections/testing/components/emulation/template/emulation-template.component.html
@@ -16,7 +16,7 @@
                 <div fxFlex="100">
                     <table mat-table [dataSource]="templates$ | async" class="fb-table">
                         <ng-container matColumnDef="id">
-                            <td mat-cell *matCellDef="let element" fxFlex="200px">{{ element.id }}</td>
+                            <td mat-cell *matCellDef="let element" fxFlex="0 0 200px">{{ element.id }}</td>
                         </ng-container>
                         <ng-container matColumnDef="template">
                             <td mat-cell *matCellDef="let element" fxLayout="column" fxLayoutGap="8px">
diff --git a/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-header/payment-data-set-header.component.html b/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-header/payment-data-set-header.component.html
index ff5b9470..a61780a4 100644
--- a/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-header/payment-data-set-header.component.html
+++ b/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-header/payment-data-set-header.component.html
@@ -1,5 +1,5 @@
-<fb-list-header>
-    <div class="fb-body-2" fxFlex="100px">ID</div>
+<fb-list-header [reserveToggleSpace]="true">
+    <div class="fb-body-2" fxFlex="0 0 100px">ID</div>
     <div class="fb-body-2" fxFlex>NAME</div>
     <div class="fb-body-2" fxFlex>LAST MODIFICATION BY</div>
     <div class="fb-body-2" fxFlex>LAST MODIFICATION TIME</div>
diff --git a/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-item/payment-data-set-item.component.html b/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-item/payment-data-set-item.component.html
index 183d82c5..1158967b 100644
--- a/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-item/payment-data-set-item.component.html
+++ b/src/app/sections/testing/components/payment-data-sets/payment-data-sets-list/components/data-set-item/payment-data-set-item.component.html
@@ -1,7 +1,7 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header #exppanel>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
-            <div class="fb-body-2" fxFlex="100px">{{ dataSet.id }}</div>
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
+            <div class="fb-body-2" fxFlex="0 0 100px">{{ dataSet.id }}</div>
             <div class="fb-body-2" fxFlex>{{ dataSet.name }}</div>
             <div class="fb-body-2" fxFlex>{{ dataSet.lastModificationInitiator }}</div>
             <div class="fb-body-2" fxFlex>{{ dataSet.lastModificationAt | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
diff --git a/src/app/shared/components/charts/bar-chart/bar-chart.component.spec.ts b/src/app/shared/components/charts/bar-chart/bar-chart.component.spec.ts
index f8ee79a0..cdd4404b 100644
--- a/src/app/shared/components/charts/bar-chart/bar-chart.component.spec.ts
+++ b/src/app/shared/components/charts/bar-chart/bar-chart.component.spec.ts
@@ -8,4 +8,16 @@ describe('BarChartComponent', () => {
         expect(component.config).toEqual(DEFAULT_CONFIG);
         expect(component.config).not.toBe(DEFAULT_CONFIG);
     });
+
+    it('zooms by selection without reacting to the mouse wheel', () => {
+        const component = new BarChartComponent();
+
+        expect(component.config.chart.zoom).toEqual(
+            jasmine.objectContaining({
+                enabled: true,
+                type: 'x',
+                allowMouseWheelZoom: false,
+            })
+        );
+    });
 });
diff --git a/src/app/shared/components/charts/bar-chart/default-config.ts b/src/app/shared/components/charts/bar-chart/default-config.ts
index ac91a3b4..dd37c802 100644
--- a/src/app/shared/components/charts/bar-chart/default-config.ts
+++ b/src/app/shared/components/charts/bar-chart/default-config.ts
@@ -7,6 +7,10 @@ import { formatAmount } from '../format-amount';
 
 const COLUMN_WIDTH = '30%';
 
+type ZoomOptionsWithMouseWheelControl = NonNullable<NonNullable<ApexOptions['chart']>['zoom']> & {
+    allowMouseWheelZoom: boolean;
+};
+
 export const DEFAULT_CONFIG: ApexOptions = {
     chart: {
         type: 'bar',
@@ -16,6 +20,11 @@ export const DEFAULT_CONFIG: ApexOptions = {
         toolbar: {
             show: false,
         },
+        zoom: {
+            enabled: true,
+            type: 'x',
+            allowMouseWheelZoom: false,
+        } as ZoomOptionsWithMouseWheelControl,
         animations: DEFAULT_ANIMATION,
     },
     dataLabels: {
diff --git a/src/app/shared/components/list-header/list-header.component.html b/src/app/shared/components/list-header/list-header.component.html
index e7591dd6..9badb3ee 100644
--- a/src/app/shared/components/list-header/list-header.component.html
+++ b/src/app/shared/components/list-header/list-header.component.html
@@ -1,3 +1,9 @@
-<mat-card class="list-header" fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
+<mat-card
+    class="list-header"
+    [class.reserve-toggle-space]="reserveToggleSpace"
+    fxLayout
+    fxFlexFill
+    [fxLayoutGap]="layoutGapM"
+>
     <ng-content></ng-content>
 </mat-card>
diff --git a/src/app/shared/components/list-header/list-header.component.scss b/src/app/shared/components/list-header/list-header.component.scss
index 58546749..fca6abef 100644
--- a/src/app/shared/components/list-header/list-header.component.scss
+++ b/src/app/shared/components/list-header/list-header.component.scss
@@ -6,3 +6,7 @@
 mat-card.mat-mdc-card.mdc-card.list-header {
     max-height: 48px;
 }
+
+mat-card.mat-mdc-card.mdc-card.list-header.reserve-toggle-space {
+    padding-right: 32px !important;
+}
diff --git a/src/app/shared/components/list-header/list-header.component.ts b/src/app/shared/components/list-header/list-header.component.ts
index 43928842..c5b7c83e 100644
--- a/src/app/shared/components/list-header/list-header.component.ts
+++ b/src/app/shared/components/list-header/list-header.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, Input } from '@angular/core';
 
 import { LAYOUT_GAP_M } from '../../../tokens';
 
@@ -8,5 +8,8 @@ import { LAYOUT_GAP_M } from '../../../tokens';
     styleUrls: ['list-header.component.scss'],
 })
 export class ListHeaderComponent {
+    @Input()
+    reserveToggleSpace = false;
+
     constructor(@Inject(LAYOUT_GAP_M) public layoutGapM: string) {}
 }
diff --git a/src/app/shared/components/payment-references-list/components/reference-header/reference-header.component.html b/src/app/shared/components/payment-references-list/components/reference-header/reference-header.component.html
index d6917813..5cc25108 100644
--- a/src/app/shared/components/payment-references-list/components/reference-header/reference-header.component.html
+++ b/src/app/shared/components/payment-references-list/components/reference-header/reference-header.component.html
@@ -4,5 +4,5 @@
     <div class="fb-body-2" fxFlex>Party ID</div>
     <div class="fb-body-2" fxFlex>Shop ID</div>
     <div class="fb-body-2" fxFlex>Updated At</div>
-    <div fxFlex="40px"></div>
+    <div fxFlex="0 0 20px"></div>
 </fb-list-header>
diff --git a/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.html b/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.html
index cfb8fab5..40ee26c3 100644
--- a/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.html
+++ b/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.html
@@ -5,7 +5,7 @@
     <div class="fb-body-2 wrap" fxFlex>{{ reference.shopId }}</div>
     <div class="fb-body-2 wrap" fxFlex>{{ reference.lastUpdateDate | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
     <ng-container>
-        <button mat-icon-button [matMenuTriggerFor]="menu">
+        <button mat-icon-button fxFlex="0 0 20px" [matMenuTriggerFor]="menu">
             <mat-icon>more_vert</mat-icon>
         </button>
         <mat-menu #menu="matMenu">
diff --git a/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.scss b/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.scss
index 21dc2c61..655681f4 100644
--- a/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.scss
+++ b/src/app/shared/components/payment-references-list/components/reference-item/reference-item.component.scss
@@ -1,7 +1,3 @@
-.fb-list-item {
-    height: 48px !important;
-}
-
 .wrap {
     word-wrap: anywhere;
 }
diff --git a/src/app/shared/components/testing-data-set-list/components/data-set-payment-header/data-set-payment-header.component.html b/src/app/shared/components/testing-data-set-list/components/data-set-payment-header/data-set-payment-header.component.html
index a03a864d..653b8f38 100644
--- a/src/app/shared/components/testing-data-set-list/components/data-set-payment-header/data-set-payment-header.component.html
+++ b/src/app/shared/components/testing-data-set-list/components/data-set-payment-header/data-set-payment-header.component.html
@@ -1,4 +1,4 @@
-<fb-list-header>
+<fb-list-header [reserveToggleSpace]="true">
     <div class="fb-body-2" fxFlex>ID</div>
     <div class="fb-body-2" fxFlex>RESULT STATUS</div>
     <div class="fb-body-2" fxFlex>RULE CHECKED</div>
diff --git a/src/app/shared/components/testing-data-set-list/components/data-set-payment-item/data-set-payment-item.component.html b/src/app/shared/components/testing-data-set-list/components/data-set-payment-item/data-set-payment-item.component.html
index 3c5b3600..48feaf2d 100644
--- a/src/app/shared/components/testing-data-set-list/components/data-set-payment-item/data-set-payment-item.component.html
+++ b/src/app/shared/components/testing-data-set-list/components/data-set-payment-item/data-set-payment-item.component.html
@@ -1,6 +1,6 @@
 <mat-expansion-panel>
     <mat-expansion-panel-header #exppanel>
-        <div fxLayout fxFlexFill [fxLayoutGap]="layoutGapM">
+        <div fxLayout fxFlexFill fxLayoutAlign="start center" [fxLayoutGap]="layoutGapM">
             <div class="fb-body-2" fxFlex>{{ checkedDataSetRow.payment.paymentId }}</div>
             <div class="fb-body-2" fxFlex>
                 <fb-tag
diff --git a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-header/wb-rows-header.component.html b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-header/wb-rows-header.component.html
index d9a576af..62dc190e 100644
--- a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-header/wb-rows-header.component.html
+++ b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-header/wb-rows-header.component.html
@@ -3,5 +3,5 @@
     <div class="fb-body-2" fxFlex>Party id</div>
     <div class="fb-body-2" fxFlex>Shop id</div>
     <div class="fb-body-2" fxFlex>Value</div>
-    <div class="fb-body-2" fxFlex="216px">Inserted At</div>
+    <div class="fb-body-2" fxFlex="0 0 196px">Inserted At</div>
 </fb-list-header>
diff --git a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.html b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.html
index 89cf2b84..8ae975c1 100644
--- a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.html
+++ b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.html
@@ -3,9 +3,9 @@
     <div class="fb-body-2" fxFlex>{{ listRecord.partyId }}</div>
     <div class="fb-body-2" fxFlex>{{ listRecord.shopId }}</div>
     <div class="fb-body-2" fxFlex>{{ listRecord.value }}</div>
-    <div class="fb-body-2" fxFlex="160px">{{ listRecord.insertTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
+    <div class="fb-body-2" fxFlex="0 0 160px">{{ listRecord.insertTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
     <ng-container>
-        <button mat-icon-button [matMenuTriggerFor]="menu">
+        <button mat-icon-button fxFlex="0 0 20px" [matMenuTriggerFor]="menu">
             <mat-icon>more_vert</mat-icon>
         </button>
         <mat-menu #menu="matMenu">
diff --git a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.scss b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.scss
index 21dc2c61..655681f4 100644
--- a/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.scss
+++ b/src/app/shared/components/wb-list/components/wb-rows-list/components/wb-rows-item/wb-rows-item.component.scss
@@ -1,7 +1,3 @@
-.fb-list-item {
-    height: 48px !important;
-}
-
 .wrap {
     word-wrap: anywhere;
 }
diff --git a/src/app/shared/components/wb-list/services/fetch-wb-list.service.spec.ts b/src/app/shared/components/wb-list/services/fetch-wb-list.service.spec.ts
new file mode 100644
index 00000000..c4f60ee5
--- /dev/null
+++ b/src/app/shared/components/wb-list/services/fetch-wb-list.service.spec.ts
@@ -0,0 +1,29 @@
+import { of } from 'rxjs';
+
+import { FetchWbListService } from './fetch-wb-list.service';
+import { PaymentListsService } from '../../../../api/payments/lists';
+import { ConfigService } from '../../../../config';
+import { ListType } from '../../../constants/list-type';
+
+describe('FetchWbListService', () => {
+    it('uses the last record id and insert time as the next page cursor', () => {
+        const paymentListsService = {
+            findListRows: jasmine.createSpy().and.returnValue(of({ result: [], count: 0 })),
+        } as unknown as PaymentListsService;
+        const configService = { pageSize: 100 } as ConfigService;
+        const service = new FetchWbListService(paymentListsService, configService);
+        const lastRecord = {
+            id: 'last-id',
+            insertTime: new Date('2026-08-21T10:00:00'),
+        };
+
+        service['fetch']({ listType: ListType.Black, listNames: ['email'] }, lastRecord.id, lastRecord).subscribe();
+
+        expect(paymentListsService.findListRows).toHaveBeenCalledWith(
+            jasmine.objectContaining({
+                lastId: lastRecord.id,
+                sortFieldValue: String(lastRecord.insertTime),
+            })
+        );
+    });
+});
diff --git a/src/app/shared/components/wb-list/services/fetch-wb-list.service.ts b/src/app/shared/components/wb-list/services/fetch-wb-list.service.ts
index b9397767..c8ce1a38 100644
--- a/src/app/shared/components/wb-list/services/fetch-wb-list.service.ts
+++ b/src/app/shared/components/wb-list/services/fetch-wb-list.service.ts
@@ -29,8 +29,7 @@ export class FetchWbListService extends PartialFetcher<WbListRecord, FetchRowsPa
     protected fetch(
         params: FetchRowsParams,
         lastId?: string,
-        listTypeNew?: ListType,
-        listNamesNew?: string[]
+        lastRecord?: WbListRecord
     ): Observable<FetchResult<WbListRecord>> {
         const { searchValue, sortOrder, pageSize, listType, listNames } = params;
         return this.paymentListsService.findListRows({
@@ -38,8 +37,9 @@ export class FetchWbListService extends PartialFetcher<WbListRecord, FetchRowsPa
             sortOrder: sortOrder || SortOrder.Asc,
             ...(searchValue ? { searchValue } : {}),
             ...(lastId ? { lastId } : {}),
-            listType: listType ? listType : listTypeNew,
-            listNames: listNames ? listNames : listNamesNew,
+            ...(lastRecord?.insertTime ? { sortFieldValue: String(lastRecord.insertTime) } : {}),
+            listType,
+            listNames,
         });
     }
 }
diff --git a/src/app/shared/utils/partial-fetcher/fetch-fn.ts b/src/app/shared/utils/partial-fetcher/fetch-fn.ts
index 45d0e4ba..edb46d14 100644
--- a/src/app/shared/utils/partial-fetcher/fetch-fn.ts
+++ b/src/app/shared/utils/partial-fetcher/fetch-fn.ts
@@ -2,4 +2,4 @@ import { Observable } from 'rxjs';
 
 import { FetchResult } from './fetch-result';
 
-export type FetchFn<P, R> = (params: P, lastId?: string) => Observable<FetchResult<R>>;
+export type FetchFn<P, R> = (params: P, lastId?: string, lastItem?: R) => Observable<FetchResult<R>>;
diff --git a/src/app/shared/utils/partial-fetcher/operators/scan-search-result.spec.ts b/src/app/shared/utils/partial-fetcher/operators/scan-search-result.spec.ts
new file mode 100644
index 00000000..afa327b4
--- /dev/null
+++ b/src/app/shared/utils/partial-fetcher/operators/scan-search-result.spec.ts
@@ -0,0 +1,30 @@
+import { of, Subject } from 'rxjs';
+
+import { FetchAction } from '../fetch-action';
+import { FetchFn } from '../fetch-fn';
+import { scanFetchResult } from './scan-search-result';
+
+interface Item {
+    id: string;
+    insertTime: string;
+}
+
+describe('scanFetchResult', () => {
+    it('passes the last id and item when fetching the next page', () => {
+        const params = { searchValue: 'value' };
+        const firstPage = [{ id: 'first-id', insertTime: '2026-08-21T10:00:00' }];
+        const secondPage = [{ id: 'second-id', insertTime: '2026-08-21T10:01:00' }];
+        const calls: Parameters<FetchFn<typeof params, Item>>[] = [];
+        const fetch: FetchFn<typeof params, Item> = (...args) => {
+            calls.push(args);
+            return of({ result: calls.length === 1 ? firstPage : secondPage, count: 2 });
+        };
+        const actions$ = new Subject<FetchAction<typeof params>>();
+
+        actions$.pipe(scanFetchResult(fetch)).subscribe();
+        actions$.next({ type: 'search', value: params });
+        actions$.next({ type: 'fetchMore', value: params });
+
+        expect(calls[1]).toEqual([params, firstPage[0].id, firstPage[0]]);
+    });
+});
diff --git a/src/app/shared/utils/partial-fetcher/operators/scan-search-result.ts b/src/app/shared/utils/partial-fetcher/operators/scan-search-result.ts
index 0cda3d89..c0f13c41 100644
--- a/src/app/shared/utils/partial-fetcher/operators/scan-search-result.ts
+++ b/src/app/shared/utils/partial-fetcher/operators/scan-search-result.ts
@@ -26,9 +26,10 @@ export const scanFetchResult =
                     switch (type) {
                         case 'search':
                             return fn(value).pipe(first(), handleFetchResultError());
-                        case 'fetchMore':
+                        case 'fetchMore': {
+                            const lastItem = result[result.length - 1];
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            return fn(value, (result[result.length - 1] as any).id).pipe(
+                            return fn(value, (lastItem as any).id, lastItem).pipe(
                                 first(),
                                 map((r) => ({
                                     result: result.concat(r.result),
@@ -36,6 +37,7 @@ export const scanFetchResult =
                                 })),
                                 handleFetchResultError(result, count)
                             );
+                        }
                     }
                 },
                 { result: [] },
diff --git a/src/app/styles/overrides/_mat-card.scss b/src/app/styles/overrides/_mat-card.scss
index 399a9fcf..74a025d8 100644
--- a/src/app/styles/overrides/_mat-card.scss
+++ b/src/app/styles/overrides/_mat-card.scss
@@ -3,4 +3,12 @@
     .mat-mdc-card {
         padding: 24px !important;
     }
+
+    .mat-card.fb-list-item,
+    .mat-mdc-card.fb-list-item {
+        min-height: 48px;
+        height: auto !important;
+        padding: 12px 24px !important;
+        align-items: center;
+    }
 }