From 4ac634b36cf2de64508a09af1e9754995b4a523c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 5 Sep 2026 21:14:36 +0200
Subject: [PATCH 1/3] Improve column width distribution

---
 apps/client/src/styles.scss                   |  9 +++++
 .../account-balances.component.html           | 12 +++++--
 .../accounts-table.component.html             | 35 ++++++++++++++-----
 .../activities-table.component.html           | 22 +++++++++---
 .../lib/benchmark/benchmark.component.html    | 17 ++++++---
 .../holdings-table.component.html             | 20 +++++++----
 .../top-holdings/top-holdings.component.html  | 18 ++--------
 7 files changed, 92 insertions(+), 41 deletions(-)

diff --git a/apps/client/src/styles.scss b/apps/client/src/styles.scss
index 739af30ae..b99acc2a2 100644
--- a/apps/client/src/styles.scss
+++ b/apps/client/src/styles.scss
@@ -349,6 +349,11 @@ ngx-skeleton-loader {
   cursor: pointer;
 }
 
+.gf-fit-content {
+  white-space: nowrap;
+  width: 1%;
+}
+
 .gf-pointer-events-none {
   pointer-events: none;
 }
@@ -361,6 +366,10 @@ ngx-skeleton-loader {
   @include table.gf-table;
 }
 
+.gf-table-column-fill {
+  width: 100%;
+}
+
 .gf-text-wrap-balance {
   text-wrap: balance;
 }
diff --git a/libs/ui/src/lib/account-balances/account-balances.component.html b/libs/ui/src/lib/account-balances/account-balances.component.html
index 780653c67..0ed668212 100644
--- a/libs/ui/src/lib/account-balances/account-balances.component.html
+++ b/libs/ui/src/lib/account-balances/account-balances.component.html
@@ -61,8 +61,16 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-center"
+        mat-header-cell
+      ></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         @if (showActions()) {
           <button
             class="mx-1 no-min-width px-2"
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.html b/libs/ui/src/lib/accounts-table/accounts-table.component.html
index a01abff1a..27336fdd8 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -24,12 +24,12 @@
     <ng-container matColumnDef="status">
       <th
         *matHeaderCellDef
-        class="d-none d-lg-table-cell px-1"
+        class="d-none d-lg-table-cell gf-fit-content px-1"
         mat-header-cell
       ></th>
       <td
         *matCellDef="let element"
-        class="d-none d-lg-table-cell px-1"
+        class="d-none d-lg-table-cell gf-fit-content px-1"
         mat-cell
       >
         <div class="d-flex justify-content-center">
@@ -40,16 +40,25 @@
       </td>
       <td
         *matFooterCellDef
-        class="d-none d-lg-table-cell px-1"
+        class="d-none d-lg-table-cell gf-fit-content px-1"
         mat-footer-cell
       ></td>
     </ng-container>
 
     <ng-container matColumnDef="account">
-      <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header="name">
+      <th
+        *matHeaderCellDef
+        class="gf-table-column-fill px-1"
+        mat-header-cell
+        mat-sort-header="name"
+      >
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="px-1 text-nowrap" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill px-1 text-nowrap"
+        mat-cell
+      >
         <gf-entity-logo
           class="d-inline d-sm-none mr-1"
           [hasPlaceholder]="true"
@@ -93,7 +102,7 @@
       </th>
       <td
         *matCellDef="let element"
-        class="d-none d-lg-table-cell px-1"
+        class="d-none d-lg-table-cell px-1 text-nowrap"
         mat-cell
       >
         <div class="d-flex">
@@ -316,8 +325,16 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-center"
+        mat-header-cell
+      ></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <button
           class="mx-1 no-min-width px-2"
           mat-button
@@ -364,7 +381,7 @@
           }
         </mat-menu>
       </td>
-      <td *matFooterCellDef class="px-1" mat-footer-cell></td>
+      <td *matFooterCellDef class="gf-fit-content px-1" mat-footer-cell></td>
     </ng-container>
 
     <tr *matHeaderRowDef="displayedColumns()" mat-header-row></tr>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 9bfd44b9d..11278ef4c 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -167,8 +167,12 @@
     </ng-container>
 
     <ng-container matColumnDef="icon" sticky>
-      <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th *matHeaderCellDef class="gf-fit-content px-1" mat-header-cell></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <gf-entity-logo
           [dataSource]="element.assetProfile?.dataSource"
           [symbol]="element.assetProfile?.symbol"
@@ -178,10 +182,14 @@
     </ng-container>
 
     <ng-container matColumnDef="nameWithSymbol">
