diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx
index 227c9827e4e..9d53c88bcf7 100644
--- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx
+++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx
@@ -7,6 +7,7 @@ import last from 'lodash/last'
 import { GET, request } from '@opentrons/api-client'
 import {
   ALIGN_CENTER,
+  ALIGN_END,
   Box,
   Flex,
   JUSTIFY_SPACE_BETWEEN,
@@ -130,6 +131,7 @@ export function Troubleshooting({
         marginLeft={SPACING_AUTO}
         onClick={handleClick}
         id="AdvancedSettings_downloadLogsButton"
+        alignSelf={ALIGN_END}
       >
         {t('download_logs')}
       </TertiaryButton>
diff --git a/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx b/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx
index 9ae9afdcee4..601967eb602 100644
--- a/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx
+++ b/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx
@@ -220,14 +220,15 @@ export function RobotSettingsAdvanced({
             handleUpdateBuildroot(robot)
           }}
         />
+        <Divider marginY={SPACING.spacing16} />
         {isFlex ? (
           <>
-            <Divider marginY={SPACING.spacing16} />
             <FactoryMode
               isRobotBusy={isRobotBusy || isEstopNotDisengaged}
               setShowFactoryModeSlideout={setShowFactoryModeSlideout}
               sn={sn}
             />
+            <Divider marginY={SPACING.spacing16} />
           </>
         ) : null}
         <Troubleshooting robotName={robotName} />