diff --git a/src/app/cln/on-chain/on-chain-send-modal/on-chain-send-modal.component.html b/src/app/cln/on-chain/on-chain-send-modal/on-chain-send-modal.component.html
index 022ba3b8..09e80cd7 100644
--- a/src/app/cln/on-chain/on-chain-send-modal/on-chain-send-modal.component.html
+++ b/src/app/cln/on-chain/on-chain-send-modal/on-chain-send-modal.component.html
@@ -158,7 +158,7 @@
             </div>
           </div>
           <div class="mt-2" fxLayout="row" fxLayoutAlign="start center" fxFlex="100">
-            <button mat-button color="primary" type="button" matStepperNext>Next</button>
+            <button mat-button color="primary" type="button " matStepperNext>Next</button>
           </div>
         </form>
       </mat-step>
diff --git a/src/app/cln/peers-channels/channels/bump-fee-modal/bump-fee.component.html b/src/app/cln/peers-channels/channels/bump-fee-modal/bump-fee.component.html
index bae4fabe..07b1aa93 100644
--- a/src/app/cln/peers-channels/channels/bump-fee-modal/bump-fee.component.html
+++ b/src/app/cln/peers-channels/channels/bump-fee-modal/bump-fee.component.html
@@ -4,7 +4,7 @@
         <div fxFlex="95" fxLayoutAlign="start start">
           <span class="page-title">Bump Fee</span>
         </div>
-        <button tabindex="8" fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
+        <button fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
       </mat-card-header>
       <mat-card-content class="padding-gap-x-large">
         <form fxLayout="column">
@@ -29,14 +29,14 @@
               <div fxLayout="row" fxFlex="100" fxLayoutAlign="space-between center">
                 <mat-form-field fxLayout="column" fxFlex="49">
                   <mat-label>Output Index</mat-label>
-                  <input #outputIndx="ngModel" autoFocus matInput type="number" tabindex="1" required name="outputIndx" [step]="1" [min]="0" [(ngModel)]="outputIndex">
+                  <input #outputIndx="ngModel" autoFocus matInput type="number" required name="outputIndx" [step]="1" [min]="0" [(ngModel)]="outputIndex">
                   <mat-error *ngIf="outputIndx.errors?.required">Output Index required.</mat-error>
                   <mat-error *ngIf="outputIndx.errors?.pendingChannelOutputIndex">Invalid index value.</mat-error>
                 </mat-form-field>
                 <mat-form-field fxLayout="column" fxFlex="49">
                   <mat-label>Fees (Sats/vByte)</mat-label>
                   <input #fee="ngModel" matInput
-                    type="number" name="fees" required tabindex="4" [step]="1" [min]="0" [(ngModel)]="fees">
+                    type="number" name="fees" required [step]="1" [min]="0" [(ngModel)]="fees">
                   <mat-error *ngIf="!fees">Fees is required.</mat-error>
                 </mat-form-field>
               </div>
@@ -47,8 +47,8 @@
             </div>
           </div>
           <div fxLayout="row" fxLayoutAlign="end center">
-            <button mat-button color="primary" type="reset" class="mr-1" tabindex="5" default (click)="resetData()">Clear</button>
-            <button mat-button color="primary" type="submit" tabindex="6" (click)="onBumpFee()">{{bumpFeeError !== '' ? 'Retry Bump Fee' : 'Bump Fee'}}</button>
+            <button mat-button color="primary" type="reset" class="mr-1" default (click)="resetData()">Clear</button>
+            <button mat-button color="primary" type="submit" (click)="onBumpFee()">{{bumpFeeError !== '' ? 'Retry Bump Fee' : 'Bump Fee'}}</button>
           </div>
         </form>
       </mat-card-content>