-      <th *matHeaderCellDef class="px-1" mat-header-cell>
+      <th *matHeaderCellDef class="gf-table-column-fill px-1" mat-header-cell>
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="line-height-normal px-1" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill line-height-normal px-1"
+        mat-cell
+      >
         <div class="align-items-center d-flex text-nowrap">
           <span class="text-truncate">{{ element.assetProfile?.name }}</span>
           @if (isDraftActivity(element)) {
@@ -402,7 +410,11 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-center" mat-header-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-center"
+        mat-header-cell
+      >
         @if (
           !hasPermissionToImportActivities && hasPermissionToExportActivities
         ) {
diff --git a/libs/ui/src/lib/benchmark/benchmark.component.html b/libs/ui/src/lib/benchmark/benchmark.component.html
index 556b9875f..a4fb71e1b 100644
--- a/libs/ui/src/lib/benchmark/benchmark.component.html
+++ b/libs/ui/src/lib/benchmark/benchmark.component.html
@@ -8,8 +8,12 @@
     [dataSource]="dataSource"
   >
     <ng-container matColumnDef="icon" sticky>
-      <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th *matHeaderCellDef class="gf-fit-content px-1" mat-header-cell></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <gf-entity-logo
           [dataSource]="element.dataSource"
           [symbol]="element.symbol"
@@ -19,12 +23,17 @@
     </ng-container>
 
     <ng-container matColumnDef="name">
-      <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+      <th
+        *matHeaderCellDef
+        class="gf-table-column-fill px-1"
+        mat-header-cell
+        mat-sort-header
+      >
         <ng-container i18n>Name</ng-container>
       </th>
       <td
         *matCellDef="let element"
-        class="line-height-normal px-1 text-nowrap"
+        class="gf-table-column-fill line-height-normal px-1 text-nowrap"
         mat-cell
       >
         <div class="text-truncate">
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.html
index 44a70774f..2e88b4e17 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html
@@ -8,8 +8,12 @@
     [matSortDirection]="sortDirection()"
   >
     <ng-container matColumnDef="icon" sticky>
-      <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th *matHeaderCellDef class="gf-fit-content px-1" mat-header-cell></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <gf-entity-logo
           [dataSource]="element.assetProfile.dataSource"
           [symbol]="element.assetProfile.symbol"
@@ -21,13 +25,17 @@
     <ng-container matColumnDef="nameWithSymbol">
       <th
         *matHeaderCellDef
-        class="px-1"
+        class="gf-table-column-fill px-1"
         mat-header-cell
         mat-sort-header="assetProfile.name"
       >
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="line-height-normal px-1" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill line-height-normal px-1"
+        mat-cell
+      >
         <div class="text-truncate">
           {{ element.assetProfile.name }}
           @if (element.assetProfile.name === element.assetProfile.symbol) {
@@ -161,14 +169,14 @@
     <ng-container matColumnDef="performanceInPercentage" stickyEnd>
       <th
         *matHeaderCellDef
-        class="justify-content-end px-1"
+        class="gf-fit-content justify-content-end px-1"
         mat-header-cell
         mat-sort-header="netPerformancePercentWithCurrencyEffect"
       >
         <span class="d-none d-sm-block" i18n>Performance</span>
         <span class="d-block d-sm-none" i18n-title title="Performance">±</span>
       </th>
-      <td *matCellDef="let element" class="px-1" mat-cell>
+      <td *matCellDef="let element" class="gf-fit-content px-1" mat-cell>
         <div class="d-flex justify-content-end">
           <gf-value
             [colorizeSign]="true"
diff --git a/libs/ui/src/lib/top-holdings/top-holdings.component.html b/libs/ui/src/lib/top-holdings/top-holdings.component.html
index 60f803289..c77a12b7a 100644
--- a/libs/ui/src/lib/top-holdings/top-holdings.component.html
+++ b/libs/ui/src/lib/top-holdings/top-holdings.component.html
@@ -5,17 +5,11 @@
     multiTemplateDataRows
     [dataSource]="dataSource"
   >
-    <colgroup>
-      <col class="w-100" />
-      <col />
-      <col />
-    </colgroup>
-
     <ng-container matColumnDef="name">
-      <th *matHeaderCellDef class="px-2" mat-header-cell>
+      <th *matHeaderCellDef class="gf-table-column-fill px-2" mat-header-cell>
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="px-2" mat-cell>
+      <td *matCellDef="let element" class="gf-table-column-fill px-2" mat-cell>
         <div class="text-truncate">{{ prettifyAssetName(element?.name) }}</div>
       </td>
     </ng-container>
@@ -65,16 +59,10 @@
               mat-table
               [dataSource]="element.parents"
             >
-              <colgroup>
-                <col class="w-100" />
-                <col />
-                <col />
-              </colgroup>
-
               <ng-container matColumnDef="name">
                 <td
                   *matCellDef="let parentHolding"
-                  class="line-height-normal px-2"
+                  class="gf-table-column-fill line-height-normal px-2"
                   mat-cell
                 >
                   <div class="text-truncate">{{ parentHolding?.name }}</div>

From 9ac56e0c67f8d5a5e03b0c8e9776cd3441d1053b Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 5 Sep 2026 21:15:06 +0200
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e83a6cc75..dccf86186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added a simplified mode to the holdings table component
 
+### Changed
+
+- Improved the column width distribution of various table components
+
 ## 3.67.1 - 2026-09-05
 
 ### Added

From b590a952962865ad07c10deed99df57d67b01466 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 5 Sep 2026 21:20:51 +0200
Subject: [PATCH 3/3] Improve column width distribution

---
 .../access-table/access-table.component.html  | 27 ++++++++++++---
 .../app/components/admin-jobs/admin-jobs.html | 14 ++++++--
 .../admin-market-data/admin-market-data.html  | 22 +++++++++----
 .../admin-overview/admin-overview.html        | 16 ++++++---
 .../admin-platform.component.html             | 33 +++++++++++++++----
 .../admin-settings.component.html             | 32 ++++++++++++++----
 .../admin-tag/admin-tag.component.html        | 25 +++++++++++---
 .../components/admin-users/admin-users.html   |  8 ++---
 8 files changed, 139 insertions(+), 38 deletions(-)

diff --git a/apps/client/src/app/components/access-table/access-table.component.html b/apps/client/src/app/components/access-table/access-table.component.html
index b8c2f8422..6fc994b14 100644
--- a/apps/client/src/app/components/access-table/access-table.component.html
+++ b/apps/client/src/app/components/access-table/access-table.component.html
@@ -1,8 +1,19 @@
 <div class="overflow-x-auto">
   <table class="gf-table w-100" mat-table [dataSource]="dataSource">
     <ng-container matColumnDef="alias">
-      <th *matHeaderCellDef class="px-1" i18n mat-header-cell>Alias</th>
-      <td *matCellDef="let element" class="px-1 text-nowrap" mat-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-table-column-fill px-1"
+        i18n
+        mat-header-cell
+      >
+        Alias
+      </th>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill px-1 text-nowrap"
+        mat-cell
+      >
         {{ element.alias }}
       </td>
     </ng-container>
@@ -46,9 +57,17 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-right" mat-header-cell></th>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-right"
+        mat-header-cell
+      ></th>
 
-      <td *matCellDef="let element" class="px-1 text-right" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-right"
+        mat-cell
+      >
         <button
           class="mx-1 no-min-width px-2"
           mat-button
diff --git a/apps/client/src/app/components/admin-jobs/admin-jobs.html b/apps/client/src/app/components/admin-jobs/admin-jobs.html
index fe893690b..c9d6ca77b 100644
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.html
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.html
@@ -27,13 +27,17 @@
         <ng-container matColumnDef="index">
           <th
             *matHeaderCellDef
-            class="justify-content-end px-1 py-2"
+            class="gf-table-column-fill justify-content-end px-1 py-2"
             mat-header-cell
             mat-sort-header="id"
           >
             <ng-container i18n>Job ID</ng-container>
           </th>
-          <td *matCellDef="let element" class="px-1 py-2 text-right" mat-cell>
+          <td
+            *matCellDef="let element"
+            class="gf-table-column-fill px-1 py-2 text-right"
+            mat-cell
+          >
             {{ element.id }}
           </td>
         </ng-container>
@@ -179,7 +183,11 @@
         </ng-container>
 
         <ng-container matColumnDef="actions" stickyEnd>
-          <th *matHeaderCellDef class="px-1 py-2 text-right" mat-header-cell>
+          <th
+            *matHeaderCellDef
+            class="gf-fit-content px-1 py-2 text-right"
+            mat-header-cell
+          >
             <button
               class="mx-1 no-min-width px-2"
               mat-button
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index 729ffede3..7a9a43477 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -23,12 +23,12 @@
           <ng-container matColumnDef="status">
             <th
               *matHeaderCellDef
-              class="d-none d-lg-table-cell px-1"
+              class="d-none d-lg-table-cell gf-fit-content px-1"
               mat-header-cell
             ></th>
             <td
               *matCellDef="let element"
-              class="d-none d-lg-table-cell px-1"
+              class="d-none d-lg-table-cell gf-fit-content px-1"
               mat-cell
             >
               @if (!element.isActive) {
@@ -49,8 +49,12 @@
           </ng-container>
 
           <ng-container matColumnDef="select">
-            <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-            <td *matCellDef="let element" class="px-1" mat-cell>
+            <th
+              *matHeaderCellDef
+              class="gf-fit-content px-1"
+              mat-header-cell
+            ></th>
+            <td *matCellDef="let element" class="gf-fit-content px-1" mat-cell>
               @if (
                 canDeleteAssetProfile({
                   activitiesCount: element.activitiesCount,
@@ -81,7 +85,7 @@
           <ng-container matColumnDef="nameWithSymbol">
             <th
               *matHeaderCellDef
-              class="px-1"
+              class="gf-table-column-fill px-1"
               mat-header-cell
               mat-sort-header="symbol"
             >
@@ -89,7 +93,7 @@
             </th>
             <td
               *matCellDef="let element"
-              class="line-height-normal px-1"
+              class="gf-table-column-fill line-height-normal px-1"
               mat-cell
             >
               <div class="text-truncate">{{ element.name }}</div>
@@ -243,7 +247,11 @@
           </ng-container>
 
           <ng-container matColumnDef="actions" stickyEnd>
-            <th *matHeaderCellDef class="px-1 text-right" mat-header-cell>
+            <th
+              *matHeaderCellDef
+              class="gf-fit-content px-1 text-right"
+              mat-header-cell
+            >
               <button
                 class="mx-1 no-min-width px-2"
                 mat-button
diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html
index aa44b0366..1ac155e50 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@@ -161,10 +161,18 @@
                 [dataSource]="couponsDataSource"
               >
                 <ng-container matColumnDef="code">
-                  <th *matHeaderCellDef class="px-1" mat-header-cell>
+                  <th
+                    *matHeaderCellDef
+                    class="gf-table-column-fill px-1"
+                    mat-header-cell
+                  >
                     <ng-container i18n>Code</ng-container>
                   </th>
-                  <td *matCellDef="let element" class="px-1" mat-cell>
+                  <td
+                    *matCellDef="let element"
+                    class="gf-table-column-fill px-1"
+                    mat-cell
+                  >
                     <gf-value
                       class="text-monospace"
                       [enableCopyToClipboardButton]="true"
@@ -206,12 +214,12 @@
                 <ng-container matColumnDef="actions" stickyEnd>
                   <th
                     *matHeaderCellDef
-                    class="px-1 text-right"
+                    class="gf-fit-content px-1 text-right"
                     mat-header-cell
                   ></th>
                   <td
                     *matCellDef="let element"
-                    class="px-1 text-right"
+                    class="gf-fit-content px-1 text-right"
                     mat-cell
                   >
                     <button
diff --git a/apps/client/src/app/components/admin-platform/admin-platform.component.html b/apps/client/src/app/components/admin-platform/admin-platform.component.html
index c349dd9b8..f1346bce7 100644
--- a/apps/client/src/app/components/admin-platform/admin-platform.component.html
+++ b/apps/client/src/app/components/admin-platform/admin-platform.component.html
@@ -19,8 +19,12 @@
     [dataSource]="dataSource"
   >
     <ng-container matColumnDef="icon" sticky>
-      <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th *matHeaderCellDef class="gf-fit-content px-1" mat-header-cell></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <gf-entity-logo
           [hasPlaceholder]="true"
           [tooltip]="element.name"
@@ -30,10 +34,19 @@
     </ng-container>
 
     <ng-container matColumnDef="name">
-      <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header="name">
+      <th
+        *matHeaderCellDef
+        class="gf-table-column-fill px-1"
+        mat-header-cell
+        mat-sort-header="name"
+      >
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="px-1 text-nowrap" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill px-1 text-nowrap"
+        mat-cell
+      >
         {{ element.name }}
       </td>
     </ng-container>
@@ -66,8 +79,16 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-center"
+        mat-header-cell
+      ></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <button
           class="mx-1 no-min-width px-2"
           mat-button
diff --git a/apps/client/src/app/components/admin-settings/admin-settings.component.html b/apps/client/src/app/components/admin-settings/admin-settings.component.html
index 9d15a6a76..8ce8032dc 100644
--- a/apps/client/src/app/components/admin-settings/admin-settings.component.html
+++ b/apps/client/src/app/components/admin-settings/admin-settings.component.html
@@ -50,8 +50,16 @@
           [dataSource]="dataSource"
         >
           <ng-container matColumnDef="icon" sticky>
-            <th *matHeaderCellDef class="px-1" mat-header-cell></th>
-            <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+            <th
+              *matHeaderCellDef
+              class="gf-fit-content px-1"
+              mat-header-cell
+            ></th>
+            <td
+              *matCellDef="let element"
+              class="gf-fit-content px-1 text-center"
+              mat-cell
+            >
               <gf-entity-logo [hasPlaceholder]="true" [url]="element.url" />
             </td>
           </ng-container>
@@ -59,13 +67,17 @@
           <ng-container matColumnDef="name">
             <th
               *matHeaderCellDef
-              class="px-1"
+              class="gf-table-column-fill px-1"
               mat-header-cell
               mat-sort-header="name"
             >
               <ng-container i18n>Name</ng-container>
             </th>
-            <td *matCellDef="let element" class="px-1 text-nowrap" mat-cell>
+            <td
+              *matCellDef="let element"
+              class="gf-table-column-fill px-1 text-nowrap"
+              mat-cell
+            >
               @if (isGhostfolioDataProvider(element)) {
                 <a
                   class="align-items-center d-inline-flex"
@@ -173,9 +185,17 @@
           </ng-container>
 
           <ng-container matColumnDef="actions">
-            <th *matHeaderCellDef class="px-1" mat-header-cell></th>
+            <th
+              *matHeaderCellDef
+              class="gf-fit-content px-1"
+              mat-header-cell
+            ></th>
 
-            <td *matCellDef="let element" class="px-1 text-right" mat-cell>
+            <td
+              *matCellDef="let element"
+              class="gf-fit-content px-1 text-right"
+              mat-cell
+            >
               @if (isGhostfolioDataProvider(element)) {
                 @if (hasGhostfolioApiKey) {
                   <button
diff --git a/apps/client/src/app/components/admin-tag/admin-tag.component.html b/apps/client/src/app/components/admin-tag/admin-tag.component.html
index 6cd9c1259..3c3c4ebcf 100644
--- a/apps/client/src/app/components/admin-tag/admin-tag.component.html
+++ b/apps/client/src/app/components/admin-tag/admin-tag.component.html
@@ -19,10 +19,19 @@
     [dataSource]="dataSource"
   >
     <ng-container matColumnDef="name">
-      <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header="name">
+      <th
+        *matHeaderCellDef
+        class="gf-table-column-fill px-1"
+        mat-header-cell
+        mat-sort-header="name"
+      >
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="px-1 text-nowrap" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="gf-table-column-fill px-1 text-nowrap"
+        mat-cell
+      >
         {{ translate(element.name) }}
       </td>
     </ng-container>
@@ -78,8 +87,16 @@
     </ng-container>
 
     <ng-container matColumnDef="actions" stickyEnd>
-      <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
-      <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+      <th
+        *matHeaderCellDef
+        class="gf-fit-content px-1 text-center"
+        mat-header-cell
+      ></th>
+      <td
+        *matCellDef="let element"
+        class="gf-fit-content px-1 text-center"
+        mat-cell
+      >
         <button
           class="mx-1 no-min-width px-2"
           mat-button
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 1be6174ac..60cdd87cf 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -6,14 +6,14 @@
           <ng-container matColumnDef="user">
             <th
               *matHeaderCellDef
-              class="mat-mdc-header-cell px-1 py-2"
+              class="gf-table-column-fill mat-mdc-header-cell px-1 py-2"
               mat-header-cell
             >
               <ng-container i18n>User</ng-container>
             </th>
             <td
               *matCellDef="let element"
-              class="mat-mdc-cell px-1 py-2"
+              class="gf-table-column-fill mat-mdc-cell px-1 py-2"
               mat-cell
             >
               <div class="align-items-center d-flex text-nowrap">
@@ -193,12 +193,12 @@
           <ng-container matColumnDef="actions" stickyEnd>
             <th
               *matHeaderCellDef
-              class="mat-mdc-header-cell px-1 py-2 text-right"
+              class="gf-fit-content mat-mdc-header-cell px-1 py-2 text-right"
               mat-header-cell
             ></th>
             <td
               *matCellDef="let element"
-              class="mat-mdc-cell px-1 py-2 text-right"
+              class="gf-fit-content mat-mdc-cell px-1 py-2 text-right"
               mat-cell
             >
               <button