diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html
index 95f3daa7e..a28cb13b2 100644
--- a/frontend/src/app/components/address/address.component.html
+++ b/frontend/src/app/components/address/address.component.html
@@ -15,32 +15,18 @@
       <div class="row">
         <div class="col">
           <table class="table table-borderless table-striped">
-            <tbody *ngIf="network !== 'liquid'">
+            <tbody>
               <tr>
                 <td>Total received</td>
-                <td>{{ receieved / 100000000 | number: '1.8-8' }} <ng-template [ngIf]="network === 'liquid'">L-</ng-template>BTC</td>
+                <td><app-amount [satoshis]="receieved"></app-amount></td>
               </tr>
               <tr>
                 <td>Total sent</td>
-                <td>{{ sent / 100000000 | number: '1.8-8' }} <ng-template [ngIf]="network === 'liquid'">L-</ng-template>BTC</td>
+                <td><app-amount [satoshis]="sent"></app-amount></td>
               </tr>
               <tr>
                 <td>Balance</td>
-                <td>{{ (receieved - sent) / 100000000 | number: '1.8-8' }} <ng-template [ngIf]="network === 'liquid'">L-</ng-template>BTC (<app-fiat [value]="receieved - sent"></app-fiat>)</td>
-              </tr>
-            </tbody>
-            <tbody *ngIf="network === 'liquid'">
-              <tr>
-                <td>Total received</td>
-                <td>Confidential</td>
-              </tr>
-              <tr>
-                <td>Total sent</td>
-                <td>Confidential</td>
-              </tr>
-              <tr>
-                <td>Balance</td>
-                <td>Confidential</td>
+                <td><app-amount [satoshis]="receieved - sent"></app-amount> (<app-fiat [value]="receieved - sent"></app-fiat>)</td>
               </tr>
             </tbody>
           </table>
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html
index 91406c593..13893ccc8 100644
--- a/frontend/src/app/components/mempool-block/mempool-block.component.html
+++ b/frontend/src/app/components/mempool-block/mempool-block.component.html
@@ -22,7 +22,7 @@
             </tr>
             <tr>
               <td>Total fees</td>
-              <td>{{ mempoolBlock.totalFees / 100000000 | number : '1.2-2' }} <ng-template [ngIf]="network === 'liquid'">L-</ng-template>BTC (<app-fiat [value]="mempoolBlock.totalFees" digitsInfo="1.0-0"></app-fiat>)</td>
+              <td><app-amount [satoshis]="mempoolBlock.totalFees" [digitsInfo]="'1.2-2'"></app-amount> (<app-fiat [value]="mempoolBlock.totalFees" digitsInfo="1.0-0"></app-fiat>)</td>
             </tr>
             <tr>
               <td>Transactions</td>