diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
index 9f162cb25e..3b14ee37d2 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
@@ -8,7 +8,10 @@
       <bit-label>{{ "notes" | i18n }}</bit-label>
       <textarea bitInput formControlName="notes"></textarea>
     </bit-form-field>
-    <bit-form-control *ngIf="passwordRepromptEnabled$ | async">
+    <bit-form-control
+      *ngIf="passwordRepromptEnabled$ | async"
+      [disableMargin]="hasCustomFields || isPartialEdit"
+    >
       <input type="checkbox" bitCheckbox formControlName="reprompt" />
       <bit-label>{{ "passwordPrompt" | i18n }}</bit-label>
     </bit-form-control>
diff --git a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.html b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.html
index eacdae7f28..9464ad9676 100644
--- a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.html
@@ -51,7 +51,7 @@
       </bit-form-field>
     </div>
 
-    <bit-form-field>
+    <bit-form-field disableMargin>
       <bit-label>{{ "securityCode" | i18n }}</bit-label>
       <input id="cardCode" bitInput formControlName="code" type="password" />
       <button
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index b634bb322d..368ba649cb 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -12,7 +12,7 @@
       <div
         *ngFor="let field of fields.controls; let i = index"
         [formGroupName]="i"
-        class="tw-flex tw-p-3 -tw-mx-3 tw-gap-4 tw-bg-background tw-rounded-lg first:-tw-mt-3 last-of-type:tw-mb-3"
+        class="tw-flex tw-p-3 -tw-mx-3 tw-gap-4 tw-bg-background tw-rounded-lg first:-tw-mt-3 last-of-type:tw-mb-0"
         [ngClass]="{
           'tw-items-center': field.value.type === FieldType.Boolean,
         }"
diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.html b/libs/vault/src/cipher-form/components/identity/identity.component.html
index bd21aeef3c..b3b7f5bb55 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.html
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.html
@@ -41,7 +41,7 @@
         </bit-label>
         <input bitInput formControlName="username" />
       </bit-form-field>
-      <bit-form-field>
+      <bit-form-field disableMargin>
         <bit-label>
           {{ "company" | i18n }}
         </bit-label>
@@ -80,7 +80,7 @@
           data-testid="visibility-for-passport-number"
         ></button>
       </bit-form-field>
-      <bit-form-field>
+      <bit-form-field disableMargin>
         <bit-label>
           {{ "licenseNumber" | i18n }}
         </bit-label>
@@ -99,7 +99,7 @@
         </bit-label>
         <input bitInput formControlName="email" />
       </bit-form-field>
-      <bit-form-field>
+      <bit-form-field disableMargin>
         <bit-label>
           {{ "phone" | i18n }}
         </bit-label>
@@ -148,7 +148,7 @@
         </bit-label>
         <input bitInput formControlName="postalCode" />
       </bit-form-field>
-      <bit-form-field>
+      <bit-form-field disableMargin>
         <bit-label>
           {{ "country" | i18n }}
         </bit-label>
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
index 05286eaaa3..0d79d4c250 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
@@ -18,7 +18,11 @@
       <input bitInput formControlName="name" />
     </bit-form-field>
     <div class="tw-flex tw-flex-wrap tw-gap-1">
-      <bit-form-field class="tw-flex-1" *ngIf="showOwnership">
+      <bit-form-field
+        class="tw-flex-1"
+        *ngIf="showOwnership"
+        [disableMargin]="!showCollectionsControl"
+      >
         <bit-label>{{ "owner" | i18n }}</bit-label>
         <bit-select formControlName="organizationId">
           <bit-option
@@ -33,7 +37,7 @@
           ></bit-option>
         </bit-select>
       </bit-form-field>
-      <bit-form-field class="tw-flex-1">
+      <bit-form-field class="tw-flex-1" [disableMargin]="!showCollectionsControl">
         <bit-label>{{ "folder" | i18n }}</bit-label>
         <bit-select formControlName="folderId">
           <bit-option
@@ -45,7 +49,7 @@
       </bit-form-field>
     </div>
     <ng-container *ngIf="showCollectionsControl">
-      <bit-form-field class="tw-w-full">
+      <bit-form-field class="tw-w-full" disableMargin>
         <bit-label>{{ "collections" | i18n }}</bit-label>
         <bit-multi-select
           class="tw-w-full"
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index 09327a145f..c6218d4189 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -74,7 +74,7 @@
       ></button>
     </bit-form-field>
 
-    <bit-form-field>
+    <bit-form-field disableMargin>
       <bit-label>
         {{ "authenticatorKey" | i18n }}
         <button