diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.html b/apps/browser/src/autofill/popup/fido2/fido2.component.html
index ed851af234e..0b05a28d9a0 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.html
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.html
@@ -8,8 +8,14 @@
       }}"
     >
       @if (showNewPasskeyButton) {
-        <button bitButton buttonType="primary" type="button" (click)="addCipher()" slot="end">
-          <i class="bwi bwi-plus" aria-hidden="true"></i>
+        <button
+          bitButton
+          buttonType="primary"
+          type="button"
+          (click)="addCipher()"
+          slot="end"
+          startIcon="bwi-plus"
+        >
           {{ "new" | i18n }}
         </button>
       }
diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
index 1f2e91f6d06..360096babda 100644
--- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
+++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
@@ -60,8 +60,15 @@
             />
           </bit-form-field>
         </bit-card>
-        <button bitLink class="tw-pt-2" type="button" linkType="primary" (click)="addNewDomain()">
-          <i class="bwi bwi-plus-circle bwi-fw" aria-hidden="true"></i> {{ "addDomain" | i18n }}
+        <button
+          bitLink
+          class="tw-pt-2"
+          type="button"
+          linkType="primary"
+          (click)="addNewDomain()"
+          startIcon="bwi-plus-circle"
+        >
+          {{ "addDomain" | i18n }}
         </button>
       </form>
     </bit-section>
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains.component.html b/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
index f74586a9404..d2d3e05396d 100644
--- a/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
+++ b/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
@@ -54,8 +54,15 @@
             />
           </bit-form-field>
         </bit-card>
-        <button bitLink class="tw-pt-2" type="button" linkType="primary" (click)="addNewDomain()">
-          <i class="bwi bwi-plus-circle bwi-fw" aria-hidden="true"></i> {{ "addDomain" | i18n }}
+        <button
+          bitLink
+          class="tw-pt-2"
+          type="button"
+          linkType="primary"
+          (click)="addNewDomain()"
+          startIcon="bwi-plus-circle"
+        >
+          {{ "addDomain" | i18n }}
         </button>
       </form>
     </bit-section>