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 abeda6de8..cb41904d3 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
@@ -73,7 +73,7 @@
             <button mat-menu-item (click)="onUpdateAccess(element.id)">
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="create-outline" />
-                <span i18n>Edit</span>
+                <span><ng-container i18n>Edit</ng-container>...</span>
               </span>
             </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 14f1b211b..a82294001 100644
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.html
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.html
@@ -205,14 +205,16 @@
             </button>
             <mat-menu #jobActionsMenu="matMenu" xPosition="before">
               <button mat-menu-item (click)="onViewData(element.data)">
-                <ng-container i18n>View Data</ng-container>
+                <span><ng-container i18n>View Data</ng-container>...</span>
               </button>
               <button
                 mat-menu-item
                 [disabled]="element.stacktrace?.length <= 0"
                 (click)="onViewStacktrace(element.stacktrace)"
               >
-                <ng-container i18n>View Stacktrace</ng-container>
+                <span
+                  ><ng-container i18n>View Stacktrace</ng-container>...</span
+                >
               </button>
               <button mat-menu-item (click)="onExecuteJob(element.id)">
                 <ng-container i18n>Execute Job</ng-container>
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 f6aefcc10..156ae0f5f 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
@@ -264,7 +264,7 @@
                 >
                   <span class="align-items-center d-flex">
                     <ion-icon class="mr-2" name="create-outline" />
-                    <span i18n>Edit</span>
+                    <span><ng-container i18n>Edit</ng-container>...</span>
                   </span>
                 </a>
                 <hr class="m-0" />
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 e71dcf17b..a5a1430d4 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
@@ -71,7 +71,7 @@
         <button mat-menu-item (click)="onUpdatePlatform(element)">
           <span class="align-items-center d-flex">
             <ion-icon class="mr-2" name="create-outline" />
-            <span i18n>Edit</span>
+            <span><ng-container i18n>Edit</ng-container>...</span>
           </span>
         </button>
         <hr class="m-0" />
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 8b1b510d7..86377c937 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
@@ -64,7 +64,7 @@
         <button mat-menu-item (click)="onUpdateTag(element)">
           <span class="align-items-center d-flex">
             <ion-icon class="mr-2" name="create-outline" />
-            <span i18n>Edit</span>
+            <span><ng-container i18n>Edit</ng-container>...</span>
           </span>
         </button>
         <hr class="m-0" />
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 e802e3272..eb63f8aa6 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -222,7 +222,9 @@
                 >
                   <span class="align-items-center d-flex">
                     <ion-icon class="mr-2" name="person-outline" />
-                    <span i18n>View Details</span>
+                    <span
+                      ><ng-container i18n>View Details</ng-container>...</span
+                    >
                   </span>
                 </button>
                 @if (hasPermissionToImpersonateAllUsers) {
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 c5ebaa657..d127b4bf3 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -7,7 +7,7 @@
       (click)="onTransferBalance()"
     >
       <ion-icon class="mr-2" name="arrow-redo-outline" />
-      <ng-container i18n>Transfer Cash Balance</ng-container>...
+      <span><ng-container i18n>Transfer Cash Balance</ng-container>...</span>
     </button>
   </div>
 }
@@ -304,13 +304,13 @@
           <button mat-menu-item (click)="onOpenAccountDetailDialog(element.id)">
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="wallet-outline" />
-              <span i18n>View Details</span>
+              <span><ng-container i18n>View Details</ng-container>...</span>
             </span>
           </button>
           <button mat-menu-item (click)="onUpdateAccount(element)">
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="create-outline" />
-              <span i18n>Edit</span>
+              <span><ng-container i18n>Edit</ng-container>...</span>
             </span>
           </button>
           <hr class="m-0" />
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 e9bebaa16..b8e1882d4 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -6,7 +6,7 @@
       (click)="onImport()"
     >
       <ion-icon class="mr-2" name="cloud-upload-outline" />
-      <ng-container i18n>Import Activities</ng-container>...
+      <span><ng-container i18n>Import Activities</ng-container>...</span>
     </button>
     @if (hasPermissionToExportActivities) {
       <button
@@ -26,7 +26,7 @@
       >
         <span class="align-items-center d-flex">
           <ion-icon class="mr-2" name="color-wand-outline" />
-          <ng-container i18n>Import Dividends</ng-container>...
+          <span><ng-container i18n>Import Dividends</ng-container>...</span>
         </span>
       </button>
       @if (hasPermissionToExportActivities) {
@@ -379,7 +379,9 @@
             >
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="cloud-upload-outline" />
-                <ng-container i18n>Import Activities</ng-container>...
+                <span
+                  ><ng-container i18n>Import Activities</ng-container>...</span
+                >
               </span>
             </button>
           }
@@ -391,7 +393,9 @@
             >
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="color-wand-outline" />
-                <ng-container i18n>Import Dividends</ng-container>...
+                <span
+                  ><ng-container i18n>Import Dividends</ng-container>...</span
+                >
               </span>
             </button>
           }
@@ -443,20 +447,20 @@
             <button mat-menu-item (click)="onClickActivity(element)">
               <span class="align-items-center d-flex">
                 <ion-icon class="mr-2" name="tablet-landscape-outline" />
-                <span i18n>View Holding</span>
+                <span><ng-container i18n>View Holding</ng-container>...</span>
               </span>
             </button>
           }
           <button mat-menu-item (click)="onUpdateActivity(element)">
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="create-outline" />
-              <span i18n>Edit</span>
+              <span><ng-container i18n>Edit</ng-container>...</span>
             </span>
           </button>
           <button mat-menu-item (click)="onCloneActivity(element)">
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="copy-outline" />
-              <span i18n>Clone</span>
+              <span><ng-container i18n>Clone</ng-container>...</span>
             </span>
           </button>
           <button