diff --git a/apps/desktop/src/platform/components/approve-ssh-request.html b/apps/desktop/src/platform/components/approve-ssh-request.html
index 952e3344e9c..b7005872f25 100644
--- a/apps/desktop/src/platform/components/approve-ssh-request.html
+++ b/apps/desktop/src/platform/components/approve-ssh-request.html
@@ -14,13 +14,13 @@
       <b>{{params.cipherName}}</b>
       {{ "sshkeyApprovalMessageSuffix" | i18n }} {{ params.action | i18n }}
     </div>
-    <div bitDialogFooter>
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary">
         <span>{{ "authorize" | i18n }}</span>
       </button>
       <button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>
         {{ "deny" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index f2995e31f12..3856f6f4e28 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -187,7 +187,7 @@
                   class="tw-mr-3"
                 ></bit-avatar>
                 <div class="tw-flex tw-flex-col">
-                  <div>
+                  <div class="tw-flex tw-flex-row tw-gap-2">
                     <button type="button" bitLink>
                       {{ u.name ?? u.email }}
                     </button>
@@ -196,22 +196,25 @@
                       class="tw-text-xs"
                       variant="secondary"
                       *ngIf="u.status === userStatusType.Invited"
-                      >{{ "invited" | i18n }}</span
                     >
+                      {{ "invited" | i18n }}
+                    </span>
                     <span
                       bitBadge
                       class="tw-text-xs"
                       variant="warning"
                       *ngIf="u.status === userStatusType.Accepted"
-                      >{{ "needsConfirmation" | i18n }}</span
                     >
+                      {{ "needsConfirmation" | i18n }}
+                    </span>
                     <span
                       bitBadge
                       class="tw-text-xs"
                       variant="secondary"
                       *ngIf="u.status === userStatusType.Revoked"
-                      >{{ "revoked" | i18n }}</span
                     >
+                      {{ "revoked" | i18n }}
+                    </span>
                   </div>
                   <div class="tw-text-sm tw-text-muted" *ngIf="u.name">
                     {{ u.email }}
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
index 9965302d15a..7b1d859fb69 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.html
@@ -1,24 +1,26 @@
 <h2 bitTypography="h2">
   {{ "logInWithPasskey" | i18n }}
-  <ng-container *ngIf="hasData">
-    <span
-      *ngIf="requireSsoPolicyEnabled"
-      bitBadge
-      variant="secondary"
-      class="tw-max-w-full !tw-align-middle"
-    >
-      {{ "off" | i18n }} - {{ "ssoLoginIsRequired" | i18n }}
-    </span>
-    <ng-container *ngIf="!requireSsoPolicyEnabled">
-      <span *ngIf="hasCredentials" bitBadge variant="success" class="!tw-align-middle">{{
-        "on" | i18n
-      }}</span>
-      <span *ngIf="!hasCredentials" bitBadge variant="secondary" class="!tw-align-middle">{{
-        "off" | i18n
-      }}</span>
+  <span class="tw-inline-flex tw-gap-1 tw-align-middle">
+    <ng-container *ngIf="hasData">
+      <span
+        *ngIf="requireSsoPolicyEnabled"
+        bitBadge
+        variant="secondary"
+        class="tw-max-w-full !tw-align-middle"
+      >
+        {{ "off" | i18n }} - {{ "ssoLoginIsRequired" | i18n }}
+      </span>
+      <ng-container *ngIf="!requireSsoPolicyEnabled">
+        <span *ngIf="hasCredentials" bitBadge variant="success" class="!tw-align-middle">
+          {{ "on" | i18n }}
+        </span>
+        <span *ngIf="!hasCredentials" bitBadge variant="secondary" class="!tw-align-middle">
+          {{ "off" | i18n }}
+        </span>
+      </ng-container>
     </ng-container>
-  </ng-container>
-  <span bitBadge variant="warning" class="!tw-align-middle">{{ "beta" | i18n }}</span>
+    <span bitBadge variant="warning" class="!tw-align-middle">{{ "beta" | i18n }}</span>
+  </span>
   <ng-container *ngIf="loading">
     <i class="bwi bwi-spinner bwi-spin tw-ml-1" aria-hidden="true"></i>
   </ng-container>
diff --git a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
index 589704a409a..eb8e2c56527 100644
--- a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
@@ -49,8 +49,9 @@
                 appStopClick
                 (click)="selectCipher(row)"
                 title="{{ 'editItemWithName' | i18n: row.name }}"
-                >{{ row.name }}</a
               >
+                {{ row.name }}
+              </a>
             </ng-container>
             <ng-template #cantManage>
               <span>{{ row.name }}</span>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
index 7226c957598..7df5953c56a 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
@@ -7,25 +7,27 @@
     <span bitDialogTitle>
       <span *ngIf="!data.orgDomain">{{ "newDomain" | i18n }}</span>
       <span *ngIf="data.orgDomain">
+        {{ ((accountDeprovisioningEnabled$ | async) ? "claimDomain" : "verifyDomain") | i18n }}
+      </span>
+
+      <span *ngIf="data.orgDomain" class="tw-text-xs tw-text-muted">
+        {{ data.orgDomain.domainName }}
+      </span>
+
+      <span *ngIf="data?.orgDomain && !data.orgDomain?.verifiedDate" bitBadge variant="warning">
         {{
-          ((accountDeprovisioningEnabled$ | async) ? "claimDomain" : "verifyDomain") | i18n
-        }}</span
-      >
-
-      <span *ngIf="data.orgDomain" class="tw-text-xs tw-text-muted">{{
-        data.orgDomain.domainName
-      }}</span>
-
-      <span *ngIf="data?.orgDomain && !data.orgDomain?.verifiedDate" bitBadge variant="warning">{{
-        ((accountDeprovisioningEnabled$ | async)
-          ? "domainStatusUnderVerification"
-          : "domainStatusUnverified"
-        ) | i18n
-      }}</span>
-      <span *ngIf="data?.orgDomain && data?.orgDomain?.verifiedDate" bitBadge variant="success">{{
-        ((accountDeprovisioningEnabled$ | async) ? "domainStatusClaimed" : "domainStatusVerified")
-          | i18n
-      }}</span>
+          ((accountDeprovisioningEnabled$ | async)
+            ? "domainStatusUnderVerification"
+            : "domainStatusUnverified"
+          ) | i18n
+        }}
+      </span>
+      <span *ngIf="data?.orgDomain && data?.orgDomain?.verifiedDate" bitBadge variant="success">
+        {{
+          ((accountDeprovisioningEnabled$ | async) ? "domainStatusClaimed" : "domainStatusVerified")
+            | i18n
+        }}
+      </span>
     </span>
     <div bitDialogContent>
       <bit-form-field>