diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 3ee0d1b73d..c65535e2e5 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -3881,7 +3881,7 @@
     "message": "Authenticator key"
   },
   "autofillOptions": {
-    "message": "Auto-fill options"
+    "message": "Autofill options"
   },
   "websiteUri": {
     "message": "Website (URI)"
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 5733b6cb02..37e88fab02 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -52,7 +52,7 @@
     "message": "Authenticator key"
   },
   "autofillOptions": {
-    "message": "Auto-fill options"
+    "message": "Autofill options"
   },
   "websiteUri": {
     "message": "Website (URI)"
diff --git a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
index 6c651527c1..6f7dd35be9 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.html
@@ -1,6 +1,6 @@
 <bit-section [formGroup]="autofillOptionsForm">
   <bit-section-header>
-    <h2 bitTypography="h5">
+    <h2 bitTypography="h6">
       {{ "autofillOptions" | i18n }}
     </h2>
   </bit-section-header>
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
index c9650eb553..a55716083d 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
@@ -1,5 +1,5 @@
 <ng-container [formGroup]="uriForm">
-  <bit-form-field>
+  <bit-form-field [class.!tw-mb-1]="showMatchDetection">
     <bit-label>{{ uriLabel }}</bit-label>
     <input bitInput formControlName="uri" #uriInput />
     <button
@@ -22,7 +22,7 @@
     ></button>
   </bit-form-field>
 
-  <bit-form-field *ngIf="showMatchDetection" class="!tw-mb-9 -tw-mt-4">
+  <bit-form-field *ngIf="showMatchDetection" class="!tw-mb-5">
     <bit-label>{{ "matchDetection" | i18n }}</bit-label>
     <bit-select formControlName="matchDetection" #matchDetectionSelect>
       <bit-option