diff --git a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
index 884f6b0793..8004727b6e 100644
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
@@ -1,5 +1,5 @@
 <div class="mb-2 row">
-  <div class="col-md-6 col-xs-12 d-flex">
+  <div class="col-md-6 d-flex">
     <div
       class="align-items-center d-flex flex-grow-1 h5 mb-0 py-2 text-truncate"
     >
@@ -9,7 +9,7 @@
       }
     </div>
   </div>
-  <div class="col-md-6 col-xs-12 d-flex justify-content-end">
+  <div class="col-md-6 d-flex justify-content-end">
     <mat-form-field
       appearance="outline"
       class="gf-form-field-dense w-100 without-hint"
diff --git a/apps/client/src/app/components/home-summary/home-summary.html b/apps/client/src/app/components/home-summary/home-summary.html
index a6da72b03e..d17fc97c73 100644
--- a/apps/client/src/app/components/home-summary/home-summary.html
+++ b/apps/client/src/app/components/home-summary/home-summary.html
@@ -1,7 +1,7 @@
 <div class="container px-3">
   <h1 class="d-none d-sm-block h3 mb-4 text-center" i18n>Summary</h1>
   <div class="row">
-    <div class="col-xs-12 col-md-8 offset-md-2">
+    <div class="col-md-8 offset-md-2">
       <mat-card appearance="outlined">
         <mat-card-content>
           <gf-portfolio-summary
diff --git a/apps/client/src/app/components/home-watchlist/home-watchlist.html b/apps/client/src/app/components/home-watchlist/home-watchlist.html
index adf262cfd8..1bc93986af 100644
--- a/apps/client/src/app/components/home-watchlist/home-watchlist.html
+++ b/apps/client/src/app/components/home-watchlist/home-watchlist.html
@@ -8,7 +8,7 @@
     </span>
   </h1>
   <div class="row">
-    <div class="col-xs-12 col-md-10 offset-md-1">
+    <div class="col-md-10 offset-md-1">
       <gf-benchmark
         [benchmarks]="watchlist"
         [deviceType]="deviceType()"
