diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index 0a8ee6dcea..30222de65e 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -170,7 +170,7 @@
                 "
                 [unit]="data.baseCurrency"
                 [value]="investmentInBaseCurrencyWithCurrencyEffect"
-                >Investment</gf-value
+                >Invested Capital</gf-value
               >
             </div>
             @if (
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 fd0ac9b72f..e4ff1ba938 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
@@ -57,7 +57,7 @@
     <div class="col"><hr /></div>
   </div>
   <div class="flex-nowrap px-3 py-1 row">
-    <div class="flex-grow-1 text-truncate" i18n>Investment</div>
+    <div class="flex-grow-1 text-truncate" i18n>Invested Capital</div>
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
@@ -165,7 +165,7 @@
   </div>
   <div class="flex-nowrap px-3 py-1 row">
     <div class="align-items-center d-flex flex-grow-1 indent-1">
-      <ng-container i18n>Cash</ng-container>
+      <ng-container i18n>Holdings</ng-container>
       @if (
         !hasImpersonationId &&
         summary?.totalValueInBaseCurrency > 0 &&
@@ -175,7 +175,8 @@
           class="d-lg-inline-block d-none ml-2 small text-muted"
           [isPercent]="true"
           [locale]="locale"
-          [value]="isLoading ? undefined : cashPercentage"
+          [precision]="0"
+          [value]="isLoading ? undefined : holdingsPercentage"
         />
       }
     </div>
@@ -187,13 +188,13 @@
         [locale]="locale"
         [precision]="precision"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.totalCashInBaseCurrency"
+        [value]="isLoading ? undefined : holdingsInBaseCurrency"
       />
     </div>
   </div>
-  @if (isLoading || summary?.emergencyFund?.cash > 0) {
+  @if (isLoading || summary?.emergencyFund?.assets > 0) {
     <div class="flex-nowrap px-3 py-1 row">
-      <div class="flex-grow-1 indent-2 text-truncate" i18n>Buying Power</div>
+      <div class="flex-grow-1 indent-2 text-truncate" i18n>Investments</div>
       <div class="flex-column flex-wrap justify-content-end">
         <gf-value
           class="justify-content-end"
@@ -202,7 +203,7 @@
           [locale]="locale"
           [precision]="precision"
           [unit]="baseCurrency"
-          [value]="isLoading ? undefined : summary?.cash"
+          [value]="isLoading ? undefined : investmentsInBaseCurrency"
         />
       </div>
     </div>
@@ -216,14 +217,14 @@
           [locale]="locale"
           [precision]="precision"
           [unit]="baseCurrency"
-          [value]="isLoading ? undefined : summary?.emergencyFund?.cash"
+          [value]="isLoading ? undefined : summary?.emergencyFund?.assets"
         />
       </div>
     </div>
   }
   <div class="flex-nowrap px-3 py-1 row">
     <div class="align-items-center d-flex flex-grow-1 indent-1">
-      <ng-container i18n>Holdings</ng-container>
+      <ng-container i18n>Cash</ng-container>
       @if (
         !hasImpersonationId &&
         summary?.totalValueInBaseCurrency > 0 &&
@@ -233,7 +234,8 @@
           class="d-lg-inline-block d-none ml-2 small text-muted"
           [isPercent]="true"
           [locale]="locale"
-          [value]="isLoading ? undefined : holdingsPercentage"
+          [precision]="0"
+          [value]="isLoading ? undefined : cashPercentage"
         />
       }
     </div>
@@ -245,11 +247,25 @@
         [locale]="locale"
         [precision]="precision"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : holdingsInBaseCurrency"
+        [value]="isLoading ? undefined : summary?.totalCashInBaseCurrency"
       />
     </div>
   </div>
-  @if (isLoading || summary?.emergencyFund?.assets > 0) {
+  @if (isLoading || summary?.emergencyFund?.cash > 0) {
+    <div class="flex-nowrap px-3 py-1 row">
+      <div class="flex-grow-1 indent-2 text-truncate" i18n>Buying Power</div>
+      <div class="flex-column flex-wrap justify-content-end">
+        <gf-value
+          class="justify-content-end"
+          position="end"
+          [isCurrency]="true"
+          [locale]="locale"
+          [precision]="precision"
+          [unit]="baseCurrency"
+          [value]="isLoading ? undefined : summary?.cash"
+        />
+      </div>
+    </div>
     <div class="flex-nowrap px-3 py-1 row">
       <div class="flex-grow-1 indent-2 text-truncate" i18n>Emergency Fund</div>
       <div class="flex-column flex-wrap justify-content-end">
@@ -260,7 +276,7 @@
           [locale]="locale"
           [precision]="precision"
           [unit]="baseCurrency"
-          [value]="isLoading ? undefined : summary?.emergencyFund?.assets"
+          [value]="isLoading ? undefined : summary?.emergencyFund?.cash"
         />
       </div>
     </div>
@@ -277,6 +293,7 @@
           class="d-lg-inline-block d-none ml-2 small text-muted"
           [isPercent]="true"
           [locale]="locale"
+          [precision]="0"
           [value]="isLoading ? undefined : excludedFromAnalysisPercentage"
         />
       }
@@ -363,6 +380,7 @@
           class="d-lg-inline-block d-none ml-2 small text-muted"
           [isPercent]="true"
           [locale]="locale"
+          [precision]="0"
           [value]="isLoading ? undefined : emergencyFundPercentage"
         />
       }
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
index 1cd2ec93ca..eaf71210f1 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
@@ -98,6 +98,16 @@ export class GfPortfolioSummaryComponent implements OnChanges {
       : 0;
   }
 
+  protected get investmentsInBaseCurrency() {
+    if (!isNumber(this.holdingsInBaseCurrency)) {
+      return null;
+    }
+
+    return (
+      this.holdingsInBaseCurrency - (this.summary.emergencyFund?.assets ?? 0)
+    );
+  }
+
   public ngOnChanges() {
     if (this.summary) {
       if (