diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
index 440d722ae..5f3819a2b 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx
@@ -52,15 +52,15 @@ const BackupsDropZone: FunctionComponent<Props> = ({ application }) => {
       void application.alertService.alert(
         `<strong>${decryptedFileItem.name}</strong> has been successfully decrypted and saved to your chosen directory.`,
       )
+      setBinaryFile(undefined)
+      setDecryptedFileItem(undefined)
+      setDroppedFile(undefined)
     } else if (result === 'failed') {
       void application.alertService.alert(
         'Unable to save file to local directory. This may be caused by failure to decrypt, or failure to save the file locally.',
       )
     }
 
-    setBinaryFile(undefined)
-    setDecryptedFileItem(undefined)
-    setDroppedFile(undefined)
     setIsSavingAsDecrypted(false)
   }, [decryptedFileItem, application, binaryFile, fileSystem])
 
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx
index e4aa39118..a9e97eafc 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsDesktop.tsx
@@ -67,7 +67,7 @@ const FileBackupsDesktop = ({ application, backupsService }: Props) => {
 
           {!backupsEnabled && (
             <>
-              <HorizontalSeparator classes="mt-5 mb-4" />
+              <HorizontalSeparator classes="mt-2.5 mb-4" />
               <Text>File backups are not enabled. Enable to choose where your files are backed up.</Text>
             </>
           )}
@@ -90,7 +90,7 @@ const FileBackupsDesktop = ({ application, backupsService }: Props) => {
                   checkmark={false}
                 />
 
-                <div className="flex flex-row mt-5">
+                <div className="flex flex-row mt-2.5">
                   <Button
                     variant="normal"
                     label="Open Backups Location"
diff --git a/app/assets/javascripts/Components/Preferences/Panes/General/Labs.tsx b/app/assets/javascripts/Components/Preferences/Panes/General/Labs.tsx
index a361246bb..93eb66bba 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/General/Labs.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/General/Labs.tsx
@@ -70,7 +70,7 @@ const LabsPane: FunctionComponent<Props> = ({ application }) => {
                   </div>
                   <Switch onChange={toggleFeature} checked={isEnabled} />
                 </div>
-                {showHorizontalSeparator && <HorizontalSeparator classes="mt-5 mb-3" />}
+                {showHorizontalSeparator && <HorizontalSeparator classes="mt-2.5 mb-3" />}
               </Fragment>
             )
           })}
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx b/app/assets/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx
index eaeab7bac..4939197ed 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx
@@ -37,7 +37,7 @@ const ListedAccountItem: FunctionComponent<Props> = ({ account, showSeparator, a
           </>
         )}
       </div>
-      {showSeparator && <HorizontalSeparator classes="mt-5 mb-3" />}
+      {showSeparator && <HorizontalSeparator classes="mt-2.5 mb-3" />}
     </>
   )
 }
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Security/ErroredItems.tsx b/app/assets/javascripts/Components/Preferences/Panes/Security/ErroredItems.tsx
index 7298d0c99..8815a0468 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Security/ErroredItems.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Security/ErroredItems.tsx
@@ -87,7 +87,7 @@ const ErroredItems: FunctionComponent<Props> = ({ viewControllerManager }: Props
             }}
           />
         </div>
-        <HorizontalSeparator classes="mt-5 mb-3" />
+        <HorizontalSeparator classes="mt-2.5 mb-3" />
 
         {erroredItems.map((item, index) => {
           return (
@@ -128,7 +128,7 @@ const ErroredItems: FunctionComponent<Props> = ({ viewControllerManager }: Props
                   </div>
                 </div>
               </div>
-              {index < erroredItems.length - 1 && <HorizontalSeparator classes="mt-5 mb-3" />}
+              {index < erroredItems.length - 1 && <HorizontalSeparator classes="mt-2.5 mb-3" />}
             </Fragment>
           )
         })}