diff --git a/apps/client/src/app/components/markets/markets.html b/apps/client/src/app/components/markets/markets.html
index 9131282ea0..b0b4c1bd14 100644
--- a/apps/client/src/app/components/markets/markets.html
+++ b/apps/client/src/app/components/markets/markets.html
@@ -5,7 +5,7 @@
     hasPermissionToReadMarketDataOfMarkets
   ) {
     <div class="mb-4 row">
-      <div class="col-xs-12 col-md-10 offset-md-1">
+      <div class="col-md-10 offset-md-1">
         @if (hasPermissionToReadMarketDataOfMarkets) {
           @if (user?.settings?.isExperimentalFeatures) {
             <div
@@ -48,7 +48,7 @@
   }
 
   <div class="mb-3 row">
-    <div class="col-xs-12 col-md-10 offset-md-1">
+    <div class="col-md-10 offset-md-1">
       <gf-benchmark
         [benchmarks]="benchmarks()"
         [deviceType]="deviceType()"
diff --git a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html
index dbe79fb476..f4f65b47d6 100644
--- a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html
+++ b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html
@@ -11,7 +11,7 @@
       </h1>
       <div class="row">
         @for (ossFriend of ossFriends; track ossFriend) {
-          <div class="col-xs-12 col-md-4" [class.mb-3]="!$last">
+          <div class="col-md-4" [class.mb-3]="!$last">
             <a target="_blank" [href]="ossFriend.href">
               <mat-card appearance="outlined" class="d-flex flex-column h-100">
                 <mat-card-header>
diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.html b/apps/client/src/app/pages/about/overview/about-overview-page.html
index 810a1394e1..45f81b621d 100644
--- a/apps/client/src/app/pages/about/overview/about-overview-page.html
+++ b/apps/client/src/app/pages/about/overview/about-overview-page.html
@@ -181,7 +181,7 @@
 
   <div class="mb-5 row">
     <div
-      class="col-md-6 col-xs-12 my-2"
+      class="col-md-6 my-2"
       [class.offset-md-3]="hasPermissionForSubscription === false"
     >
       <a
@@ -194,7 +194,7 @@
       >
     </div>
     @if (hasPermissionForSubscription) {
-      <div class="col-md-6 col-xs-12 my-2">
+      <div class="col-md-6 my-2">
         <a
           class="py-4 w-100"
           color="primary"
diff --git a/apps/client/src/app/pages/api/api-page.html b/apps/client/src/app/pages/api/api-page.html
index 2153fba1e0..b742ff6242 100644
--- a/apps/client/src/app/pages/api/api-page.html
+++ b/apps/client/src/app/pages/api/api-page.html
@@ -170,7 +170,7 @@
       </mat-card>
       <div class="row">
         @let marketDataOfMarkets = marketDataOfMarkets$ | async;
-        <div class="col-xs-12 col-md-6">
+        <div class="col-md-6">
           <mat-card appearance="outlined" class="mb-3">
             <mat-card-header>
               <mat-card-title class="mb-0">Markets</mat-card-title>
@@ -190,7 +190,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-6">
+        <div class="col-md-6">
           <mat-card appearance="outlined" class="mb-3">
             <mat-card-header>
               <mat-card-title class="mb-0">Markets</mat-card-title>
diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html
index a3fa4c38de..14c772c74e 100644
--- a/apps/client/src/app/pages/features/features-page.html
+++ b/apps/client/src/app/pages/features/features-page.html
@@ -8,7 +8,7 @@
         </small>
       </h1>
       <div class="row">
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -18,7 +18,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -31,7 +31,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -44,7 +44,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -56,7 +56,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -69,7 +69,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -82,7 +82,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -95,7 +95,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -108,7 +108,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -120,7 +120,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -133,7 +133,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -153,7 +153,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -171,7 +171,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -189,7 +189,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -206,7 +206,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -232,7 +232,7 @@
           </mat-card>
         </div>
         @if (hasPermissionForSubscription) {
-          <div class="col-xs-12 col-md-4 mb-3">
+          <div class="col-md-4 mb-3">
             <mat-card appearance="outlined" class="d-flex flex-column h-100">
               <mat-card-content>
                 <div class="flex-grow-1">
@@ -251,7 +251,7 @@
             </mat-card>
           </div>
         }
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -264,7 +264,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -277,7 +277,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -295,7 +295,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
@@ -314,7 +314,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-md-4 mb-3">
+        <div class="col-md-4 mb-3">
           <mat-card appearance="outlined" class="d-flex flex-column h-100">
             <mat-card-content>
               <div class="flex-grow-1">
diff --git a/apps/client/src/app/pages/open/open-page.html b/apps/client/src/app/pages/open/open-page.html
index 36641c06bf..5f7edc348f 100644
--- a/apps/client/src/app/pages/open/open-page.html
+++ b/apps/client/src/app/pages/open/open-page.html
@@ -30,7 +30,7 @@
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-content>
           <div class="row">
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <gf-value
                 i18n
                 i18n-subLabel
@@ -41,7 +41,7 @@
                 >Active Users</gf-value
               >
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <gf-value
                 i18n
                 i18n-subLabel
@@ -52,7 +52,7 @@
                 >New Users</gf-value
               >
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <gf-value
                 i18n
                 i18n-subLabel
@@ -63,7 +63,7 @@
                 >Active Users</gf-value
               >
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <a
                 class="d-block"
                 href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"
@@ -77,7 +77,7 @@
                 >
               </a>
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <a
                 class="d-block"
                 href="https://github.com/ghostfolio/ghostfolio/graphs/contributors"
@@ -91,7 +91,7 @@
                 >
               </a>
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <a
                 class="d-block"
                 href="https://github.com/ghostfolio/ghostfolio/stargazers"
@@ -105,7 +105,7 @@
                 >
               </a>
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <a
                 class="d-block"
                 href="https://hub.docker.com/r/ghostfolio/ghostfolio"
@@ -119,7 +119,7 @@
                 >
               </a>
             </div>
-            <div class="col-xs-12 col-md-4 my-2">
+            <div class="col-md-4 my-2">
               <a class="d-block" href="https://status.ghostfol.io">
                 <gf-value
                   i18n
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index 01aee0b447..8e2f747a8f 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -208,7 +208,7 @@
             />
           </div>
           <div class="row">
-            <div class="col-xs-12 col-md my-2">
+            <div class="col-md my-2">
               <gf-value
                 i18n
                 size="large"
@@ -218,7 +218,7 @@
                 >Developed Markets</gf-value
               >
             </div>
-            <div class="col-xs-12 col-md my-2">
+            <div class="col-md my-2">
               <gf-value
                 i18n
                 size="large"
@@ -228,7 +228,7 @@
                 >Emerging Markets</gf-value
               >
             </div>
-            <div class="col-xs-12 col-md my-2">
+            <div class="col-md my-2">
               <gf-value
                 i18n
                 size="large"
@@ -239,7 +239,7 @@
               >
             </div>
             @if ((markets?.[UNKNOWN_KEY]?.valueInPercentage ?? 0) > 0) {
-              <div class="col-xs-12 col-md my-2">
+              <div class="col-md my-2">
                 <gf-value
                   i18n
                   size="large"
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index 0fb6139fa9..a46478de68 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -508,7 +508,7 @@
       </div>
       @if (streaks) {
         <div class="row">
-          <div class="col-md-6 col-xs-12 my-2">
+          <div class="col-md-6 my-2">
             <gf-value
               i18n
               size="large"
@@ -517,7 +517,7 @@
               >Current Streak</gf-value
             >
           </div>
-          <div class="col-md-6 col-xs-12 my-2">
+          <div class="col-md-6 my-2">
             <gf-value
               i18n
               size="large"
diff --git a/apps/client/src/app/pages/pricing/pricing-page.html b/apps/client/src/app/pages/pricing/pricing-page.html
index bef1dece51..cb246e5f07 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.html
+++ b/apps/client/src/app/pages/pricing/pricing-page.html
@@ -17,7 +17,7 @@
         </p>
       </div>
       <div class="row">
-        <div class="col-xs-12 col-lg-4 mb-3">
+        <div class="col-lg-4 mb-3">
           <mat-card appearance="outlined" class="h-100">
             <mat-card-content class="d-flex flex-column h-100">
               <div class="flex-grow-1">
@@ -103,7 +103,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-lg-4 mb-3">
+        <div class="col-lg-4 mb-3">
           <mat-card
             appearance="outlined"
             class="h-100"
@@ -169,7 +169,7 @@
             </mat-card-content>
           </mat-card>
         </div>
-        <div class="col-xs-12 col-lg-4 mb-3">
+        <div class="col-lg-4 mb-3">
           <mat-card
             appearance="outlined"
             class="h-100"
diff --git a/apps/client/src/app/pages/public/public-page.html b/apps/client/src/app/pages/public/public-page.html
index e0e855585b..3090b70532 100644
--- a/apps/client/src/app/pages/public/public-page.html
+++ b/apps/client/src/app/pages/public/public-page.html
@@ -158,7 +158,7 @@
               />
             </div>
             <div class="row">
-              <div class="col-xs-12 col-md my-2">
+              <div class="col-md my-2">
                 <gf-value
                   i18n
                   size="large"
@@ -167,7 +167,7 @@
                   >Developed Markets</gf-value
                 >
               </div>
-              <div class="col-xs-12 col-md my-2">
+              <div class="col-md my-2">
                 <gf-value
                   i18n
                   size="large"
@@ -176,7 +176,7 @@
                   >Emerging Markets</gf-value
                 >
               </div>
-              <div class="col-xs-12 col-md my-2">
+              <div class="col-md my-2">
                 <gf-value
                   i18n
                   size="large"
@@ -186,7 +186,7 @@
                 >
               </div>
               @if (markets?.[UNKNOWN_KEY]?.valueInPercentage > 0) {
-                <div class="col-xs-12 col-md my-2">
+                <div class="col-md my-2">
                   <gf-value
                     i18n
                     size="large"
diff --git a/libs/ui/src/lib/assistant/assistant.html b/libs/ui/src/lib/assistant/assistant.html
index 16503dffb5..156fff1bb9 100644
--- a/libs/ui/src/lib/assistant/assistant.html
+++ b/libs/ui/src/lib/assistant/assistant.html
@@ -4,7 +4,7 @@
     (keydown.tab)="$event.stopPropagation()"
   >
     <div class="align-items-center d-flex search-container">
-      <ion-icon class="me-0 ms-2" name="search-outline" />
+      <ion-icon class="ms-2" name="search-outline" />
       <input
         #search
         autocomplete="off"