diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html
index a68fb41c8..62083c9a6 100644
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -38,15 +38,19 @@
               <tr *ngIf="!isMobile()" class="taller-row">
                 <td class="label addresses" i18n="mining.addresses">Addresses</td>
                 <td *ngIf="poolStats.pool.addresses.length else nodata" style="padding-top: 25px">
-                  <a class="addresses-data" [routerLink]="['/address' | relativeUrl, poolStats.pool.addresses[0]]">
-                    <app-truncate [text]="poolStats.pool.addresses[0]" [lastChars]="8"></app-truncate>
-                  </a>
+                  <app-truncate
+                  class="addresses-data"
+                  [text]="poolStats.pool.addresses[0]"
+                  [lastChars]="8"
+                  [link]="['/address' | relativeUrl, poolStats.pool.addresses[0]]"
+                  [external]="true">
+                </app-truncate>
                   <div>
                     <div #collapse="ngbCollapse" [(ngbCollapse)]="gfg">
-                     <a class="addresses-data"
-                        *ngFor="let address of poolStats.pool.addresses | slice: 1"
-                        [routerLink]="['/address' | relativeUrl, address]">
-                        <app-truncate [text]="address" [lastChars]="8"></app-truncate></a>
+                      <app-truncate class="addresses-data" *ngFor="let address of poolStats.pool.addresses | slice: 1"
+                      [link]="['/address' | relativeUrl, address]"
+                      [text]="address" [lastChars]="8">
+                    </app-truncate>
                     </div>
                     <button *ngIf="poolStats.pool.addresses.length >= 2" type="button"
                       class="btn btn-sm btn-primary small-button" (click)="collapse.toggle()"
@@ -69,13 +73,18 @@
                       <span *ngIf="gfg"><span i18n="show-all">Show all</span> ({{ poolStats.pool.addresses.length }})</span>
                       <span *ngIf="!gfg" i18n="hide">Hide</span>
                     </button>
-                    <a class="addresses-data" [routerLink]="['/address' | relativeUrl, poolStats.pool.addresses[0]]">
-                      {{ poolStats.pool.addresses[0] | shortenString: 30 }}
-                    </a>
+                    <app-truncate
+                      class="addresses-data"
+                      [text]="poolStats.pool.addresses[0]"
+                      [lastChars]="8"
+                      [link]="['/address' | relativeUrl, poolStats.pool.addresses[0]]"
+                      [external]="true">
+                    </app-truncate>
                     <div #collapse="ngbCollapse" [(ngbCollapse)]="gfg" style="width: 100%">
-                      <a class="addresses-data" *ngFor="let address of poolStats.pool.addresses | slice: 1"
-                        [routerLink]="['/address' | relativeUrl, address]">{{
-                        address | shortenString: 30 }}<br></a>
+                      <app-truncate class="addresses-data" *ngFor="let address of poolStats.pool.addresses | slice: 1"
+                        [link]="['/address' | relativeUrl, address]"
+                        [text]="address" [lastChars]="8">
+                      </app-truncate>
                     </div>
                   </div>
                 </td>