diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index 47a5582..28e851d 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -92,7 +92,7 @@
                   </div>
 
                   <!-- Activate username icons -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="showLoginFormIcon" id="usernameIconsCheckBox" value="true">
                       <label class="form-check-label" for="usernameIconsCheckBox" data-i18n="optionsCheckboxUsernameIcons"></label>
@@ -101,7 +101,7 @@
                   </div>
 
                   <!-- Activate password icons -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="usePasswordGeneratorIcons" id="passwordIconsCheckBox" value="true">
                       <label class="form-check-label" for="passwordIconsCheckBox" data-i18n="optionsCheckboxUsePasswordGenerator"></label>
@@ -125,7 +125,7 @@
                   </div>
 
                   <!-- Show notifications -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="showNotifications" id="notificationCheckBox" value="true">
                       <label class="form-check-label" for="notificationCheckBox" data-i18n="optionsCheckboxShowNotifications"></label>
@@ -134,7 +134,7 @@
                   </div>
 
                   <!-- Use monochrome toolbar icons -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="useMonochromeToolbarIcon" id="useMonochromeToolbarIconCheckBox" value="true">
                       <label class="form-check-label" for="useMonochromeToolbarIconCheckBox" data-i18n="optionsCheckboxUseMonochromeToolbarIcon"></label>
@@ -143,7 +143,7 @@
                   </div>
 
                   <!-- Use compact mode -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="useCompactMode" id="useCompactModeCheckBox" value="true">
                       <label class="form-check-label" for="useCompactModeCheckBox" data-i18n="optionsCheckboxUseCompactMode"></label>
@@ -184,7 +184,7 @@
                 <div class="card-body">
 
                   <!-- Automatically retrieve credentials -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoRetrieveCredentials" id="autoRetrieveCredentials" value="true">
                       <label class="form-check-label" for="autoRetrieveCredentials" data-i18n="optionsCheckboxAutoRetrieveCredentials"></label>
@@ -193,7 +193,7 @@
                   </div>
 
                   <!-- Use Autocomplete Menu -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoCompleteUsernames" id="autoCompleteUsernames" value="true">
                       <label class="form-check-label" for="autoCompleteUsernames" data-i18n="optionsCheckboxAutoCompleteUsernames"></label>
@@ -202,7 +202,7 @@
                   </div>
 
                   <!-- Sort credentials by -->
-                  <div class="form-group col-sm-3 pb-2">
+                  <div class="form-group col-sm-4 pb-1">
                     <label for="credentialSorting" class="py-2" data-i18n="optionsCredentialSortSelectionHeader"></label>
                     <select class="form-select form-select-sm col-md-2" id="credentialSorting" data-i18n="[title]optionsCredentialSortSelection">
                       <option value="sortByTitle" data-i18n="optionsSortByTitle"></option>
@@ -213,15 +213,19 @@
                   </div>
 
                   <!-- Credential sorting after fill -->
-                  <div class="form-group col-sm-3 pb-2">
+                  <div class="form-group col-sm-4 pb-1">
                     <label for="afterFillSorting" class="py-2" data-i18n="optionsFillSortPriority"></label>
                     <select class="form-select form-select-sm col-md-2" id="afterFillSorting" data-i18n="[title]optionsFillSortPriority">
                       <option value="sortByMatchingCredentials" data-i18n="optionsFillSortByMatchingCredentials"></option>
                       <option value="sortByRelevantEntry" data-i18n="optionsFillSortByRelevantEntry"></option>
                     </select>
                   </div>
-                  <div>
+                  <div class="pb-1">
                     <span class="form-text text-muted" data-i18n="optionsFillSortPriorityHelpText"></span>
+                  </div>
+
+                  <!-- Automatically fill in relevant credential entries -->
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch mt-2">
                       <input class="form-check-input" type="checkbox" name="autoFillRelevantCredential" id="autoFillRelevantCredential" value="true">
                       <label class="form-check-label" for="autoFillRelevantCredential" data-i18n="optionsCheckboxAutoFillRelevantCredential"></label>
@@ -230,19 +234,19 @@
                   </div>
 
                   <!-- Credential sorting after fill for TOTP -->
-                  <div class="form-group col-sm-3 pb-2">
+                  <div class="form-group col-sm-4 pb-1">
                     <label for="afterFillSortingTotp" class="py-2" data-i18n="optionsFillSortPriorityTotp"></label>
                     <select class="form-select form-select-sm col-md-2" id="afterFillSortingTotp" data-i18n="[title]optionsFillSortPriorityTotp">
                       <option value="sortByMatchingCredentials" data-i18n="optionsFillSortByMatchingCredentials"></option>
                       <option value="sortByRelevantEntry" data-i18n="optionsFillSortByRelevantEntry"></option>
                     </select>
                   </div>
-                  <div>
+                  <div class="pb-1">
                     <span class="form-text text-muted" data-i18n="optionsFillSortPriorityTotpHelpText"></span>
                   </div>
 
                   <!-- Use Auto-Submit -->
-                  <div class="form-group py-2">
+                  <div class="form-group py-2 pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoSubmit" id="autoSubmit" value="true">
                       <label class="form-check-label" for="autoSubmit" data-i18n="optionsCheckboxAutoSubmit"></label>
@@ -251,7 +255,7 @@
                   </div>
 
                   <!-- Automatically fill single-credential entries -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoFillSingleEntry" id="autoFillSingleEntry" value="true">
                       <label class="form-check-label" for="autoFillSingleEntry" data-i18n="optionsCheckboxAutoFillSingleEntry"></label>
