diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
index 8d576098a74..538d511571c 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
@@ -59,7 +59,7 @@
     </ng-container>
     <small *ngIf="loading">
       <i
-        class="bwi bwi-spinner bwi-spin text-muted"
+        class="bwi bwi-spinner bwi-spin tw-text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 75332dcf72a..1a2a1fdbca6 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -24,19 +24,13 @@
 
 <div class="tw-flex tw-flex-row -tw-mx-2.5">
   <div class="tw-basis-1/4 tw-max-w-1/4 tw-px-2.5">
-    <div class="groupings">
-      <div class="content">
-        <div class="inner-content">
-          <app-vault-filter
-            #vaultFilter
-            [activeFilter]="activeFilter"
-            [searchText]="currentSearchText$ | async"
-            (searchTextChanged)="filterSearchText($event)"
-            (onEditFolder)="editFolder($event)"
-          ></app-vault-filter>
-        </div>
-      </div>
-    </div>
+    <app-vault-filter
+      #vaultFilter
+      [activeFilter]="activeFilter"
+      [searchText]="currentSearchText$ | async"
+      (searchTextChanged)="filterSearchText($event)"
+      (onEditFolder)="editFolder($event)"
+    ></app-vault-filter>
   </div>
   <div class="tw-basis-3/4 tw-max-w-3/4 tw-px-2.5">
     <bit-callout type="warning" *ngIf="activeFilter.isDeleted">
@@ -65,7 +59,7 @@
       class="tw-mt-6 tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-start"
     >
       <i
-        class="bwi bwi-spinner bwi-spin text-muted"
+        class="bwi bwi-spinner bwi-spin tw-text-muted"
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
diff --git a/libs/vault/src/components/new-device-verification-notice/new-device-verification-notice-page-one.component.html b/libs/vault/src/components/new-device-verification-notice/new-device-verification-notice-page-one.component.html
index 9d7808379d3..812a8faa66c 100644
--- a/libs/vault/src/components/new-device-verification-notice/new-device-verification-notice-page-one.component.html
+++ b/libs/vault/src/components/new-device-verification-notice/new-device-verification-notice-page-one.component.html
@@ -13,7 +13,7 @@
       'md:tw-flex md:tw-flex-col md:tw-items-center md:!tw-rounded-b-none': !isDesktop,
     }"
   >
-    <p bitTypography="body2" class="text-muted md:tw-w-9/12">
+    <p bitTypography="body2" class="tw-text-muted md:tw-w-9/12">
       {{ "newDeviceVerificationNoticePageOneFormContent" | i18n: this.currentEmail }}
     </p>
 
diff --git a/libs/vault/src/components/password-history-view/password-history-view.component.html b/libs/vault/src/components/password-history-view/password-history-view.component.html
index 459c679945c..7510d80a549 100644
--- a/libs/vault/src/components/password-history-view/password-history-view.component.html
+++ b/libs/vault/src/components/password-history-view/password-history-view.component.html
@@ -23,6 +23,9 @@
     </ng-container>
   </bit-item>
 </div>
-<div class="no-items" *ngIf="!history?.length">
+<div
+  class="tw-absolute tw-top-1/2 tw-left-1/2 tw-transform tw--translate-x-1/2 tw--translate-y-1/2 tw-text-center"
+  *ngIf="!history?.length"
+>
   <p>{{ "noPasswordsInList" | i18n }}</p>
 </div>
diff --git a/libs/vault/src/components/totp-countdown/totp-countdown.component.html b/libs/vault/src/components/totp-countdown/totp-countdown.component.html
index affe97d734f..c6277826022 100644
--- a/libs/vault/src/components/totp-countdown/totp-countdown.component.html
+++ b/libs/vault/src/components/totp-countdown/totp-countdown.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="totpInfo$ | async as totpInfo">
-  <div class="tw-flex tw-items-center tw-justify-center totp-v2">
+  <div class="tw-flex tw-items-center tw-justify-center">
     <span class="tw-relative tw-flex tw-justify-center tw-items-center" aria-hidden="true">
       <span
         class="tw-absolute"