diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.html b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.html
index d296514e35..68582e8b2e 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.html
@@ -6,31 +6,27 @@
   <div bitDialogContent>
     <form [formGroup]="filterFormGroup" [bitSubmit]="refreshEvents">
       <div class="tw-flex tw-items-center tw-space-x-2">
-        <div>
-          <label class="tw-sr-only" for="start">{{ "startDate" | i18n }}</label>
-          <span>
-            <input
-              bitInput
-              type="datetime-local"
-              id="start"
-              placeholder="{{ 'startDate' | i18n }}"
-              formControlName="start"
-            />
-          </span>
-        </div>
+        <bit-form-field>
+          <bit-label>{{ "from" | i18n }}</bit-label>
+          <input
+            bitInput
+            type="datetime-local"
+            id="start"
+            placeholder="{{ 'startDate' | i18n }}"
+            formControlName="start"
+          />
+        </bit-form-field>
         <span class="tw-mx-2">-</span>
-        <div>
-          <label class="tw-sr-only" for="end">{{ "endDate" | i18n }}</label>
-          <span>
-            <input
-              bitInput
-              type="datetime-local"
-              id="end"
-              placeholder="{{ 'endDate' | i18n }}"
-              formControlName="end"
-            />
-          </span>
-        </div>
+        <bit-form-field>
+          <bit-label>{{ "to" | i18n }}</bit-label>
+          <input
+            bitInput
+            type="datetime-local"
+            id="end"
+            placeholder="{{ 'endDate' | i18n }}"
+            formControlName="end"
+          />
+        </bit-form-field>
         <button type="submit" bitButton buttonType="primary" bitFormButton>
           <i class="bwi bwi-refresh bwi-fw" aria-hidden="true"></i>
           {{ "refresh" | i18n }}
diff --git a/apps/web/src/app/auth/two-factor.component.html b/apps/web/src/app/auth/two-factor.component.html
index a941413dbb..b78747e04c 100644
--- a/apps/web/src/app/auth/two-factor.component.html
+++ b/apps/web/src/app/auth/two-factor.component.html
@@ -36,7 +36,7 @@
         <img src="../../images/yubikey.jpg" class="tw-rounded img-fluid tw-mb-3" alt="" />
       </picture>
       <bit-form-field>
-        <bit-label class="tw-sr-only">{{ "verificationCode" | i18n }}</bit-label>
+        <bit-label>{{ "verificationCode" | i18n }}</bit-label>
         <input type="password" bitInput formControlName="token" appAutofocus appInputVerbatim />
       </bit-form-field>
     </ng-container>
diff --git a/apps/web/src/app/settings/domain-rules.component.html b/apps/web/src/app/settings/domain-rules.component.html
index 18091bcc3a..1c8e5e435e 100644
--- a/apps/web/src/app/settings/domain-rules.component.html
+++ b/apps/web/src/app/settings/domain-rules.component.html
@@ -18,7 +18,7 @@
         *ngFor="let d of custom; let i = index; trackBy: indexTrackBy"
       >
         <bit-form-field class="tw-flex-1 !tw-mb-0" formGroupName="{{ i }}">
-          <bit-label class="tw-sr-only">{{ "customDomainX" | i18n: i + 1 }} </bit-label>
+          <bit-label>{{ "customDomainX" | i18n: i + 1 }} </bit-label>
           <textarea
             rows="2"
             bitInput