diff --git a/src/app/cln/peers-channels/channels/open-channel-modal/open-channel.component.html b/src/app/cln/peers-channels/channels/open-channel-modal/open-channel.component.html
index cbf8edd2..edc32560 100644
--- a/src/app/cln/peers-channels/channels/open-channel-modal/open-channel.component.html
+++ b/src/app/cln/peers-channels/channels/open-channel-modal/open-channel.component.html
@@ -4,14 +4,14 @@
       <div fxFlex="95" fxLayoutAlign="start start">
         <span class="page-title">{{alertTitle}}</span>
       </div>
-      <button tabindex="8" fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
+      <button fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
     </mat-card-header>
     <mat-card-content class="padding-gap-x-large">
       <form #form="ngForm" fxLayout="column" (submit)="onOpenChannel()" (reset)="resetData()">
         <div fxLayout="column">
           <mat-form-field *ngIf="!peer && peers && peers.length > 0" fxFlex="100">
             <mat-label>Peer Alias</mat-label>
-            <input type="text" aria-label="Peers" matInput tabindex="1" required [formControl]="selectedPeer" [matAutocomplete]="auto" (change)="onSelectedPeerChanged()">
+            <input type="text" aria-label="Peers" matInput required [formControl]="selectedPeer" [matAutocomplete]="auto" (change)="onSelectedPeerChanged()">
             <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn" (optionSelected)="onSelectedPeerChanged()">
               <mat-option *ngFor="let peer of filteredPeers | async" [value]="peer">{{peer.alias ? peer.alias : peer.id ? peer.id : ''}}</mat-option>
             </mat-autocomplete>
@@ -24,14 +24,14 @@
           <div fxLayout="row" fxFlex="100" fxLayoutAlign="space-between center">
             <mat-form-field fxLayout="column" fxFlex="70" fxLayoutAlign="start end">
               <mat-label>Amount</mat-label>
-              <input #amount="ngModel" matInput type="number" tabindex="1" required name="amount" [step]="1000" [min]="1" [max]="totalBalance" [disabled]="flgUseAllBalance" [(ngModel)]="fundingAmount">
+              <input #amount="ngModel" matInput type="number" required name="amount" [step]="1000" [min]="1" [max]="totalBalance" [disabled]="flgUseAllBalance" [(ngModel)]="fundingAmount">
               <mat-hint>Remaining: {{totalBalance - ((fundingAmount) ? fundingAmount : 0) | number}}{{flgUseAllBalance ? '. Amount replaced by UTXO balance' : ''}}</mat-hint>
               <span matSuffix> Sats </span>
               <mat-error *ngIf="amount.errors?.required || !fundingAmount">Amount is required.</mat-error>
               <mat-error *ngIf="amount.errors?.max">Amount must be less than or equal to {{totalBalance}}.</mat-error>
             </mat-form-field>
             <div fxLayout="column" fxFlex="25" fxLayoutAlign="center start">
-              <mat-slide-toggle fxLayout="column" fxLayoutAlign="center start" tabindex="2" color="primary" name="isPrivate" [(ngModel)]="isPrivate">Private Channel</mat-slide-toggle>
+              <mat-slide-toggle fxLayout="column" fxLayoutAlign="center start" color="primary" name="isPrivate" [(ngModel)]="isPrivate">Private Channel</mat-slide-toggle>
             </div>
           </div>
           <mat-expansion-panel class="flat-expansion-panel mt-2" expanded="false" (closed)="onAdvancedPanelToggle(true)" (opened)="onAdvancedPanelToggle(false)">
@@ -58,7 +58,7 @@
                 <div fxFlex="64" fxLayout="row" fxLayoutAlign="space-between center">
                   <mat-form-field fxLayout="column" fxLayoutAlign="start center" [ngClass]="selFeeRate === 'customperkb' && !flgMinConf ? 'flex-40' : 'flex-100'">
                     <mat-label>Fee Rate</mat-label>
-                    <mat-select tabindex="4" [disabled]="flgMinConf" [(value)]="selFeeRate">
+                    <mat-select [disabled]="flgMinConf" [(value)]="selFeeRate">
                       <mat-option *ngFor="let feeRateType of feeRateTypes" [value]="feeRateType.feeRateId">
                         {{feeRateType.feeRateType}}
                       </mat-option>
