diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.html b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
index 902c7e79d55..64fb4794037 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
@@ -19,12 +19,14 @@
           @if (p.display$(organization, configService) | async) {
             <tr bitRow>
               <td bitCell ngPreserveWhitespaces>
-                <button type="button" bitLink (click)="edit(p, organizationId)">
-                  {{ p.name | i18n }}
-                </button>
-                @if (policiesEnabledMap.get(p.type)) {
-                  <span bitBadge variant="success">{{ "on" | i18n }}</span>
-                }
+                <div class="tw-flex tw-items-center tw-gap-2">
+                  <button type="button" bitLink (click)="edit(p, organizationId)">
+                    {{ p.name | i18n }}
+                  </button>
+                  @if (policiesEnabledMap.get(p.type)) {
+                    <span bitBadge variant="success">{{ "on" | i18n }}</span>
+                  }
+                </div>
                 <small class="tw-text-muted tw-block">{{ p.description | i18n }}</small>
               </td>
             </tr>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html
index f979c143a3a..2267bd5888e 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/master-password.component.html
@@ -13,29 +13,24 @@
     <bit-label>{{ "enforceOnLoginDesc" | i18n }}</bit-label>
   </bit-form-control>
 
-  <div class="tw-flex tw-space-x-4">
-    <bit-form-field class="tw-flex-auto">
-      <bit-label>{{ "minComplexityScore" | i18n }}</bit-label>
-      <bit-select formControlName="minComplexity" id="minComplexity">
-        <bit-option
-          *ngFor="let o of passwordScores"
-          [value]="o.value"
-          [label]="o.name"
-        ></bit-option>
-      </bit-select>
-    </bit-form-field>
-    <bit-form-field class="tw-flex-auto">
-      <bit-label>{{ "minLength" | i18n }}</bit-label>
-      <input
-        bitInput
-        type="number"
-        formControlName="minLength"
-        id="minLength"
-        [min]="MinPasswordLength"
-        [max]="MaxPasswordLength"
-      />
-    </bit-form-field>
-  </div>
+  <bit-form-field>
+    <bit-label>{{ "minComplexityScore" | i18n }}</bit-label>
+    <bit-select formControlName="minComplexity" id="minComplexity">
+      <bit-option *ngFor="let o of passwordScores" [value]="o.value" [label]="o.name"></bit-option>
+    </bit-select>
+  </bit-form-field>
+
+  <bit-form-field>
+    <bit-label>{{ "minLength" | i18n }}</bit-label>
+    <input
+      bitInput
+      type="number"
+      formControlName="minLength"
+      id="minLength"
+      [min]="MinPasswordLength"
+      [max]="MaxPasswordLength"
+    />
+  </bit-form-field>
 
   <bit-form-control class="!tw-mb-2">
     <input type="checkbox" bitCheckbox formControlName="requireUpper" id="requireUpper" />
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html
index 1300acee471..372ad3609c0 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-definitions/password-generator.component.html
@@ -4,56 +4,50 @@
     <bit-label>{{ "turnOn" | i18n }}</bit-label>
   </bit-form-control>
 
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-    <bit-form-field class="tw-col-span-6 tw-mb-0">
-      <bit-label>{{ "overridePasswordTypePolicy" | i18n }}</bit-label>
-      <bit-select formControlName="overridePasswordType" id="overrideType">
-        <bit-option
-          *ngFor="let o of overridePasswordTypeOptions"
-          [value]="o.value"
-          [label]="o.name"
-        ></bit-option>
-      </bit-select>
-    </bit-form-field>
-  </div>
+  <bit-form-field>
+    <bit-label>{{ "passwordTypePolicyOverride" | i18n }}</bit-label>
+    <bit-select formControlName="overridePasswordType" id="overrideType">
+      <bit-option
+        *ngFor="let o of overridePasswordTypeOptions"
+        [value]="o.value"
+        [label]="o.name"
+      ></bit-option>
+    </bit-select>
+  </bit-form-field>
 
   <!-- password-specific policies -->
   <div *ngIf="showPasswordPolicies$ | async">
     <h3 bitTypography="h3" class="tw-mt-4">{{ "password" | i18n }}</h3>
-    <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-      <bit-form-field class="tw-col-span-6">
-        <bit-label>{{ "minLength" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="number"
-          [min]="minLengthMin"
-          [max]="minLengthMax"
-          formControlName="minLength"
-        />
-      </bit-form-field>
-    </div>
-    <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-      <bit-form-field class="tw-col-span-6">
-        <bit-label>{{ "minNumbers" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="number"
-          [min]="minNumbersMin"
-          [max]="minNumbersMax"
-          formControlName="minNumbers"
-        />
-      </bit-form-field>
-      <bit-form-field class="tw-col-span-6">
-        <bit-label>{{ "minSpecial" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="number"
-          [min]="minSpecialMin"
-          [max]="minSpecialMax"
-          formControlName="minSpecial"
-        />
-      </bit-form-field>
-    </div>
+    <bit-form-field>
+      <bit-label>{{ "minLength" | i18n }}</bit-label>
+      <input
+        bitInput
+        type="number"
+        [min]="minLengthMin"
+        [max]="minLengthMax"
+        formControlName="minLength"
+      />
+    </bit-form-field>
+    <bit-form-field>
+      <bit-label>{{ "minNumbers" | i18n }}</bit-label>
+      <input
+        bitInput
+        type="number"
+        [min]="minNumbersMin"
+        [max]="minNumbersMax"
+        formControlName="minNumbers"
+      />
+    </bit-form-field>
+    <bit-form-field>
+      <bit-label>{{ "minSpecial" | i18n }}</bit-label>
+      <input
+        bitInput
+        type="number"
+        [min]="minSpecialMin"
+        [max]="minSpecialMax"
+        formControlName="minSpecial"
+      />
+    </bit-form-field>
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="useUpper" id="useUpper" />
       <bit-label>{{ "uppercaseLabel" | i18n }}</bit-label>
@@ -79,18 +73,16 @@
   <!-- passphrase-specific policies -->
   <div *ngIf="showPassphrasePolicies$ | async">
     <h3 bitTypography="h3" class="tw-mt-4">{{ "passphrase" | i18n }}</h3>
-    <div class="tw-grid tw-grid-cols-12 tw-gap-4">
-      <bit-form-field class="tw-col-span-6">
-        <bit-label>{{ "minimumNumberOfWords" | i18n }}</bit-label>
-        <input
-          bitInput
-          type="number"
-          [min]="minNumberWordsMin"
-          [max]="minNumberWordsMax"
-          formControlName="minNumberWords"
-        />
-      </bit-form-field>
-    </div>
+    <bit-form-field>
+      <bit-label>{{ "minimumNumberOfWords" | i18n }}</bit-label>
+      <input
+        bitInput
+        type="number"
+        [min]="minNumberWordsMin"
+        [max]="minNumberWordsMax"
+        formControlName="minNumberWords"
+      />
+    </bit-form-field>
     <bit-form-control>
       <input type="checkbox" bitCheckbox formControlName="capitalize" id="capitalize" />
       <bit-label>{{ "capitalize" | i18n }}</bit-label>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html
index 6573801ad25..6981802e8e9 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.html
@@ -1,5 +1,13 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog [loading]="loading" [title]="'editPolicy' | i18n" [subtitle]="policy.name | i18n">
+<form [formGroup]="formGroup" [bitSubmit]="submit" class="tw-h-full tw-flex tw-flex-col">
+  <bit-dialog dialogSize="default" [loading]="loading">
+    <ng-container bitDialogTitle>
+      <span class="tw-flex tw-items-center tw-gap-2">
+        {{ policy.name | i18n }}
+        @if (isPolicyEnabled) {
+          <span bitBadge variant="success">{{ "on" | i18n }}</span>
+        }
+      </span>
+    </ng-container>
     <ng-container bitDialogContent>
       <div *ngIf="loading">
         <i
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
index f1b3d04cc7a..b2f601d4e8b 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialog.component.ts
@@ -81,6 +81,10 @@ export class PolicyEditDialogComponent implements AfterViewInit {
     return this.data.policy;
   }
 
+  get isPolicyEnabled(): boolean {
+    return this.policyComponent?.policyResponse?.enabled ?? false;
+  }
+
   /**
    * Type guard to check if the policy component has the buildVNextRequest method.
    */
@@ -196,6 +200,9 @@ export class PolicyEditDialogComponent implements AfterViewInit {
     );
   }
   static open = (dialogService: DialogService, config: DialogConfig<PolicyEditDialogData>) => {
-    return dialogService.open<PolicyEditDialogResult>(PolicyEditDialogComponent, config);
+    return dialogService.openDrawer<PolicyEditDialogResult, PolicyEditDialogData>(
+      PolicyEditDialogComponent,
+      config,
+    );
   };
 }
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.html
index 4d1db65034d..fd0867a5cd5 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.html
@@ -1,5 +1,5 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog [loading]="loading">
+<form [formGroup]="formGroup" [bitSubmit]="submit" class="tw-h-full tw-flex tw-flex-col">
+  <bit-dialog dialogSize="large" [loading]="loading">
     <ng-container bitDialogTitle>
       @let title = (multiStepSubmit | async)[currentStep()]?.titleContent();
       @if (title) {
@@ -40,13 +40,16 @@
     @if (showBadge) {
       <span bitBadge variant="info" class="tw-w-[99px] tw-my-2"> {{ "availableNow" | i18n }}</span>
     }
-    <span>
+    <span class="tw-flex tw-items-center tw-gap-2">
       {{ (showBadge ? "autoConfirm" : "editPolicy") | i18n }}
       @if (!showBadge) {
         <span class="tw-text-muted tw-font-normal tw-text-sm">
           {{ policy.name | i18n }}
         </span>
       }
+      @if (isPolicyEnabled) {
+        <span bitBadge variant="success">{{ "on" | i18n }}</span>
+      }
     </span>
   </div>
 </ng-template>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.ts
index f0146225b8d..b5a92671054 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/auto-confirm-edit-policy-dialog.component.ts
@@ -287,6 +287,9 @@ export class AutoConfirmPolicyDialogComponent
     dialogService: DialogService,
     config: DialogConfig<AutoConfirmPolicyDialogData>,
   ) => {
-    return dialogService.open<PolicyEditDialogResult>(AutoConfirmPolicyDialogComponent, config);
+    return dialogService.openDrawer<PolicyEditDialogResult, AutoConfirmPolicyDialogData>(
+      AutoConfirmPolicyDialogComponent,
+      config,
+    );
   };
 }
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.html
index 73691e94199..7b89f4d0acc 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.html
@@ -1,5 +1,5 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <bit-dialog [loading]="loading">
+<form [formGroup]="formGroup" [bitSubmit]="submit" class="tw-h-full tw-flex tw-flex-col">
+  <bit-dialog dialogSize="large" [loading]="loading">
     <ng-container bitDialogTitle>
       @let title = multiStepSubmit()[currentStep()]?.titleContent();
       @if (title) {
@@ -35,7 +35,12 @@
 </form>
 
 <ng-template #step0Title>
-  {{ policy.name | i18n }}
+  <span class="tw-flex tw-items-center tw-gap-2">
+    {{ policy.name | i18n }}
+    @if (isPolicyEnabled) {
+      <span bitBadge variant="success">{{ "on" | i18n }}</span>
+    }
+  </span>
 </ng-template>
 
 <ng-template #step1Title>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.ts
index 7869eab0063..c62be85287f 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit-dialogs/organization-data-ownership-edit-policy-dialog.component.ts
@@ -216,7 +216,7 @@ export class OrganizationDataOwnershipPolicyDialogComponent
   };
 
   static open = (dialogService: DialogService, config: DialogConfig<PolicyEditDialogData>) => {
-    return dialogService.open<PolicyEditDialogResult>(
+    return dialogService.openDrawer<PolicyEditDialogResult, PolicyEditDialogData>(
       OrganizationDataOwnershipPolicyDialogComponent,
       config,
     );
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 97bb46029a7..042eec107d4 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5394,8 +5394,8 @@
   "minimumNumberOfWords": {
     "message": "Minimum number of words"
   },
-  "overridePasswordTypePolicy": {
-    "message": "Password Type",
+  "passwordTypePolicyOverride": {
+    "message": "Password type",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {