diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index 8c320b557..04bbf0915 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -44,7 +44,7 @@
 
         <div class="input-group input-group-sm info-group">
           <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC">
-          <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.BTC"></app-clipboard></button>
+          <app-clipboard [button]="true" [class]="'btn btn-outline-secondary rounded-start-0'" [text]="invoice.addresses.BTC"></app-clipboard>
         </div>
         @if (!minimal) {
           <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
@@ -62,7 +62,7 @@
 
         <div class="input-group input-group-sm info-group">
           <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC_LightningLike">
-          <button class="btn btn-outline-secondary" type="button"><app-clipboard [text]="invoice.addresses.BTC_LightningLike"></app-clipboard></button>
+          <app-clipboard [button]="true" [class]="'btn btn-outline-secondary rounded-start-0'" [text]="invoice.addresses.BTC_LightningLike"></app-clipboard>
         </div>
 
         @if (!minimal) {
@@ -81,7 +81,7 @@
         <br>
         <div class="input-group input-group-sm info-group">
           <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.LBTC" />
-          <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.LBTC"></app-clipboard></button>
+          <app-clipboard [button]="true" [class]="'btn btn-outline-secondary rounded-start-0'" [text]="invoice.addresses.LBTC"></app-clipboard>
         </div>
         @if (!minimal) {
           <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
diff --git a/frontend/src/app/components/clipboard/clipboard.component.html b/frontend/src/app/components/clipboard/clipboard.component.html
index 87d74293f..5495d6e3f 100644
--- a/frontend/src/app/components/clipboard/clipboard.component.html
+++ b/frontend/src/app/components/clipboard/clipboard.component.html
@@ -1,5 +1,5 @@
 <ng-template [ngIf]="button" [ngIfElse]="btnLink">
-  <button [class]="class" type="button" [disabled]="text === ''" style="box-shadow: none;" (click)="copyText()">
+  <button [class]="class" type="button" [disabled]="text === ''" style="box-shadow: none;" (click)="copyText()" [attr.aria-label]="showMessage ? 'Copied to clipboard' : 'Copy to clipboard'" [attr.title]="showMessage ? 'Copied' : 'Copy'">
     <span style="position: relative;top: -2px;left: 1px;">
       <app-svg-images name="clippy" [width]="widths[size]" viewBox="0 0 1000 1000"></app-svg-images>
       <span *ngIf="showMessage" class="copied-message" style="top: 29px; left: -23.5px;">{{ copiedMessage }}</span>