diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index 11c1ab2d2e..ec1728c883 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -42,6 +42,7 @@
                 rel="noreferrer"
                 appA11yTitle="{{ 'learnMore' | i18n }}"
                 href="https://bitwarden.com/help/user-types-access-control/"
+                slot="end"
               >
                 <i class="bwi bwi-question-circle" aria-hidden="true"></i>
               </a>
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
index 1e61585e42..293c5051ce 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
@@ -23,6 +23,7 @@
             linkType="primary"
             appA11yTitle="{{ 'learnMore' | i18n }}"
             href="https://bitwarden.com/help/emergency-access/#user-access"
+            slot="end"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html
index 4442310fac..478cd77eb6 100644
--- a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html
+++ b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html
@@ -22,6 +22,7 @@
             target="_blank"
             rel="noreferrer"
             appA11yTitle="{{ 'learnMore' | i18n }}"
+            slot="end"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>
@@ -57,6 +58,7 @@
               target="_blank"
               rel="noreferrer"
               appA11yTitle="{{ 'learnMore' | i18n }}"
+              slot="end"
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
             </a>
diff --git a/apps/web/src/app/billing/organizations/download-license.component.html b/apps/web/src/app/billing/organizations/download-license.component.html
index 33a534bacf..b54cdda1f7 100644
--- a/apps/web/src/app/billing/organizations/download-license.component.html
+++ b/apps/web/src/app/billing/organizations/download-license.component.html
@@ -14,6 +14,7 @@
                 rel="noreferrer"
                 appA11yTitle="{{ 'learnMore' | i18n }}"
                 href="https://bitwarden.com/help/licensing-on-premise/#organization-account-sharing"
+                slot="end"
               >
                 <i class="bwi bwi-question-circle" aria-hidden="true"></i>
               </a>
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index 383013dd56..0a029de79d 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -82,6 +82,8 @@
               href="https://bitwarden.com/help/families-for-enterprise-self-hosted/"
               target="_blank"
               rel="noreferrer"
+              slot="end"
+              bitLink
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
               <span class="tw-sr-only">{{ "billingSyncHelp" | i18n }}</span>
diff --git a/apps/web/src/app/settings/preferences.component.html b/apps/web/src/app/settings/preferences.component.html
index 876c5d3bde..ffd55e69c8 100644
--- a/apps/web/src/app/settings/preferences.component.html
+++ b/apps/web/src/app/settings/preferences.component.html
@@ -57,6 +57,7 @@
           target="_blank"
           rel="noreferrer"
           appA11yTitle="{{ 'learnMore' | i18n }}"
+          slot="end"
         >
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
         </a>
@@ -76,6 +77,7 @@
           target="_blank"
           rel="noreferrer"
           appA11yTitle="{{ 'learnMore' | i18n }}"
+          slot="end"
         >
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
         </a>
diff --git a/apps/web/src/app/tools/send/add-edit.component.html b/apps/web/src/app/tools/send/add-edit.component.html
index 500100afd4..7eade18a7c 100644
--- a/apps/web/src/app/tools/send/add-edit.component.html
+++ b/apps/web/src/app/tools/send/add-edit.component.html
@@ -39,6 +39,7 @@
               <app-premium-badge
                 class="tw-mx-1"
                 *ngIf="!canAccessPremium && o.premium"
+                slot="end"
               ></app-premium-badge>
             </bit-label>
           </bit-radio-button>
@@ -196,6 +197,7 @@
                   (click)="clearExpiration()"
                   *ngIf="!disableSend"
                   class="tw-ml-auto"
+                  slot="end"
                 >
                   {{ "clear" | i18n }}
                 </button>
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index b2b5d1fef9..a7d369952a 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -62,6 +62,8 @@
               rel="noreferrer"
               appA11yTitle="{{ 'learnMore' | i18n }}"
               href="https://bitwarden.com/help/about-key-connector/"
+              slot="end"
+              bitLink
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
             </a>
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.html b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
index d4298504fc..ad30f4a87a 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.html
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.html
@@ -35,8 +35,9 @@
           href="https://bitwarden.com/email-preferences"
           target="_blank"
           rel="noreferrer"
-          >{{ "unsubscribe" | i18n }}</a
         >
+          {{ "unsubscribe" | i18n }}
+        </a>
         {{ "atAnyTime" | i18n }}
       </bit-label>
     </bit-form-control>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
index fa3a915f22..4e8d884c4a 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
@@ -76,6 +76,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
             linkType="primary"
             [bitPopoverTriggerFor]="myPopover"
             #triggerRef="popoverTrigger"
+            slot="end"
           >
             <i class="bwi bwi-question-circle"></i>
           </button>
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index 12171936ef..af75eae862 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -97,6 +97,7 @@
           type="button"
           [bitPopoverTriggerFor]="totpPopover"
           [appA11yTitle]="'learnMoreAboutAuthenticators' | i18n"
+          slot="end"
         >
           <i class="bwi bwi-sm bwi-question-circle" aria-hidden="true"></i>
         </button>
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 3cd8431519..6aeb58c985 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
@@ -80,6 +80,7 @@
           variant="success"
           class="tw-ml-2"
           (click)="getPremium()"
+          slot="end"
         >
           {{ "premium" | i18n }}
         </span>