@@ -66,30 +66,30 @@
                   </mat-form-field>
                   <mat-form-field *ngIf="selFeeRate === 'customperkb' && !flgMinConf" fxLayout="column" fxFlex="58" fxLayoutAlign="end center">
                     <mat-label>Fee Rate (Sats/vByte)</mat-label>
-                    <input #custFeeRate="ngModel" matInput type="number" name="custFeeRate" tabindex="4" [step]="1" [min]="recommendedFee.minimumFee" [required]="selFeeRate === 'customperkb' && !flgMinConf" [(ngModel)]="customFeeRate">
+                    <input #custFeeRate="ngModel" matInput type="number" name="custFeeRate" [step]="1" [min]="recommendedFee.minimumFee" [required]="selFeeRate === 'customperkb' && !flgMinConf" [(ngModel)]="customFeeRate">
                     <mat-hint>Mempool Min: {{recommendedFee.minimumFee}} (Sats/vByte)</mat-hint>
                     <mat-error *ngIf="selFeeRate === 'customperkb' && !flgMinConf && !customFeeRate">Fee Rate is required.</mat-error>
                     <mat-error *ngIf="selFeeRate === 'customperkb' && !flgMinConf && customFeeRate && customFeeRate < recommendedFee.minimumFee">Lower than min feerate {{recommendedFee.minimumFee}} in the mempool.</mat-error>
                   </mat-form-field>
                 </div>
                 <div fxFlex="32" fxLayout="row" fxLayoutAlign="start center">
-                  <mat-checkbox fxFlex="7" tabindex="5" color="primary" name="flgMinConf" fxLayoutAlign="stretch start" [ngClass]="{'mr-6': screenSize === screenSizeEnum.XS || screenSize === screenSizeEnum.SM, 'mr-2': screenSize === screenSizeEnum.MD || screenSize === screenSizeEnum.LG || screenSize === screenSizeEnum.XL}" [(ngModel)]="flgMinConf" (change)="flgMinConf ? selFeeRate=null : minConfValue=null" />
+                  <mat-checkbox fxFlex="7" color="primary" name="flgMinConf" fxLayoutAlign="stretch start" [ngClass]="{'mr-6': screenSize === screenSizeEnum.XS || screenSize === screenSizeEnum.SM, 'mr-2': screenSize === screenSizeEnum.MD || screenSize === screenSizeEnum.LG || screenSize === screenSizeEnum.XL}" [(ngModel)]="flgMinConf" (change)="flgMinConf ? selFeeRate=null : minConfValue=null" />
                   <mat-form-field fxLayout="column" fxFlex="93">
                     <mat-label>Min Confirmation Blocks</mat-label>
-                    <input #blocks="ngModel" matInput type="number" name="blocks" tabindex="8" [step]="1" [min]="0" [required]="flgMinConf" [disabled]="!flgMinConf" [(ngModel)]="minConfValue">
+                    <input #blocks="ngModel" matInput type="number" name="blocks" [step]="1" [min]="0" [required]="flgMinConf" [disabled]="!flgMinConf" [(ngModel)]="minConfValue">
                     <mat-error *ngIf="flgMinConf && !minConfValue">Min Blocks is required.</mat-error>
                   </mat-form-field>
                 </div>
               </div>
               <mat-form-field fxLayout="column" fxFlex="54" fxLayoutAlign="start end">
                 <mat-label>Coin Selection</mat-label>
