diff --git a/.github/workflows/bundlesize-compare.yml b/.github/workflows/bundlesize-compare.yml
index eb0b4aa7da..ab6d91f0b0 100644
--- a/.github/workflows/bundlesize-compare.yml
+++ b/.github/workflows/bundlesize-compare.yml
@@ -18,8 +18,6 @@ jobs:
       ANALYZE_BUNDLE_SIZE: '1'
     steps:
       - uses: actions/checkout@v5
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
diff --git a/app/javascript/flavours/glitch/components/form_fields/checkbox.module.scss b/app/javascript/flavours/glitch/components/form_fields/checkbox.module.scss
new file mode 100644
index 0000000000..36f029a17b
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/form_fields/checkbox.module.scss
@@ -0,0 +1,70 @@
+.checkbox {
+  --size: 16px;
+
+  appearance: none;
+  box-sizing: border-box;
+  position: relative;
+  display: inline-flex;
+  margin: 0;
+  width: var(--size);
+  height: var(--size);
+  vertical-align: top;
+  border-radius: calc(var(--size) / 4);
+  border: 1px solid var(--color-border-primary);
+  background-color: var(--color-bg-primary);
+  transition: 0.15s ease-out;
+  transition-property: background-color, border-color;
+  cursor: pointer;
+
+  @supports not (appearance: none) {
+    accent-color: var(--color-bg-brand-base);
+  }
+
+  &:disabled {
+    background: var(--color-bg-secondary);
+    cursor: not-allowed;
+  }
+
+  /* Tick icon */
+  &::before {
+    content: '';
+    opacity: 0;
+    background-color: var(--color-text-on-brand-base);
+    display: block;
+    margin: auto;
+    width: calc(var(--size) * 0.625);
+    height: calc(var(--size) * 0.5);
+    mask-image: url("data:image/svg+xml;utf8,<svg width='10' height='8' viewBox='0 0 10 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M8.29289 0.292893C8.68342 -0.0976311 9.31643 -0.0976311 9.70696 0.292893C10.0975 0.683418 10.0975 1.31643 9.70696 1.70696L4.20696 7.20696C3.81643 7.59748 3.18342 7.59748 2.79289 7.20696L0.292893 4.70696C-0.0976311 4.31643 -0.0976311 3.68342 0.292893 3.29289C0.683418 2.90237 1.31643 2.90237 1.70696 3.29289L3.49992 5.08586L8.29289 0.292893Z' fill='black'/></svg>");
+    mask-position: center;
+    mask-size: 100%;
+    mask-repeat: no-repeat;
+  }
+
+  /* 'Minus' icon */
+  &:indeterminate::before {
+    width: calc(var(--size) * 0.5);
+    height: calc(var(--size) * 0.125);
+    mask-image: url("data:image/svg+xml;utf8,<svg width='8' height='2' viewBox='0 0 8 2' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M7.11111 0C7.60203 0 8 0.447715 8 1C8 1.55228 7.60203 2 7.11111 2H0.888889C0.397969 2 0 1.55228 0 1C0 0.447715 0.397969 0 0.888889 0H7.11111Z' fill='black'/></svg>");
+  }
+
+  &:checked,
+  &:indeterminate {
+    background-color: var(--color-bg-brand-base);
+    border-color: var(--color-bg-brand-base);
+
+    &:disabled {
+      border-color: var(--color-bg-disabled);
+      background: var(--color-bg-disabled);
+      color: var(--color-text-on-disabled);
+    }
+
+    &::before {
+      opacity: 1;
+    }
+  }
+
+  &:focus-visible {
+    outline: var(--outline-focus-default);
+    outline-offset: 2px;
+  }
+}
diff --git a/app/javascript/flavours/glitch/components/form_fields/checkbox_field.stories.tsx b/app/javascript/flavours/glitch/components/form_fields/checkbox_field.stories.tsx
new file mode 100644
index 0000000000..3f73143ba6
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/form_fields/checkbox_field.stories.tsx
@@ -0,0 +1,87 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { Checkbox, CheckboxField } from './checkbox_field';
+
+const meta = {
+  title: 'Components/Form Fields/CheckboxField',
+  component: CheckboxField,
+  args: {
+    label: 'Label',
+    hint: 'This is a description of this form field',
+    disabled: false,
+  },
+  argTypes: {
+    size: {
+      control: { type: 'range', min: 10, max: 64, step: 1 },
+    },
+  },
+} satisfies Meta<typeof CheckboxField>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Simple: Story = {};
+
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
+export const Required: Story = {
+  args: {
+    required: true,
+  },
+};
+
+export const Optional: Story = {
+  args: {
+    required: false,
+  },
+};
+
+export const WithError: Story = {
+  args: {
+    required: false,
+    hasError: true,
+  },
+};
+
+export const DisabledChecked: Story = {
+  args: {
+    disabled: true,
+    checked: true,
+  },
+};
+
+export const DisabledUnchecked: Story = {
+  args: {
+    disabled: true,
+    checked: false,
+  },
+};
+
+export const Indeterminate: Story = {
+  args: {
+    indeterminate: true,
+  },
+};
+
+export const Plain: Story = {
+  render(props) {
+    return <Checkbox {...props} />;
+  },
+};
+
+export const Small: Story = {
+  args: {
+    size: 14,
+  },
+};
+
+export const Large: Story = {
+  args: {
+    size: 64,
+  },
+};
diff --git a/app/javascript/flavours/glitch/components/form_fields/checkbox_field.tsx b/app/javascript/flavours/glitch/components/form_fields/checkbox_field.tsx
new file mode 100644
index 0000000000..2b6933c847
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/form_fields/checkbox_field.tsx
@@ -0,0 +1,65 @@
+import type { ComponentPropsWithoutRef, CSSProperties } from 'react';
+import { forwardRef, useCallback, useEffect, useRef } from 'react';
+
+import classes from './checkbox.module.scss';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+
+type Props = Omit<ComponentPropsWithoutRef<'input'>, 'type'> & {
+  size?: number;
+  indeterminate?: boolean;
+};
+
+export const CheckboxField = forwardRef<
+  HTMLInputElement,
+  Props & CommonFieldWrapperProps
+>(({ id, label, hint, hasError, required, ...otherProps }, ref) => (
+  <FormFieldWrapper
+    label={label}
+    hint={hint}
+    required={required}
+    hasError={hasError}
+    inputId={id}
+    inputPlacement='inline-start'
+  >
+    {(inputProps) => <Checkbox {...otherProps} {...inputProps} ref={ref} />}
+  </FormFieldWrapper>
+));
+
+CheckboxField.displayName = 'CheckboxField';
+
+export const Checkbox = forwardRef<HTMLInputElement, Props>(
+  ({ className, size, indeterminate, ...otherProps }, ref) => {
+    const inputRef = useRef<HTMLInputElement | null>(null);
+
+    const handleRef = useCallback(
+      (element: HTMLInputElement | null) => {
+        inputRef.current = element;
+        if (typeof ref === 'function') {
+          ref(element);
+        } else if (ref) {
+          ref.current = element;
+        }
+      },
+      [ref],
+    );
+
+    useEffect(() => {
+      if (inputRef.current) {
+        inputRef.current.indeterminate = indeterminate || false;
+      }
+    }, [indeterminate]);
+
+    return (
+      <input
+        {...otherProps}
+        type='checkbox'
+        className={classes.checkbox}
+        style={size ? ({ '--size': `${size}px` } as CSSProperties) : undefined}
+        ref={handleRef}
+      />
+    );
+  },
+);
+
+Checkbox.displayName = 'Checkbox';
diff --git a/app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.module.scss b/app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.module.scss
new file mode 100644
index 0000000000..3625b107c7
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.module.scss
@@ -0,0 +1,44 @@
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  color: var(--color-text-primary);
+  font-size: 15px;
+
+  &[data-input-placement^='inline'] {
+    flex-direction: row;
+    gap: 8px;
+  }
+
+  &[data-input-placement='inline-start'] {
+    align-items: start;
+  }
+
+  &[data-input-placement='inline-end'] {
+    align-items: center;
+  }
+}
+
+.labelWrapper {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  gap: 4px;
+}
+
+.label {
+  font-weight: 500;
+
+  [data-has-error='true'] & {
+    color: var(--color-text-error);
+  }
+}
+
+.hint {
+  color: var(--color-text-secondary);
+  font-size: 13px;
+}
+
+.inputWrapper {
+  display: block;
+}
diff --git a/app/javascript/flavours/glitch/components/form_fields/wrapper.tsx b/app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.tsx
similarity index 76%
rename from app/javascript/flavours/glitch/components/form_fields/wrapper.tsx
rename to app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.tsx
index afec04b9f5..18a877e4bd 100644
--- a/app/javascript/flavours/glitch/components/form_fields/wrapper.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/form_field_wrapper.tsx
@@ -5,7 +5,7 @@ import { useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
+import classes from './form_field_wrapper.module.scss';
 
 interface InputProps {
   id: string;
@@ -19,6 +19,7 @@ interface FieldWrapperProps {
   required?: boolean;
   hasError?: boolean;
   inputId?: string;
+  inputPlacement?: 'inline-start' | 'inline-end';
   children: (inputProps: InputProps) => ReactNode;
 }
 
@@ -42,6 +43,7 @@ export const FormFieldWrapper: FC<FieldWrapperProps> = ({
   hint,
   required,
   hasError,
+  inputPlacement,
   children,
 }) => {
   const uniqueId = useId();
@@ -57,26 +59,32 @@ export const FormFieldWrapper: FC<FieldWrapperProps> = ({
     inputProps['aria-describedby'] = hintId;
   }
 
+  const input = (
+    <div className={classes.inputWrapper}>{children(inputProps)}</div>
+  );
+
   return (
     <div
-      className={classNames('input with_block_label', {
-        field_with_errors: hasError,
-      })}
+      className={classes.wrapper}
+      data-has-error={hasError}
+      data-input-placement={inputPlacement}
     >
-      <div className='label_input'>
-        <label htmlFor={inputId}>
+      {inputPlacement === 'inline-start' && input}
+
+      <div className={classes.labelWrapper}>
+        <label htmlFor={inputId} className={classes.label}>
           {label}
           {required !== undefined && <RequiredMark required={required} />}
         </label>
 
         {hasHint && (
-          <span className='hint' id={hintId}>
+          <span className={classes.hint} id={hintId}>
             {hint}
           </span>
         )}
-
-        <div className='label_input__wrapper'>{children(inputProps)}</div>
       </div>
+
+      {inputPlacement !== 'inline-start' && input}
     </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/components/form_fields/index.ts b/app/javascript/flavours/glitch/components/form_fields/index.ts
index 8100d56049..8dd693d51e 100644
--- a/app/javascript/flavours/glitch/components/form_fields/index.ts
+++ b/app/javascript/flavours/glitch/components/form_fields/index.ts
@@ -1,4 +1,5 @@
 export { TextInputField } from './text_input_field';
 export { TextAreaField } from './text_area_field';
-export { ToggleField, PlainToggleField } from './toggle_field';
+export { CheckboxField, Checkbox } from './checkbox_field';
+export { ToggleField, Toggle } from './toggle_field';
 export { SelectField } from './select_field';
diff --git a/app/javascript/flavours/glitch/components/form_fields/select_field.stories.tsx b/app/javascript/flavours/glitch/components/form_fields/select_field.stories.tsx
index 30897adda1..762436fe28 100644
--- a/app/javascript/flavours/glitch/components/form_fields/select_field.stories.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/select_field.stories.tsx
@@ -35,6 +35,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/flavours/glitch/components/form_fields/select_field.tsx b/app/javascript/flavours/glitch/components/form_fields/select_field.tsx
index aa058fc782..e612a215b5 100644
--- a/app/javascript/flavours/glitch/components/form_fields/select_field.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/select_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'select'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/flavours/glitch/components/form_fields/text_area_field.stories.tsx b/app/javascript/flavours/glitch/components/form_fields/text_area_field.stories.tsx
index f06a8a223a..f4b8440916 100644
--- a/app/javascript/flavours/glitch/components/form_fields/text_area_field.stories.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/text_area_field.stories.tsx
@@ -25,6 +25,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/flavours/glitch/components/form_fields/text_area_field.tsx b/app/javascript/flavours/glitch/components/form_fields/text_area_field.tsx
index bfd5ce8a41..fd514a88e2 100644
--- a/app/javascript/flavours/glitch/components/form_fields/text_area_field.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/text_area_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'textarea'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/flavours/glitch/components/form_fields/text_input_field.stories.tsx b/app/javascript/flavours/glitch/components/form_fields/text_input_field.stories.tsx
index e1ee57fdf5..ec00ef5fd3 100644
--- a/app/javascript/flavours/glitch/components/form_fields/text_input_field.stories.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/text_input_field.stories.tsx
@@ -25,6 +25,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/flavours/glitch/components/form_fields/text_input_field.tsx b/app/javascript/flavours/glitch/components/form_fields/text_input_field.tsx
index 3baafbc57c..3b2d941173 100644
--- a/app/javascript/flavours/glitch/components/form_fields/text_input_field.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/text_input_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'input'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/flavours/glitch/components/form_fields/toggle_field.stories.tsx b/app/javascript/flavours/glitch/components/form_fields/toggle_field.stories.tsx
index 260ba4131f..924c18aa74 100644
--- a/app/javascript/flavours/glitch/components/form_fields/toggle_field.stories.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/toggle_field.stories.tsx
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 
-import { PlainToggleField, ToggleField } from './toggle_field';
+import { Toggle, ToggleField } from './toggle_field';
 
 const meta = {
   title: 'Components/Form Fields/ToggleField',
@@ -16,14 +16,6 @@ const meta = {
       control: { type: 'range', min: 10, max: 40, step: 1 },
     },
   },
-  render(args) {
-    // Component styles require a wrapper class at the moment
-    return (
-      <div className='simple_form'>
-        <ToggleField {...args} />
-      </div>
-    );
-  },
 } satisfies Meta<typeof ToggleField>;
 
 export default meta;
@@ -32,6 +24,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
@@ -60,7 +58,7 @@ export const Disabled: Story = {
 
 export const Plain: Story = {
   render(props) {
-    return <PlainToggleField {...props} />;
+    return <Toggle {...props} />;
   },
 };
 
diff --git a/app/javascript/flavours/glitch/components/form_fields/toggle_field.tsx b/app/javascript/flavours/glitch/components/form_fields/toggle_field.tsx
index e14bb54ad1..6cafbcdc36 100644
--- a/app/javascript/flavours/glitch/components/form_fields/toggle_field.tsx
+++ b/app/javascript/flavours/glitch/components/form_fields/toggle_field.tsx
@@ -3,9 +3,9 @@ import { forwardRef } from 'react';
 
 import classNames from 'classnames';
 
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
 import classes from './toggle.module.css';
-import type { CommonFieldWrapperProps } from './wrapper';
-import { FormFieldWrapper } from './wrapper';
 
 type Props = Omit<ComponentPropsWithoutRef<'input'>, 'type'> & {
   size?: number;
@@ -21,16 +21,15 @@ export const ToggleField = forwardRef<
     required={required}
     hasError={hasError}
     inputId={id}
+    inputPlacement='inline-end'
   >
-    {(inputProps) => (
-      <PlainToggleField {...otherProps} {...inputProps} ref={ref} />
-    )}
+    {(inputProps) => <Toggle {...otherProps} {...inputProps} ref={ref} />}
   </FormFieldWrapper>
 ));
 
 ToggleField.displayName = 'ToggleField';
 
-export const PlainToggleField = forwardRef<HTMLInputElement, Props>(
+export const Toggle = forwardRef<HTMLInputElement, Props>(
   ({ className, size, ...otherProps }, ref) => (
     <span className={classes.wrapper}>
       <input
@@ -49,4 +48,4 @@ export const PlainToggleField = forwardRef<HTMLInputElement, Props>(
     </span>
   ),
 );
-PlainToggleField.displayName = 'PlainToggleField';
+Toggle.displayName = 'Toggle';
diff --git a/app/javascript/flavours/glitch/features/account_timeline/v2/filters.tsx b/app/javascript/flavours/glitch/features/account_timeline/v2/filters.tsx
index 5d1e0af552..ed8f102275 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/v2/filters.tsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/v2/filters.tsx
@@ -7,7 +7,7 @@ import { useParams } from 'react-router';
 
 import Overlay from 'react-overlays/esm/Overlay';
 
-import { PlainToggleField } from '@/flavours/glitch/components/form_fields/toggle_field';
+import { Toggle } from '@/flavours/glitch/components/form_fields';
 import { Icon } from '@/flavours/glitch/components/icon';
 import KeyboardArrowDownIcon from '@/material-icons/400-24px/keyboard_arrow_down.svg?react';
 
@@ -119,7 +119,7 @@ const FilterDropdown: FC = () => {
                 defaultMessage='Show replies'
               />
             </label>
-            <PlainToggleField
+            <Toggle
               name='replies'
               checked={replies}
               onChange={handleChange}
@@ -132,7 +132,7 @@ const FilterDropdown: FC = () => {
                 defaultMessage='Show boosts'
               />
             </label>
-            <PlainToggleField
+            <Toggle
               name='boosts'
               checked={boosts}
               onChange={handleChange}
diff --git a/app/javascript/flavours/glitch/features/collections/editor.tsx b/app/javascript/flavours/glitch/features/collections/editor.tsx
index 15c78e6a56..7cf704b265 100644
--- a/app/javascript/flavours/glitch/features/collections/editor.tsx
+++ b/app/javascript/flavours/glitch/features/collections/editor.tsx
@@ -17,8 +17,8 @@ import { Button } from 'flavours/glitch/components/button';
 import { Column } from 'flavours/glitch/components/column';
 import { ColumnHeader } from 'flavours/glitch/components/column_header';
 import {
+  CheckboxField,
   TextAreaField,
-  ToggleField,
 } from 'flavours/glitch/components/form_fields';
 import { TextInputField } from 'flavours/glitch/components/form_fields/text_input_field';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
@@ -197,7 +197,7 @@ const CollectionSettings: React.FC<{
       </div>
 
       <div className='fields-group'>
-        <ToggleField
+        <CheckboxField
           label={
             <FormattedMessage
               id='collections.mark_as_sensitive'
diff --git a/app/javascript/flavours/glitch/styles/mastodon/forms.scss b/app/javascript/flavours/glitch/styles/mastodon/forms.scss
index 71d94a4609..09a5f9721e 100644
--- a/app/javascript/flavours/glitch/styles/mastodon/forms.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon/forms.scss
@@ -550,8 +550,8 @@ code {
   input[type='email'],
   input[type='password'],
   input[type='datetime-local'] {
-    &:focus:invalid:not(:placeholder-shown),
-    &:required:invalid:not(:placeholder-shown) {
+    &:focus:user-invalid:not(:placeholder-shown),
+    &:required:user-invalid:not(:placeholder-shown) {
       border-color: var(--color-text-error);
     }
   }
@@ -561,16 +561,6 @@ code {
       color: var(--color-text-error);
     }
 
-    input[type='text'],
-    input[type='number'],
-    input[type='email'],
-    input[type='password'],
-    input[type='datetime-local'],
-    textarea,
-    select {
-      border-color: var(--color-text-error);
-    }
-
     .error {
       display: block;
       font-weight: 500;
@@ -733,9 +723,23 @@ code {
   }
 }
 
+.simple_form .input.field_with_errors,
+[data-has-error='true'] {
+  input[type='text'],
+  input[type='number'],
+  input[type='email'],
+  input[type='password'],
+  input[type='datetime-local'],
+  textarea,
+  select {
+    border-color: var(--color-text-error);
+  }
+}
+
 /* Double-chevron icon for custom select components */
 .select-wrapper,
 .select .label_input__wrapper {
+  position: relative;
   width: 100%;
 
   &::after {
diff --git a/app/javascript/mastodon/components/form_fields/checkbox.module.scss b/app/javascript/mastodon/components/form_fields/checkbox.module.scss
new file mode 100644
index 0000000000..36f029a17b
--- /dev/null
+++ b/app/javascript/mastodon/components/form_fields/checkbox.module.scss
@@ -0,0 +1,70 @@
+.checkbox {
+  --size: 16px;
+
+  appearance: none;
+  box-sizing: border-box;
+  position: relative;
+  display: inline-flex;
+  margin: 0;
+  width: var(--size);
+  height: var(--size);
+  vertical-align: top;
+  border-radius: calc(var(--size) / 4);
+  border: 1px solid var(--color-border-primary);
+  background-color: var(--color-bg-primary);
+  transition: 0.15s ease-out;
+  transition-property: background-color, border-color;
+  cursor: pointer;
+
+  @supports not (appearance: none) {
+    accent-color: var(--color-bg-brand-base);
+  }
+
+  &:disabled {
+    background: var(--color-bg-secondary);
+    cursor: not-allowed;
+  }
+
+  /* Tick icon */
+  &::before {
+    content: '';
+    opacity: 0;
+    background-color: var(--color-text-on-brand-base);
+    display: block;
+    margin: auto;
+    width: calc(var(--size) * 0.625);
+    height: calc(var(--size) * 0.5);
+    mask-image: url("data:image/svg+xml;utf8,<svg width='10' height='8' viewBox='0 0 10 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M8.29289 0.292893C8.68342 -0.0976311 9.31643 -0.0976311 9.70696 0.292893C10.0975 0.683418 10.0975 1.31643 9.70696 1.70696L4.20696 7.20696C3.81643 7.59748 3.18342 7.59748 2.79289 7.20696L0.292893 4.70696C-0.0976311 4.31643 -0.0976311 3.68342 0.292893 3.29289C0.683418 2.90237 1.31643 2.90237 1.70696 3.29289L3.49992 5.08586L8.29289 0.292893Z' fill='black'/></svg>");
+    mask-position: center;
+    mask-size: 100%;
+    mask-repeat: no-repeat;
+  }
+
+  /* 'Minus' icon */
+  &:indeterminate::before {
+    width: calc(var(--size) * 0.5);
+    height: calc(var(--size) * 0.125);
+    mask-image: url("data:image/svg+xml;utf8,<svg width='8' height='2' viewBox='0 0 8 2' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M7.11111 0C7.60203 0 8 0.447715 8 1C8 1.55228 7.60203 2 7.11111 2H0.888889C0.397969 2 0 1.55228 0 1C0 0.447715 0.397969 0 0.888889 0H7.11111Z' fill='black'/></svg>");
+  }
+
+  &:checked,
+  &:indeterminate {
+    background-color: var(--color-bg-brand-base);
+    border-color: var(--color-bg-brand-base);
+
+    &:disabled {
+      border-color: var(--color-bg-disabled);
+      background: var(--color-bg-disabled);
+      color: var(--color-text-on-disabled);
+    }
+
+    &::before {
+      opacity: 1;
+    }
+  }
+
+  &:focus-visible {
+    outline: var(--outline-focus-default);
+    outline-offset: 2px;
+  }
+}
diff --git a/app/javascript/mastodon/components/form_fields/checkbox_field.stories.tsx b/app/javascript/mastodon/components/form_fields/checkbox_field.stories.tsx
new file mode 100644
index 0000000000..3f73143ba6
--- /dev/null
+++ b/app/javascript/mastodon/components/form_fields/checkbox_field.stories.tsx
@@ -0,0 +1,87 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { Checkbox, CheckboxField } from './checkbox_field';
+
+const meta = {
+  title: 'Components/Form Fields/CheckboxField',
+  component: CheckboxField,
+  args: {
+    label: 'Label',
+    hint: 'This is a description of this form field',
+    disabled: false,
+  },
+  argTypes: {
+    size: {
+      control: { type: 'range', min: 10, max: 64, step: 1 },
+    },
+  },
+} satisfies Meta<typeof CheckboxField>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Simple: Story = {};
+
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
+export const Required: Story = {
+  args: {
+    required: true,
+  },
+};
+
+export const Optional: Story = {
+  args: {
+    required: false,
+  },
+};
+
+export const WithError: Story = {
+  args: {
+    required: false,
+    hasError: true,
+  },
+};
+
+export const DisabledChecked: Story = {
+  args: {
+    disabled: true,
+    checked: true,
+  },
+};
+
+export const DisabledUnchecked: Story = {
+  args: {
+    disabled: true,
+    checked: false,
+  },
+};
+
+export const Indeterminate: Story = {
+  args: {
+    indeterminate: true,
+  },
+};
+
+export const Plain: Story = {
+  render(props) {
+    return <Checkbox {...props} />;
+  },
+};
+
+export const Small: Story = {
+  args: {
+    size: 14,
+  },
+};
+
+export const Large: Story = {
+  args: {
+    size: 64,
+  },
+};
diff --git a/app/javascript/mastodon/components/form_fields/checkbox_field.tsx b/app/javascript/mastodon/components/form_fields/checkbox_field.tsx
new file mode 100644
index 0000000000..2b6933c847
--- /dev/null
+++ b/app/javascript/mastodon/components/form_fields/checkbox_field.tsx
@@ -0,0 +1,65 @@
+import type { ComponentPropsWithoutRef, CSSProperties } from 'react';
+import { forwardRef, useCallback, useEffect, useRef } from 'react';
+
+import classes from './checkbox.module.scss';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+
+type Props = Omit<ComponentPropsWithoutRef<'input'>, 'type'> & {
+  size?: number;
+  indeterminate?: boolean;
+};
+
+export const CheckboxField = forwardRef<
+  HTMLInputElement,
+  Props & CommonFieldWrapperProps
+>(({ id, label, hint, hasError, required, ...otherProps }, ref) => (
+  <FormFieldWrapper
+    label={label}
+    hint={hint}
+    required={required}
+    hasError={hasError}
+    inputId={id}
+    inputPlacement='inline-start'
+  >
+    {(inputProps) => <Checkbox {...otherProps} {...inputProps} ref={ref} />}
+  </FormFieldWrapper>
+));
+
+CheckboxField.displayName = 'CheckboxField';
+
+export const Checkbox = forwardRef<HTMLInputElement, Props>(
+  ({ className, size, indeterminate, ...otherProps }, ref) => {
+    const inputRef = useRef<HTMLInputElement | null>(null);
+
+    const handleRef = useCallback(
+      (element: HTMLInputElement | null) => {
+        inputRef.current = element;
+        if (typeof ref === 'function') {
+          ref(element);
+        } else if (ref) {
+          ref.current = element;
+        }
+      },
+      [ref],
+    );
+
+    useEffect(() => {
+      if (inputRef.current) {
+        inputRef.current.indeterminate = indeterminate || false;
+      }
+    }, [indeterminate]);
+
+    return (
+      <input
+        {...otherProps}
+        type='checkbox'
+        className={classes.checkbox}
+        style={size ? ({ '--size': `${size}px` } as CSSProperties) : undefined}
+        ref={handleRef}
+      />
+    );
+  },
+);
+
+Checkbox.displayName = 'Checkbox';
diff --git a/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss b/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss
new file mode 100644
index 0000000000..3625b107c7
--- /dev/null
+++ b/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss
@@ -0,0 +1,44 @@
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  color: var(--color-text-primary);
+  font-size: 15px;
+
+  &[data-input-placement^='inline'] {
+    flex-direction: row;
+    gap: 8px;
+  }
+
+  &[data-input-placement='inline-start'] {
+    align-items: start;
+  }
+
+  &[data-input-placement='inline-end'] {
+    align-items: center;
+  }
+}
+
+.labelWrapper {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  gap: 4px;
+}
+
+.label {
+  font-weight: 500;
+
+  [data-has-error='true'] & {
+    color: var(--color-text-error);
+  }
+}
+
+.hint {
+  color: var(--color-text-secondary);
+  font-size: 13px;
+}
+
+.inputWrapper {
+  display: block;
+}
diff --git a/app/javascript/mastodon/components/form_fields/wrapper.tsx b/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
similarity index 76%
rename from app/javascript/mastodon/components/form_fields/wrapper.tsx
rename to app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
index afec04b9f5..18a877e4bd 100644
--- a/app/javascript/mastodon/components/form_fields/wrapper.tsx
+++ b/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
@@ -5,7 +5,7 @@ import { useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
+import classes from './form_field_wrapper.module.scss';
 
 interface InputProps {
   id: string;
@@ -19,6 +19,7 @@ interface FieldWrapperProps {
   required?: boolean;
   hasError?: boolean;
   inputId?: string;
+  inputPlacement?: 'inline-start' | 'inline-end';
   children: (inputProps: InputProps) => ReactNode;
 }
 
@@ -42,6 +43,7 @@ export const FormFieldWrapper: FC<FieldWrapperProps> = ({
   hint,
   required,
   hasError,
+  inputPlacement,
   children,
 }) => {
   const uniqueId = useId();
@@ -57,26 +59,32 @@ export const FormFieldWrapper: FC<FieldWrapperProps> = ({
     inputProps['aria-describedby'] = hintId;
   }
 
+  const input = (
+    <div className={classes.inputWrapper}>{children(inputProps)}</div>
+  );
+
   return (
     <div
-      className={classNames('input with_block_label', {
-        field_with_errors: hasError,
-      })}
+      className={classes.wrapper}
+      data-has-error={hasError}
+      data-input-placement={inputPlacement}
     >
-      <div className='label_input'>
-        <label htmlFor={inputId}>
+      {inputPlacement === 'inline-start' && input}
+
+      <div className={classes.labelWrapper}>
+        <label htmlFor={inputId} className={classes.label}>
           {label}
           {required !== undefined && <RequiredMark required={required} />}
         </label>
 
         {hasHint && (
-          <span className='hint' id={hintId}>
+          <span className={classes.hint} id={hintId}>
             {hint}
           </span>
         )}
-
-        <div className='label_input__wrapper'>{children(inputProps)}</div>
       </div>
+
+      {inputPlacement !== 'inline-start' && input}
     </div>
   );
 };
diff --git a/app/javascript/mastodon/components/form_fields/index.ts b/app/javascript/mastodon/components/form_fields/index.ts
index 8100d56049..8dd693d51e 100644
--- a/app/javascript/mastodon/components/form_fields/index.ts
+++ b/app/javascript/mastodon/components/form_fields/index.ts
@@ -1,4 +1,5 @@
 export { TextInputField } from './text_input_field';
 export { TextAreaField } from './text_area_field';
-export { ToggleField, PlainToggleField } from './toggle_field';
+export { CheckboxField, Checkbox } from './checkbox_field';
+export { ToggleField, Toggle } from './toggle_field';
 export { SelectField } from './select_field';
diff --git a/app/javascript/mastodon/components/form_fields/select_field.stories.tsx b/app/javascript/mastodon/components/form_fields/select_field.stories.tsx
index 30897adda1..762436fe28 100644
--- a/app/javascript/mastodon/components/form_fields/select_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/select_field.stories.tsx
@@ -35,6 +35,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/mastodon/components/form_fields/select_field.tsx b/app/javascript/mastodon/components/form_fields/select_field.tsx
index aa058fc782..e612a215b5 100644
--- a/app/javascript/mastodon/components/form_fields/select_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/select_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'select'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
index f06a8a223a..f4b8440916 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
@@ -25,6 +25,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
index bfd5ce8a41..fd514a88e2 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'textarea'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/mastodon/components/form_fields/text_input_field.stories.tsx b/app/javascript/mastodon/components/form_fields/text_input_field.stories.tsx
index e1ee57fdf5..ec00ef5fd3 100644
--- a/app/javascript/mastodon/components/form_fields/text_input_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_input_field.stories.tsx
@@ -25,6 +25,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
diff --git a/app/javascript/mastodon/components/form_fields/text_input_field.tsx b/app/javascript/mastodon/components/form_fields/text_input_field.tsx
index 3baafbc57c..3b2d941173 100644
--- a/app/javascript/mastodon/components/form_fields/text_input_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_input_field.tsx
@@ -1,8 +1,8 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import { forwardRef } from 'react';
 
-import { FormFieldWrapper } from './wrapper';
-import type { CommonFieldWrapperProps } from './wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
 
 interface Props
   extends ComponentPropsWithoutRef<'input'>, CommonFieldWrapperProps {}
diff --git a/app/javascript/mastodon/components/form_fields/toggle_field.stories.tsx b/app/javascript/mastodon/components/form_fields/toggle_field.stories.tsx
index 260ba4131f..924c18aa74 100644
--- a/app/javascript/mastodon/components/form_fields/toggle_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/toggle_field.stories.tsx
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 
-import { PlainToggleField, ToggleField } from './toggle_field';
+import { Toggle, ToggleField } from './toggle_field';
 
 const meta = {
   title: 'Components/Form Fields/ToggleField',
@@ -16,14 +16,6 @@ const meta = {
       control: { type: 'range', min: 10, max: 40, step: 1 },
     },
   },
-  render(args) {
-    // Component styles require a wrapper class at the moment
-    return (
-      <div className='simple_form'>
-        <ToggleField {...args} />
-      </div>
-    );
-  },
 } satisfies Meta<typeof ToggleField>;
 
 export default meta;
@@ -32,6 +24,12 @@ type Story = StoryObj<typeof meta>;
 
 export const Simple: Story = {};
 
+export const WithoutHint: Story = {
+  args: {
+    hint: undefined,
+  },
+};
+
 export const Required: Story = {
   args: {
     required: true,
@@ -60,7 +58,7 @@ export const Disabled: Story = {
 
 export const Plain: Story = {
   render(props) {
-    return <PlainToggleField {...props} />;
+    return <Toggle {...props} />;
   },
 };
 
diff --git a/app/javascript/mastodon/components/form_fields/toggle_field.tsx b/app/javascript/mastodon/components/form_fields/toggle_field.tsx
index e14bb54ad1..6cafbcdc36 100644
--- a/app/javascript/mastodon/components/form_fields/toggle_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/toggle_field.tsx
@@ -3,9 +3,9 @@ import { forwardRef } from 'react';
 
 import classNames from 'classnames';
 
+import type { CommonFieldWrapperProps } from './form_field_wrapper';
+import { FormFieldWrapper } from './form_field_wrapper';
 import classes from './toggle.module.css';
-import type { CommonFieldWrapperProps } from './wrapper';
-import { FormFieldWrapper } from './wrapper';
 
 type Props = Omit<ComponentPropsWithoutRef<'input'>, 'type'> & {
   size?: number;
@@ -21,16 +21,15 @@ export const ToggleField = forwardRef<
     required={required}
     hasError={hasError}
     inputId={id}
+    inputPlacement='inline-end'
   >
-    {(inputProps) => (
-      <PlainToggleField {...otherProps} {...inputProps} ref={ref} />
-    )}
+    {(inputProps) => <Toggle {...otherProps} {...inputProps} ref={ref} />}
   </FormFieldWrapper>
 ));
 
 ToggleField.displayName = 'ToggleField';
 
-export const PlainToggleField = forwardRef<HTMLInputElement, Props>(
+export const Toggle = forwardRef<HTMLInputElement, Props>(
   ({ className, size, ...otherProps }, ref) => (
     <span className={classes.wrapper}>
       <input
@@ -49,4 +48,4 @@ export const PlainToggleField = forwardRef<HTMLInputElement, Props>(
     </span>
   ),
 );
-PlainToggleField.displayName = 'PlainToggleField';
+Toggle.displayName = 'Toggle';
diff --git a/app/javascript/mastodon/features/account_timeline/v2/filters.tsx b/app/javascript/mastodon/features/account_timeline/v2/filters.tsx
index 874d653c20..d9adec13fa 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/filters.tsx
+++ b/app/javascript/mastodon/features/account_timeline/v2/filters.tsx
@@ -7,7 +7,7 @@ import { useParams } from 'react-router';
 
 import Overlay from 'react-overlays/esm/Overlay';
 
-import { PlainToggleField } from '@/mastodon/components/form_fields/toggle_field';
+import { Toggle } from '@/mastodon/components/form_fields';
 import { Icon } from '@/mastodon/components/icon';
 import KeyboardArrowDownIcon from '@/material-icons/400-24px/keyboard_arrow_down.svg?react';
 
@@ -119,7 +119,7 @@ const FilterDropdown: FC = () => {
                 defaultMessage='Show replies'
               />
             </label>
-            <PlainToggleField
+            <Toggle
               name='replies'
               checked={replies}
               onChange={handleChange}
@@ -132,7 +132,7 @@ const FilterDropdown: FC = () => {
                 defaultMessage='Show boosts'
               />
             </label>
-            <PlainToggleField
+            <Toggle
               name='boosts'
               checked={boosts}
               onChange={handleChange}
diff --git a/app/javascript/mastodon/features/collections/editor.tsx b/app/javascript/mastodon/features/collections/editor.tsx
index 138e7764e5..7896bfe7b6 100644
--- a/app/javascript/mastodon/features/collections/editor.tsx
+++ b/app/javascript/mastodon/features/collections/editor.tsx
@@ -16,7 +16,7 @@ import type {
 import { Button } from 'mastodon/components/button';
 import { Column } from 'mastodon/components/column';
 import { ColumnHeader } from 'mastodon/components/column_header';
-import { TextAreaField, ToggleField } from 'mastodon/components/form_fields';
+import { CheckboxField, TextAreaField } from 'mastodon/components/form_fields';
 import { TextInputField } from 'mastodon/components/form_fields/text_input_field';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import {
@@ -194,7 +194,7 @@ const CollectionSettings: React.FC<{
       </div>
 
       <div className='fields-group'>
-        <ToggleField
+        <CheckboxField
           label={
             <FormattedMessage
               id='collections.mark_as_sensitive'
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 88103ebc87..3305d1c3cd 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -549,8 +549,8 @@ code {
   input[type='email'],
   input[type='password'],
   input[type='datetime-local'] {
-    &:focus:invalid:not(:placeholder-shown),
-    &:required:invalid:not(:placeholder-shown) {
+    &:focus:user-invalid:not(:placeholder-shown),
+    &:required:user-invalid:not(:placeholder-shown) {
       border-color: var(--color-text-error);
     }
   }
@@ -560,16 +560,6 @@ code {
       color: var(--color-text-error);
     }
 
-    input[type='text'],
-    input[type='number'],
-    input[type='email'],
-    input[type='password'],
-    input[type='datetime-local'],
-    textarea,
-    select {
-      border-color: var(--color-text-error);
-    }
-
     .error {
       display: block;
       font-weight: 500;
@@ -732,9 +722,23 @@ code {
   }
 }
 
+.simple_form .input.field_with_errors,
+[data-has-error='true'] {
+  input[type='text'],
+  input[type='number'],
+  input[type='email'],
+  input[type='password'],
+  input[type='datetime-local'],
+  textarea,
+  select {
+    border-color: var(--color-text-error);
+  }
+}
+
 /* Double-chevron icon for custom select components */
 .select-wrapper,
 .select .label_input__wrapper {
+  position: relative;
   width: 100%;
 
   &::after {