diff --git a/apps/web/src/app/components/file-password-prompt.component.html b/apps/web/src/app/components/file-password-prompt.component.html
index 2f27063a057..d5e72f49bc0 100644
--- a/apps/web/src/app/components/file-password-prompt.component.html
+++ b/apps/web/src/app/components/file-password-prompt.component.html
@@ -7,23 +7,23 @@
       [formGroup]="importForm"
       *ngIf="importForm"
     >
-      <div class="tw-text-center bwi-3x">
-        <i class="bwi bwi-exclamation-triangle text-warning"></i>
-      </div>
-
-      <h2 class="tw-text-center tw-font-semibold" id="confirmUserTitle">
-        {{ "confirmVaultImport" | i18n }}
-      </h2>
-
-      <div class="modal-body">
-        <div>
-          {{ "confirmVaultImportDesc" | i18n }}
-        </div>
-      </div>
-
       <div class="modal-footer">
         <div class="form-group modal-content">
           <div>
+            <div class="tw-text-center bwi-3x">
+              <i class="bwi bwi-exclamation-triangle text-warning"></i>
+            </div>
+
+            <h2 class="tw-text-center tw-font-semibold" id="confirmVaultImport">
+              {{ "confirmVaultImport" | i18n }}
+            </h2>
+
+            <div class="modal-body">
+              <div>
+                {{ "confirmVaultImportDesc" | i18n }}
+              </div>
+            </div>
+
             <div class="input-group">
               <bit-form-field>
                 <bit-label>{{ "confirmFilePassword" | i18n }}</bit-label>
@@ -36,35 +36,34 @@
                   appAutofocus
                   appInputVerbatim
                 />
+                <button
+                  bitSuffix
+                  bitButton
+                  appStopClick
+                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                  [attr.aria-pressed]="showPassword"
+                  (click)="togglePassword()"
+                >
+                  <i
+                    class="bwi bwi-lg"
+                    aria-hidden="true"
+                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                  ></i>
+                </button>
               </bit-form-field>
-              <div class="input-group-append">
-                <div class="action-buttons">
-                  <button
-                    bitSuffix
-                    bitButton
-                    buttonType="secondary"
-                    appStopClick
-                    appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                    [attr.aria-pressed]="showPassword"
-                    (click)="togglePassword()"
-                  >
-                    <i
-                      class="bwi bwi-lg"
-                      aria-hidden="true"
-                      [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-                    ></i>
-                  </button>
-                </div>
-              </div>
             </div>
           </div>
-          <div class="tw-mt-4">
-            <button bitSuffix bitButton buttonType="primary" type="submit" appBlurClick>
-              <span>{{ "importData" | i18n }}</span>
-            </button>
-            <button bitSuffix bitButton buttonType="primary" type="button" data-dismiss="modal">
-              {{ "cancel" | i18n }}
-            </button>
+          <div class="modal-footer">
+            <div class="modal-footer-content">
+              <div class="tw-mt-4">
+                <button bitButton buttonType="primary" type="submit" appBlurClick>
+                  <span>{{ "importData" | i18n }}</span>
+                </button>
+                <button bitButton buttonType="secondary" type="button" data-dismiss="modal">
+                  {{ "cancel" | i18n }}
+                </button>
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/apps/web/src/app/components/user-verification-prompt.component.html b/apps/web/src/app/components/user-verification-prompt.component.html
index 9f116a84a98..ed863632a4b 100644
--- a/apps/web/src/app/components/user-verification-prompt.component.html
+++ b/apps/web/src/app/components/user-verification-prompt.component.html
@@ -24,10 +24,10 @@
             </div>
           </div>
         </div>
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button bitButton buttonType="primary" type="submit" appBlurClick>
           <span>{{ confirmButtonText | i18n }}</span>
         </button>
-        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
+        <button bitButton buttonType="secondary" data-dismiss="modal">
           {{ "cancel" | i18n }}
         </button>
       </div>