-                <mat-select tabindex="6" multiple [(value)]="selUTXOs" (selectionChange)="onUTXOSelectionChange($event)">
+                <mat-select multiple [(value)]="selUTXOs" (selectionChange)="onUTXOSelectionChange($event)">
                   <mat-select-trigger>{{totalSelectedUTXOAmount | number}} Sats ({{selUTXOs.length > 1 ? selUTXOs.length + ' UTXOs' : '1 UTXO'}})</mat-select-trigger>
                   <mat-option *ngFor="let utxo of utxos" [value]="utxo">{{(utxo.amount_msat) / 1000 | number:'1.0-0'}} Sats</mat-option>
                 </mat-select>
               </mat-form-field>
               <div fxFlex="41" fxLayout="row" fxLayoutAlign="start center">
-                <mat-slide-toggle tabindex="7" color="primary" name="flgUseAllBalance" [disabled]="selUTXOs.length < 1" [(ngModel)]="flgUseAllBalance" (change)="onUTXOAllBalanceChange()">
+                <mat-slide-toggle color="primary" name="flgUseAllBalance" [disabled]="selUTXOs.length < 1" [(ngModel)]="flgUseAllBalance" (change)="onUTXOAllBalanceChange()">
                   Use selected UTXOs balance
                 </mat-slide-toggle>
                 <mat-icon matTooltip="Use selected UTXOs balance as the amount to be sent. Final amount sent will be less the mining fee." matTooltipPosition="before" class="info-icon">info_outline</mat-icon>
@@ -102,8 +102,8 @@
           <span *ngIf="channelConnectionError !== ''">{{channelConnectionError}}</span>
         </div>
         <div class="mt-2" fxLayout="row" fxLayoutAlign="end center">
-          <button mat-button color="primary" class="mr-1" tabindex="7" type="reset">Clear Fields</button>
-          <button autoFocus mat-button color="primary" type="submit" tabindex="9">Open Channel</button>
+          <button mat-button color="primary" class="mr-1" type="reset">Clear Fields</button>
+          <button autoFocus mat-button color="primary" type="submit">Open Channel</button>
         </div>
       </form>
     </mat-card-content>
diff --git a/src/app/shared/components/data-modal/show-pubkey/show-pubkey.component.html b/src/app/shared/components/data-modal/show-pubkey/show-pubkey.component.html
index ac5a5a16..8dc4b07e 100644
--- a/src/app/shared/components/data-modal/show-pubkey/show-pubkey.component.html
+++ b/src/app/shared/components/data-modal/show-pubkey/show-pubkey.component.html
@@ -8,7 +8,7 @@
         <fa-icon class="page-title-img mr-1" [icon]="faReceipt" />
         <span class="page-title">{{selInfoType.infoName}}</span>
       </div>
-      <button tabindex="3" fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
+      <button fxFlex="5" fxLayoutAlign="center center" class="btn-close-x p-0" mat-button (click)="onClose()">X</button>
     </mat-card-header>
     <mat-card-content class="padding-gap-x-large">
       <div fxLayout="column">
@@ -33,7 +33,7 @@
         </div>
         <mat-divider class="w-100 my-1" />
         <div class="mt-2" fxLayout="row" fxLayoutAlign="end center">
-          <button payload="{{selInfoType.infoID === 0 ? information.identity_pubkey : information.uris[(selInfoType.infoID - 1)]}}" autoFocus mat-button color="primary" tabindex="2" type="submit" rtlClipboard (copied)="onCopyPubkey($event)">Copy {{selInfoType.infoKey}}</button>
+          <button payload="{{selInfoType.infoID === 0 ? information.identity_pubkey : information.uris[(selInfoType.infoID - 1)]}}" autoFocus mat-button color="primary" type="submit" rtlClipboard (copied)="onCopyPubkey($event)">Copy {{selInfoType.infoKey}}</button>
         </div>
       </div>
     </mat-card-content>
diff --git a/src/app/shared/components/horizontal-scroller/horizontal-scroller.component.html b/src/app/shared/components/horizontal-scroller/horizontal-scroller.component.html
index 21e8a709..39a3cb75 100644
--- a/src/app/shared/components/horizontal-scroller/horizontal-scroller.component.html
+++ b/src/app/shared/components/horizontal-scroller/horizontal-scroller.component.html
@@ -1,14 +1,14 @@
 <div fxLayout="row" fxLayoutAlign="space-between stretch" fxFlex="100" class="padding-gap-x">
   <div fxLayout="row" fxLayoutAlign="start center" fxFlex="20">