@@ -265,7 +269,7 @@
                   </div>
 
                   <!-- Automatically fill single-credential TOTP fields -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoFillSingleTotp" id="autoFillSingleTotp" value="true">
                       <label class="form-check-label" for="autoFillSingleTotp" data-i18n="optionsCheckboxAutoFillSingleTotp"></label>
@@ -274,7 +278,7 @@
                   </div>
 
                   <!-- Autofill HTTP Auth dialogs -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoFillAndSend" id="autoFillAndSend" value="true">
                       <label class="form-check-label" for="autoFillAndSend" data-i18n="optionsCheckboxAutoFillAndSend"></label>
@@ -295,7 +299,7 @@
                 <div class="card-body">
 
                   <!-- Show Credential Banner -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="showLoginNotifications" id="showLoginNotifications" value="true">
                       <label class="form-check-label" for="showLoginNotifications" data-i18n="optionsCheckboxShowLoginNotifications"></label>
@@ -303,7 +307,7 @@
                   </div>
 
                   <!-- Ask where to save credentials -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="defaultGroupAlwaysAsk" id="defaultGroupAlwaysAsk" value="true">
                       <label class="form-check-label" for="defaultGroupAlwaysAsk" data-i18n="optionsLabelDefaultGroupCheckboxText"></label>
@@ -329,7 +333,7 @@
                   </div>
 
                   <!-- Save domain only -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="saveDomainOnlyNewCreds" id="saveDomainOnlyNewCreds" value="true">
                       <label class="form-check-label" for="saveDomainOnlyNewCreds" data-i18n="optionsSaveDomainOnly"></label>
@@ -338,7 +342,7 @@
                   </div>
 
                   <!-- Download favicon to entry after save -->
-                  <div class="form-group" id="downloadFaviconAfterSaveFormGroup">
+                  <div class="form-group pb-1" id="downloadFaviconAfterSaveFormGroup">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="downloadFaviconAfterSave" id="downloadFaviconAfterSave" value="true">
                       <label class="form-check-label" for="downloadFaviconAfterSave" data-i18n="optionsDownloadFaviconAfterSave"></label>
@@ -363,7 +367,7 @@
                 </div>
                 <div class="card-body">
                   <!-- Enable Passkeys -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="passkeys" id="passkeys" value="true" />
                       <label class="form-check-label" for="passkeys" data-i18n="optionsPasskeysEnable"></label>
@@ -372,7 +376,7 @@
                   </div>
 
                   <!-- Enable Passkeys fallback -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="passkeysFallback" id="passkeysFallback" value="true" />
                       <label class="form-check-label" for="passkeysFallback" data-i18n="optionsPasskeysEnableFallback"></label>
@@ -423,7 +427,7 @@
                         <span data-i18n="optionsButtonUpdate"></span>
                       </button>
                     <div class="mt-3">
-                      <div data-i18n="optionsRadioText"></div>
+                      <div class="pb-1" data-i18n="optionsRadioText"></div>
                       <div class="form-check form-check-inline">
                         <input class="form-check-input" type="radio" name="checkUpdateKeePassXC" id="checkUpdateThreeDays">
                         <label class="form-check-label" for="checkUpdateThreeDays"><span data-i18n="optionsRadioThreeDays"></span></label>
@@ -454,7 +458,7 @@
 
                 <!-- Use dynamic input field detection -->
                 <div class="card-body">
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="useObserver" id="useObserver" value="true">
                       <label class="form-check-label" for="useObserver" data-i18n="optionsUseObserver"></label>
@@ -463,7 +467,7 @@
                   </div>
 
                   <!-- Display group name -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="showGroupNameInAutocomplete" id="showGroupNameInAutocomplete" value="true">
                       <label class="form-check-label" for="showGroupNameInAutocomplete" data-i18n="optionsCheckboxShowGroupNameInAutocomplete"></label>
@@ -476,7 +480,7 @@
                   </div>
 
                   <!-- Automatic reconnect -->
-                  <div class="form-group" hidden>
+                  <div class="form-group pb-1" hidden>
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="autoReconnect" id="autoReconnect" value="true">
                       <label class="form-check-label" for="autoReconnect" data-i18n="optionsCheckboxAutomaticReconnect"></label>
@@ -489,7 +493,7 @@
                   </div>
 
                   <!-- Save domain only -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="saveDomainOnly" id="saveDomainOnly" value="true">
                       <label class="form-check-label" for="saveDomainOnly" data-i18n="optionsSaveDomainOnly"></label>
@@ -498,7 +502,7 @@
                   </div>
 
                   <!-- Use predefined sites -->
-                  <div class="form-group">
+                  <div class="form-group pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="usePredefinedSites" id="usePredefinedSites" value="true">
                       <label class="form-check-label" for="usePredefinedSites" data-i18n="optionsUsePredefinedSites"></label>
@@ -510,7 +514,7 @@
                   </div>
 
                   <!-- Clear credential timeout -->
-                  <div class="form-group mt-2">
+                  <div class="form-group mt-2 pb-1">
                     <label for="clearCredentialTimeout" data-i18n="optionsClearCredentialsTimeout"></label>
                     <div class="input-group w-25 mt-2">
                       <input class="form-control form-control-sm" type="number" id="clearCredentialTimeout" min="0" max="3600" required>
@@ -519,7 +523,7 @@
                   </div>
 
                   <!-- Debug logging -->
-                  <div class="form-group mt-2">
+                  <div class="form-group mt-2 pb-1">
                     <div class="form-check form-switch">
                       <input class="form-check-input" type="checkbox" name="debugLogging" id="debugLogging" value="false">
                       <label class="form-check-label" for="debugLogging" data-i18n="optionsDebugLogging"></label>