diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgRescaleMultiplier.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgRescaleMultiplier.tsx
index fd88bab662..bc01c9ccf3 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgRescaleMultiplier.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgRescaleMultiplier.tsx
@@ -1,6 +1,7 @@
 import { CompositeNumberInput, CompositeSlider, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { useCallback, useMemo } from 'react';
 import type { UseControllerProps } from 'react-hook-form';
 import { useController } from 'react-hook-form';
@@ -42,11 +43,15 @@ export function DefaultCfgRescaleMultiplier(props: UseControllerProps<DefaultSet
   }, [field.value]);
 
   return (
-    <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramCFGRescaleMultiplier">
-        <FormLabel>{t('parameters.cfgRescaleMultiplier')}</FormLabel>
-      </InformationalPopover>
-      <Flex w="full" gap={1}>
+    <FormControl flexDir="column" gap={2} alignItems="flex-start">
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramCFGRescaleMultiplier">
+          <FormLabel>{t('parameters.cfgRescaleMultiplier')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="vae" />
+      </Flex>
+
+      <Flex w="full" gap={4}>
         <CompositeSlider
           value={value}
           min={sliderMin}
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgScale.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgScale.tsx
index 8e49517eb4..a1bb34868b 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgScale.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultCfgScale.tsx
@@ -1,6 +1,7 @@
 import { CompositeNumberInput, CompositeSlider, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { useCallback, useMemo } from 'react';
 import type { UseControllerProps } from 'react-hook-form';
 import { useController } from 'react-hook-form';
@@ -42,11 +43,15 @@ export function DefaultCfgScale(props: UseControllerProps<DefaultSettingsFormDat
   }, [field.value]);
 
   return (
-    <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramCFGScale">
-        <FormLabel>{t('parameters.cfgScale')}</FormLabel>
-      </InformationalPopover>
-      <Flex w="full" gap={1}>
+    <FormControl flexDir="column" gap={2} alignItems="flex-start">
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramCFGScale">
+          <FormLabel>{t('parameters.cfgScale')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="cfgScale" />
+      </Flex>
+
+      <Flex w="full" gap={4}>
         <CompositeSlider
           value={value}
           min={sliderMin}
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultScheduler.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultScheduler.tsx
index 46b42fd873..d195b2cc38 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultScheduler.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultScheduler.tsx
@@ -1,6 +1,7 @@
 import type { ComboboxOnChange } from '@invoke-ai/ui-library';
-import { Combobox, FormControl, FormLabel } from '@invoke-ai/ui-library';
+import { Combobox, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { SCHEDULER_OPTIONS } from 'features/parameters/types/constants';
 import { isParameterScheduler } from 'features/parameters/types/parameterSchemas';
 import { useCallback, useMemo } from 'react';
@@ -40,10 +41,13 @@ export function DefaultScheduler(props: UseControllerProps<DefaultSettingsFormDa
   }, [field.value]);
 
   return (
-    <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramScheduler">
-        <FormLabel>{t('parameters.scheduler')}</FormLabel>
-      </InformationalPopover>
+    <FormControl flexDir="column" gap={2} alignItems="flex-start">
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramScheduler">
+          <FormLabel>{t('parameters.scheduler')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="scheduler" />
+      </Flex>
       <Combobox isDisabled={isDisabled} value={value} options={SCHEDULER_OPTIONS} onChange={onChange} />
     </FormControl>
   );
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
index 2946473ec4..3c8551a52f 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSettingsForm.tsx
@@ -16,7 +16,6 @@ import { DefaultScheduler } from './DefaultScheduler';
 import { DefaultSteps } from './DefaultSteps';
 import { DefaultVae } from './DefaultVae';
 import { DefaultVaePrecision } from './DefaultVaePrecision';
-import { SettingToggle } from './SettingToggle';
 
 export interface FormField<T> {
   value: T;
@@ -96,7 +95,7 @@ export const DefaultSettingsForm = ({
 
   return (
     <>
-      <Flex gap="2" justifyContent="space-between" w="full" mb={5}>
+      <Flex gap="4" justifyContent="space-between" w="full" pb={4}>
         <Heading fontSize="md">{t('modelManager.defaultSettings')}</Heading>
         <Button
           size="sm"
@@ -114,31 +113,25 @@ export const DefaultSettingsForm = ({
       <Flex flexDir="column" gap={8}>
         <Flex gap={8}>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="vae" />
             <DefaultVae control={control} name="vae" />
           </Flex>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="vaePrecision" />
             <DefaultVaePrecision control={control} name="vaePrecision" />
           </Flex>
         </Flex>
         <Flex gap={8}>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="scheduler" />
             <DefaultScheduler control={control} name="scheduler" />
           </Flex>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="steps" />
             <DefaultSteps control={control} name="steps" />
           </Flex>
         </Flex>
         <Flex gap={8}>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="cfgScale" />
             <DefaultCfgScale control={control} name="cfgScale" />
           </Flex>
           <Flex gap={4} w="full">
-            <SettingToggle control={control} name="cfgRescaleMultiplier" />
             <DefaultCfgRescaleMultiplier control={control} name="cfgRescaleMultiplier" />
           </Flex>
         </Flex>
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSteps.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSteps.tsx
index 4ccef8fd73..37282564b5 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSteps.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultSteps.tsx
@@ -1,6 +1,7 @@
 import { CompositeNumberInput, CompositeSlider, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { useCallback, useMemo } from 'react';
 import type { UseControllerProps } from 'react-hook-form';
 import { useController } from 'react-hook-form';
@@ -42,11 +43,15 @@ export function DefaultSteps(props: UseControllerProps<DefaultSettingsFormData>)
   }, [field.value]);
 
   return (
-    <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramSteps">
-        <FormLabel>{t('parameters.steps')}</FormLabel>
-      </InformationalPopover>
-      <Flex w="full" gap={1}>
+    <FormControl flexDir="column" gap={2} alignItems="flex-start">
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramSteps">
+          <FormLabel>{t('parameters.steps')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="steps" />
+      </Flex>
+
+      <Flex w="full" gap={4}>
         <CompositeSlider
           value={value}
           min={sliderMin}
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVae.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVae.tsx
index b32f17dca1..d00f6b212f 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVae.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVae.tsx
@@ -1,8 +1,9 @@
 import type { ComboboxOnChange } from '@invoke-ai/ui-library';
-import { Combobox, FormControl, FormLabel } from '@invoke-ai/ui-library';
+import { Combobox, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { skipToken } from '@reduxjs/toolkit/query';
 import { useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { map } from 'lodash-es';
 import { useCallback, useMemo } from 'react';
 import type { UseControllerProps } from 'react-hook-form';
@@ -55,10 +56,13 @@ export function DefaultVae(props: UseControllerProps<DefaultSettingsFormData>) {
   }, [field.value]);
 
   return (
-    <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramVAE">
-        <FormLabel>{t('modelManager.vae')}</FormLabel>
-      </InformationalPopover>
+    <FormControl flexDir="column" gap={2} alignItems="flex-start">
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramVAE">
+          <FormLabel>{t('modelManager.vae')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="vae" />
+      </Flex>
       <Combobox isDisabled={isDisabled} value={value} options={compatibleOptions} onChange={onChange} />
     </FormControl>
   );
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVaePrecision.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVaePrecision.tsx
index 240342b446..b5cfe6f81e 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVaePrecision.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/DefaultVaePrecision.tsx
@@ -1,6 +1,7 @@
 import type { ComboboxOnChange } from '@invoke-ai/ui-library';
-import { Combobox, FormControl, FormLabel } from '@invoke-ai/ui-library';
+import { Combobox, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import { SettingToggle } from 'features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle';
 import { isParameterPrecision } from 'features/parameters/types/parameterSchemas';
 import { useCallback, useMemo } from 'react';
 import type { UseControllerProps } from 'react-hook-form';
@@ -42,9 +43,12 @@ export function DefaultVaePrecision(props: UseControllerProps<DefaultSettingsFor
 
   return (
     <FormControl flexDir="column" gap={1} alignItems="flex-start">
-      <InformationalPopover feature="paramVAEPrecision">
-        <FormLabel>{t('modelManager.vaePrecision')}</FormLabel>
-      </InformationalPopover>
+      <Flex justifyContent="space-between" w="full">
+        <InformationalPopover feature="paramVAEPrecision">
+          <FormLabel>{t('modelManager.vaePrecision')}</FormLabel>
+        </InformationalPopover>
+        <SettingToggle control={props.control} name="vaePrecision" />
+      </Flex>
       <Combobox isDisabled={isDisabled} value={value} options={options} onChange={onChange} />
     </FormControl>
   );
diff --git a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle.tsx b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle.tsx
index bcea4959a8..7f5cd8efb9 100644
--- a/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle.tsx
+++ b/invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/DefaultSettings/SettingToggle.tsx
@@ -24,5 +24,5 @@ export function SettingToggle<T>(props: UseControllerProps<DefaultSettingsFormDa
     [field]
   );
 
-  return <Switch isChecked={value} onChange={onChange} />;
+  return <Switch size="sm" isChecked={value} onChange={onChange} />;
 }