diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
index fc4f7c249..d6650e47a 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -645,7 +645,7 @@
 <ng-template #prioritizedBy let-i i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ i | number : '1.1-1' }}%</strong> of miners.</ng-template>
 
 <ng-template #partnerCodeDisplay let-partnerCode="partnerCode">
-  <div class="small font-italic">
-    <span i18n="accelerator.using-partner-code">Using partner code</span>&nbsp;<span class="badge badge-secondary">{{ partnerCode }}</span>
+  <div class="small fst-italic">
+    <span i18n="accelerator.using-partner-code">Using partner code</span>&nbsp;<span class="badge bg-secondary">{{ partnerCode }}</span>
   </div>
 </ng-template>
diff --git a/frontend/src/app/components/menu/menu.component.scss b/frontend/src/app/components/menu/menu.component.scss
index 3bec556fd..8c2fa4842 100644
--- a/frontend/src/app/components/menu/menu.component.scss
+++ b/frontend/src/app/components/menu/menu.component.scss
@@ -45,13 +45,14 @@
   right: 0;
 }
 
-.sidenav a, button{
+.sidenav a, .sidenav button{
   text-decoration: none;
   color: lightgray;
   margin-left: 20px;
 }
-.sidenav a:hover {
-  color: white;
+
+.sidenav a:hover, .sidenav button:hover, .sidenav button:focus-visible {
+  color: var(--fg);
 }
 .sidenav nav {
   width: 100%;
diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html
index e4898f216..405020ec3 100644
--- a/frontend/src/app/components/statistics/statistics.component.html
+++ b/frontend/src/app/components/statistics/statistics.component.html
@@ -100,7 +100,7 @@
               </button>
             </div>
             <div class="form-check">
-              <input style="margin-top: 9px" class="form-check-input" type="checkbox" [checked]="outlierCappingEnabled" id="hide-outliers" (change)="onOutlierToggleChange($event)">
+              <input style="margin-top: 6px" class="form-check-input" type="checkbox" [checked]="outlierCappingEnabled" id="hide-outliers" (change)="onOutlierToggleChange($event)">
               <label class="form-check-label" for="hide-outliers">
                 <small i18n="statistics.cap-outliers">Cap outliers</small>
               </label>
diff --git a/frontend/src/app/components/statistics/statistics.component.scss b/frontend/src/app/components/statistics/statistics.component.scss
index a41ff5ebe..6254371d5 100644
--- a/frontend/src/app/components/statistics/statistics.component.scss
+++ b/frontend/src/app/components/statistics/statistics.component.scss
@@ -153,7 +153,6 @@
     width: 50%;
     flex-grow: 1;
     flex-shrink: 1;
-    margin: 1px 0;
     margin-right: 0.5rem;
     @media (min-width: 830px) {
       width: auto;
diff --git a/frontend/src/app/components/transaction/transaction-details/transaction-details.component.html b/frontend/src/app/components/transaction/transaction-details/transaction-details.component.html
index 1035beca2..2dfd124c2 100644
--- a/frontend/src/app/components/transaction/transaction-details/transaction-details.component.html
+++ b/frontend/src/app/components/transaction/transaction-details/transaction-details.component.html
@@ -264,7 +264,7 @@
             }
           </div>
           @if (hasCpfp) {
-            <button type="button" class="btn btn-outline-info btn-sm btn-small-height float-end" (click)="toggleCpfp()">CPFP</button>
+            <button type="button" class="btn btn-outline-info cpfp-toggle btn-sm btn-small-height float-end" (click)="toggleCpfp()">CPFP</button>
           }
         </td>
       </tr>
diff --git a/frontend/src/app/components/transaction/transaction-details/transaction-details.component.scss b/frontend/src/app/components/transaction/transaction-details/transaction-details.component.scss
index 1dc828be5..af2255427 100644
--- a/frontend/src/app/components/transaction/transaction-details/transaction-details.component.scss
+++ b/frontend/src/app/components/transaction/transaction-details/transaction-details.component.scss
@@ -133,6 +133,11 @@
 	}
 }
 
+.cpfp-toggle {
+  --bs-btn-active-color: var(--bs-btn-hover-color);
+  --bs-btn-active-bg: var(--bs-btn-hover-bg);
+}
+
 .eta {
   display: flex;
   flex-wrap: wrap;
diff --git a/frontend/src/app/lightning/group/group.component.html b/frontend/src/app/lightning/group/group.component.html
index d8e64761e..ea233a6ec 100644
--- a/frontend/src/app/lightning/group/group.component.html
+++ b/frontend/src/app/lightning/group/group.component.html
@@ -57,10 +57,10 @@
     <form [formGroup]="socketToggleForm" class="formRadioGroup">
       <div class="btn-group btn-group-toggle" name="radioBasic">
         <label class="btn btn-primary btn-sm" [class.active]="socketToggleForm.get('socket').value === 0">
-          <input type="radio" [value]="0" formControlName="socket">IPv4
+          <input type="radio" class="btn-check" [value]="0" formControlName="socket">IPv4
         </label>
         <label class="btn btn-primary btn-sm" [class.active]="socketToggleForm.get('socket').value === 1">
-          <input type="radio" [value]="1" formControlName="socket">IPv6
+          <input type="radio" class="btn-check" [value]="1" formControlName="socket">IPv6
         </label>
       </div>
     </form>
diff --git a/frontend/src/app/lightning/group/group.component.scss b/frontend/src/app/lightning/group/group.component.scss
index 61bc87ca8..ac81a03a4 100644
--- a/frontend/src/app/lightning/group/group.component.scss
+++ b/frontend/src/app/lightning/group/group.component.scss
@@ -31,6 +31,15 @@ h1 {
 
 #inputGroupFileAddon04 {
   position: relative;
+  border-start-start-radius: var(--bs-border-radius);
+  border-start-end-radius: var(--bs-border-radius);
+  border-end-start-radius: var(--bs-border-radius);
+  border-end-end-radius: var(--bs-border-radius);
+}
+
+.input-group > .form-control {
+  border-start-end-radius: var(--bs-border-radius) !important;
+  border-end-end-radius: var(--bs-border-radius) !important;
 }
 
 .toggle-holder {
diff --git a/frontend/src/app/lightning/node/node.component.scss b/frontend/src/app/lightning/node/node.component.scss
index 9d70bae30..67a1ac0e7 100644
--- a/frontend/src/app/lightning/node/node.component.scss
+++ b/frontend/src/app/lightning/node/node.component.scss
@@ -33,6 +33,15 @@
 
 #inputGroupFileAddon04 {
   position: relative;
+  border-start-start-radius: var(--bs-border-radius);
+  border-start-end-radius: var(--bs-border-radius);
+  border-end-start-radius: var(--bs-border-radius);
+  border-end-end-radius: var(--bs-border-radius);
+}
+
+.input-group > .form-control {
+  border-start-end-radius: var(--bs-border-radius) !important;
+  border-end-end-radius: var(--bs-border-radius) !important;
 }
 
 app-fiat {
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 17fec769a..b4c73b2e9 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -1578,3 +1578,7 @@ button {
 .text-muted {
   color: var(--grey) !important;
 }
+
+form label:not(.form-check-label):not(.btn) {
+  margin-bottom: 0.5rem;
+}
\ No newline at end of file