diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.html b/apps/web/src/app/components/environment-selector/environment-selector.component.html
index a1fb1a8a0f3..91675bd4945 100644
--- a/apps/web/src/app/components/environment-selector/environment-selector.component.html
+++ b/apps/web/src/app/components/environment-selector/environment-selector.component.html
@@ -6,10 +6,9 @@
       [attr.href]="
         region == currentRegion ? 'javascript:void(0)' : region.urls.webVault + routeAndParams
       "
-      class="pr-4"
     >
       <i
-        class="bwi bwi-fw bwi-sm bwi-check pb-1"
+        class="bwi bwi-fw bwi-sm bwi-check"
         aria-hidden="true"
         [style.visibility]="region == currentRegion ? 'visible' : 'hidden'"
       ></i>
diff --git a/apps/web/src/app/layouts/frontend-layout.component.html b/apps/web/src/app/layouts/frontend-layout.component.html
index 72f0f1f1da3..d19af54f5df 100644
--- a/apps/web/src/app/layouts/frontend-layout.component.html
+++ b/apps/web/src/app/layouts/frontend-layout.component.html
@@ -1,6 +1,8 @@
 <router-outlet></router-outlet>
-<div class="container my-5 text-muted text-center">
+
+<footer class="tw-text-center tw-my-12">
   <environment-selector></environment-selector>
-  &copy; {{ year }} Bitwarden Inc. <br />
-  {{ "versionNumber" | i18n: version }}
-</div>
+
+  <div bitTypography="body2">&copy; {{ year }} Bitwarden Inc.</div>
+  <div bitTypography="body2">{{ version }}</div>
+</footer>
diff --git a/apps/web/src/app/layouts/org-switcher/org-switcher.component.html b/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
index f34d32f5983..ef702c7e593 100644
--- a/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
+++ b/apps/web/src/app/layouts/org-switcher/org-switcher.component.html
@@ -10,7 +10,7 @@
   <i
     slot="end"
     *ngIf="!activeOrganization.enabled"
-    class="bwi bwi-exclamation-triangle tw-my-auto !text-alt-2"
+    class="bwi bwi-exclamation-triangle tw-my-auto"
     [attr.aria-label]="'organizationIsDisabled' | i18n"
     appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
   ></i>
@@ -27,7 +27,7 @@
       <i
         slot="end"
         *ngIf="org.enabled == false"
-        class="bwi bwi-exclamation-triangle !text-alt-2"
+        class="bwi bwi-exclamation-triangle"
         [attr.aria-label]="'organizationIsDisabled' | i18n"
         appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
       ></i>
diff --git a/apps/web/src/app/settings/domain-rules.component.html b/apps/web/src/app/settings/domain-rules.component.html
index a3bea63fb86..7e9e7d6ed64 100644
--- a/apps/web/src/app/settings/domain-rules.component.html
+++ b/apps/web/src/app/settings/domain-rules.component.html
@@ -43,7 +43,7 @@ <h2 bitTypography="h2">{{ "customEqDomains" | i18n }}</h2>
     <button type="submit" bitButton bitFormButton buttonType="primary">
       {{ "save" | i18n }}
     </button>
-    <h2 bitTypography="h2" class="spaced-header">{{ "globalEqDomains" | i18n }}</h2>
+    <h2 bitTypography="h2" class="tw-mt-16">{{ "globalEqDomains" | i18n }}</h2>
     <p bitTypography="body1" *ngIf="loading">
       <i
         class="bwi bwi-spinner bwi-spin tw-text-muted"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
index 1ab8b7e0196..d9919ef6bac 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="projectSecrets?.secrets && projectSecrets?.project; else spinner">
     <div
       *ngIf="projectSecrets.secrets?.length > 0 && projectSecrets.project?.write"
-      class="float-right tw-mt-3 tw-items-center"
+      class="tw-float-right tw-mt-3 tw-items-center"
     >
       <button type="button" bitButton buttonType="secondary" (click)="openNewSecretDialog()">
         <i class="bwi bwi-plus" aria-hidden="true"></i>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
index 2254800170c..1cf11634d72 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
@@ -14,7 +14,6 @@
       bitInput
       type="file"
       id="file"
-      class="form-control-file"
       name="file"
       (change)="setSelectedFile($event)"
       accept="application/JSON"
@@ -23,7 +22,7 @@
     />
     <bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint>
   </bit-form-field>
-  <div class="my-4">
+  <div class="tw-my-4">
     {{ "or" | i18n }}
   </div>
   <bit-form-field>
@@ -31,7 +30,6 @@
     <textarea
       bitInput
       id="pastedContents"
-      class="form-control"
       name="FileContents"
       formControlName="pastedContents"
     ></textarea>