-    <button mat-icon-button color="primary" type="button" tabindex="1" class="pr-4" (click)="onStepChange('FIRST')"><mat-icon>skip_previous</mat-icon></button>
-    <button mat-icon-button color="primary" type="button" tabindex="2" [disabled]="disablePrev" (click)="onStepChange('PREVIOUS')"><mat-icon>navigate_before</mat-icon></button>
+    <button mat-icon-button color="primary" type="button" class="pr-4" (click)="onStepChange('FIRST')"><mat-icon>skip_previous</mat-icon></button>
+    <button mat-icon-button color="primary" type="button" [disabled]="disablePrev" (click)="onStepChange('PREVIOUS')"><mat-icon>navigate_before</mat-icon></button>
   </div>
   <ng-container *ngIf="animationDirection === 'forward'" [ngTemplateOutlet]="controlsPanel" [ngTemplateOutletContext]="{animationDirection:'forward'}" />
   <ng-container *ngIf="animationDirection === 'backward'" [ngTemplateOutlet]="controlsPanel" [ngTemplateOutletContext]="{animationDirection:'backward'}" />
   <ng-container *ngIf="animationDirection === ''" [ngTemplateOutlet]="controlsPanel" [ngTemplateOutletContext]="{animationDirection:''}" />
   <div fxLayout="row" fxLayoutAlign="end center" fxFlex="20">
-    <button mat-icon-button color="primary" type="button" tabindex="5" class="pr-4" [disabled]="disableNext" (click)="onStepChange('NEXT')"><mat-icon>navigate_next</mat-icon></button>
-    <button mat-icon-button color="primary" type="button" tabindex="6" (click)="onStepChange('LAST')"><mat-icon>skip_next</mat-icon></button>
+    <button mat-icon-button color="primary" type="button" class="pr-4" [disabled]="disableNext" (click)="onStepChange('NEXT')"><mat-icon>navigate_next</mat-icon></button>
+    <button mat-icon-button color="primary" type="button" (click)="onStepChange('LAST')"><mat-icon>skip_next</mat-icon></button>
   </div>
 </div>
 <ng-template #controlsPanel let-item='animationDirection'>
diff --git a/src/app/shared/components/settings/app-settings/app-settings.component.html b/src/app/shared/components/settings/app-settings/app-settings.component.html
index 09c85ca5..28e843af 100644
--- a/src/app/shared/components/settings/app-settings/app-settings.component.html
+++ b/src/app/shared/components/settings/app-settings/app-settings.component.html
@@ -17,8 +17,8 @@
       </div>
       <div fxLayout="row" fxLayoutAlign="start start" class="mt-1">
         <div fxLayout="row" fxLayoutAlign="start start">
-          <button class="mr-1" mat-stroked-button color="primary" tabindex="2" (click)="onResetSettings()">Reset</button>
-          <button mat-flat-button color="primary" tabindex="3" (click)="onUpdateApplicationSettings()">Update</button>
+          <button class="mr-1" mat-stroked-button color="primary" (click)="onResetSettings()">Reset</button>
+          <button mat-flat-button color="primary" (click)="onUpdateApplicationSettings()">Update</button>
         </div>
       </div>
     </div>
@@ -29,6 +29,6 @@
     <span class="page-title">Add New Node</span>
   </div>
   <div fxLayout="row" fxFlex="100" fxLayoutAlign="start start">
-    <button mat-flat-button color="primary" (click)="onAddNewNode()" tabindex="4" class="my-2">Add Node</button>
+    <button mat-flat-button color="primary" (click)="onAddNewNode()" class="my-2">Add Node</button>
   </div> -->
 </div>