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 a5a1430d4..367827878 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
@@ -57,7 +57,7 @@
   </ng-container>
 
   <ng-container matColumnDef="actions" stickyEnd>
-    <th *matHeaderCellDef class="px-1 text-center" i18n mat-header-cell></th>
+    <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
     <td *matCellDef="let element" class="px-1 text-center" mat-cell>
       <button
         class="mx-1 no-min-width px-2"
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 86377c937..98919abd8 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
@@ -50,7 +50,7 @@
   </ng-container>
 
   <ng-container matColumnDef="actions" stickyEnd>
-    <th *matHeaderCellDef class="px-1 text-center" i18n mat-header-cell></th>
+    <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
     <td *matCellDef="let element" class="px-1 text-center" mat-cell>
       <button
         class="mx-1 no-min-width px-2"
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 eb63f8aa6..ebcdc6f5f 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -7,10 +7,9 @@
             <th
               *matHeaderCellDef
               class="mat-mdc-header-cell px-1 py-2"
-              i18n
               mat-header-cell
             >
-              User
+              <ng-container i18n>User</ng-container>
             </th>
             <td
               *matCellDef="let element"
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
index ed9507f89..46eb2845c 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@@ -327,8 +327,8 @@
     </div>
   </div>
   <div class="flex-nowrap px-3 py-1 row">
-    <div class="flex-grow-1 ml-3 text-truncate" i18n>
-      Annualized Performance
+    <div class="flex-grow-1 ml-3 text-truncate">
+      <ng-container i18n>Annualized Performance</ng-container>
     </div>
     <div class="flex-column flex-wrap justify-content-end">
       <gf-value
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 d33d5e570..150caa7d8 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -120,8 +120,8 @@
             </div>
           </div>
           <div class="d-flex mb-3 ml-3 py-1">
-            <div class="flex-grow-1 mr-2 text-truncate" i18n>
-              Asset Performance
+            <div class="flex-grow-1 mr-2 text-truncate">
+              <ng-container i18n>Asset Performance</ng-container>
             </div>
             <div class="d-flex justify-content-end">
               <gf-value
@@ -166,8 +166,8 @@
             </div>
           </div>
           <div class="d-flex ml-3 py-1">
-            <div class="flex-grow-1 mr-2 text-truncate" i18n>
-              Currency Performance
+            <div class="flex-grow-1 mr-2 text-truncate">
+              <ng-container i18n>Currency Performance</ng-container>
             </div>
             <div class="d-flex justify-content-end">
               <gf-value
@@ -189,8 +189,8 @@
           </div>
           <div><hr /></div>
           <div class="d-flex py-1">
-            <div class="flex-grow-1 mr-2 text-truncate" i18n>
-              Absolute Net Performance
+            <div class="flex-grow-1 mr-2 text-truncate">
+              <ng-container i18n>Absolute Net Performance</ng-container>
             </div>
             <div class="d-flex justify-content-end">
               <gf-value
@@ -208,8 +208,8 @@
             </div>
           </div>
           <div class="d-flex ml-3 py-1">
-            <div class="flex-grow-1 mr-2 text-truncate" i18n>
-              Net Performance
+            <div class="flex-grow-1 mr-2 text-truncate">
+              <ng-container i18n>Net Performance</ng-container>
             </div>
             <div class="d-flex justify-content-end">
               <gf-value