diff --git a/app/actions/ModActionPanel/BlobList.tsx b/app/actions/ModActionPanel/BlobList.tsx
index f21d41b5..181eea5e 100644
--- a/app/actions/ModActionPanel/BlobList.tsx
+++ b/app/actions/ModActionPanel/BlobList.tsx
@@ -23,7 +23,7 @@ export function BlobList(props: {
         const displayActionType = subjectStatus?.takendown ? 'Taken down' : ''
         return (
           <div key={blob.cid} className="relative flex items-start">
-            <div className="flex h-5 items-center">
+            <div className="flex h-5 items-center ml-1">
               <input
                 id={`blob-${blob.cid}`}
                 name={name}
@@ -37,7 +37,7 @@ export function BlobList(props: {
             <div className="ml-3 text-sm min-w-0 text-ellipsis overflow-hidden whitespace-nowrap">
               <label
                 htmlFor={`blob-${blob.cid}`}
-                className="font-medium text-gray-700"
+                className="font-medium text-gray-700 dark:text-gray-100"
               >
                 {subjectStatus && (
                   <>
diff --git a/app/actions/ModActionPanel/QuickAction.tsx b/app/actions/ModActionPanel/QuickAction.tsx
index e08560e7..5d81a8d7 100644
--- a/app/actions/ModActionPanel/QuickAction.tsx
+++ b/app/actions/ModActionPanel/QuickAction.tsx
@@ -19,9 +19,9 @@ import {
   LabelListEmpty,
   diffLabels,
   displayLabel,
-  getLabelGroupInfo,
   getLabelsForSubject,
   toLabelVal,
+  getLabelGroupInfo,
   unFlagSelfLabel,
   isSelfLabel,
 } from '@/common/labels'
@@ -46,6 +46,7 @@ import { getProfileUriForDid } from '@/reports/helpers/subject'
 import { Dialog } from '@headlessui/react'
 import { SubjectSwitchButton } from '@/common/SubjectSwitchButton'
 import { diffTags } from 'components/tags/utils'
+import { ActionError } from '@/reports/ModerationForm/ActionError'
 
 const FORM_ID = 'mod-action-panel'
 const useBreakpoint = createBreakpoint({ xs: 340, sm: 640 })
@@ -153,7 +154,10 @@ function Form(
     replaceFormWithEvents,
     ...others
   } = props
-  const [submitting, setSubmitting] = useState(false)
+  const [submission, setSubmission] = useState<{
+    isSubmitting: boolean
+    error: string
+  }>({ isSubmitting: false, error: '' })
   const { data: subjectStatus, refetch: refetchSubjectStatus } = useQuery({
     // subject of the report
     queryKey: ['modSubjectStatus', { subject }],
@@ -179,6 +183,7 @@ function Form(
   )
   const isTagEvent = modEventType === MOD_EVENTS.TAG
   const isLabelEvent = modEventType === MOD_EVENTS.LABEL
+  const isDivertEvent = modEventType === MOD_EVENTS.DIVERT
   const isMuteEvent = modEventType === MOD_EVENTS.MUTE
   const isCommentEvent = modEventType === MOD_EVENTS.COMMENT
   const shouldShowDurationInHoursField =
@@ -234,7 +239,7 @@ function Form(
   ) => {
     ev.preventDefault()
     try {
-      setSubmitting(true)
+      setSubmission({ isSubmitting: true, error: '' })
       const formData = new FormData(ev.currentTarget)
       const nextLabels = String(formData.get('labels'))!.split(',')
       const coreEvent: Parameters<typeof onSubmit>[0]['event'] = {
@@ -266,6 +271,14 @@ function Form(
       const { subject: subjectInfo, record: recordInfo } =
         await createSubjectFromId(subject)
 
+      const subjectBlobCids = formData
+        .getAll('subjectBlobCids')
+        .map((cid) => String(cid))
+
+      if (isDivertEvent && !subjectBlobCids.length) {
+        throw new Error('blob-selection-required')
+      }
+
       // This block handles an edge case where a label may be applied to profile record and then the profile record is updated by the user.
       // In that state, if the moderator reverts the label, the event is emitted for the latest CID of the profile entry which does NOT revert
       // the label applied to the old CID.
@@ -351,9 +364,7 @@ function Form(
         await onSubmit({
           subject: subjectInfo,
           createdBy: client.session.did,
-          subjectBlobCids: formData
-            .getAll('subjectBlobCids')
-            .map((cid) => String(cid)),
+          subjectBlobCids,
           event: coreEvent,
         })
       }
@@ -379,10 +390,9 @@ function Form(
       // This state is not kept in the form and driven by state so we need to reset it manually after submission
       setModEventType(MOD_EVENTS.ACKNOWLEDGE)
       shouldMoveToNextSubject && navigateQueue(1)
+      setSubmission({ error: '', isSubmitting: false })
     } catch (err) {
-      throw err
-    } finally {
-      setSubmitting(false)
+      setSubmission({ error: (err as Error).message, isSubmitting: false })
     }
   }
   // Keyboard shortcuts for action types
@@ -526,7 +536,6 @@ function Form(
                   {!currentLabels.length && <LabelListEmpty className="ml-1" />}
                   {currentLabels.map((label) => {
                     const labelGroup = getLabelGroupInfo(unFlagSelfLabel(label))
-
                     return (
                       <LabelChip
                         key={label}
@@ -561,6 +570,7 @@ function Form(
                   <ModEventSelectorButton
                     subjectStatus={subjectStatus}
                     selectedAction={modEventType}
+                    hasBlobs={!!record?.blobs?.length}
                     setSelectedAction={(action) => setModEventType(action)}
                   />
                 </div>
@@ -654,6 +664,12 @@ function Form(
                   />
                 )}
 
+                {submission.error && (
+                  <div className="my-2">
+                    <ActionError error={submission.error} />
+                  </div>
+                )}
+
                 <div className="mt-auto flex flex-row justify-between">
                   <div>
                     <input
@@ -664,7 +680,7 @@ function Form(
                     />
                     <ButtonSecondary
                       className="px-2 sm:px-4 sm:mr-2"
-                      disabled={submitting}
+                      disabled={submission.isSubmitting}
                       onClick={onCancel}
                     >
                       <span className="text-sm sm:text-base">(C)ancel</span>
@@ -674,14 +690,14 @@ function Form(
                     <ButtonPrimary
                       ref={submitButton}
                       type="submit"
-                      disabled={submitting}
+                      disabled={submission.isSubmitting}
                       className="mx-1 px-2 sm:px-4"
                     >
                       <span className="text-sm sm:text-base">(S)ubmit</span>
                     </ButtonPrimary>
                     <ButtonPrimary
                       type="button"
-                      disabled={submitting}
+                      disabled={submission.isSubmitting}
                       onClick={submitAndGoNext}
                       className="px-2 sm:px-4"
                     >
@@ -705,14 +721,14 @@ function Form(
         <div className="flex justify-between mt-auto">
           <ButtonSecondary
             onClick={() => navigateQueue(-1)}
-            disabled={submitting}
+            disabled={submission.isSubmitting}
           >
             <ArrowLeftIcon className="h-4 w-4 inline-block align-text-bottom" />
           </ButtonSecondary>
 
           <ButtonSecondary
             onClick={() => navigateQueue(1)}
-            disabled={submitting}
+            disabled={submission.isSubmitting}
           >
             <ArrowRightIcon className="h-4 w-4 inline-block align-text-bottom" />
           </ButtonSecondary>
diff --git a/components/common/Card.tsx b/components/common/Card.tsx
new file mode 100644
index 00000000..c0d0a8e6
--- /dev/null
+++ b/components/common/Card.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+
+export type Variation = 'default' | 'error'
+
+export const Card = ({
+  children,
+  variation = 'default',
+}: {
+  children: React.ReactNode
+  variation?: Variation
+}) => {
+  let className = 'shadow rounded-sm p-2'
+  if (variation === 'error') {
+    className += ' bg-red-100 dark:bg-red-600 border-red-400 text-red-700 dark:text-red-100'
+  } else {
+    className += ' dark:shadow-slate-700 bg-white dark:bg-slate-800'
+  }
+  return <div className={className}>{children}</div>
+}
diff --git a/components/common/labels/Grid.tsx b/components/common/labels/Grid.tsx
index 01715d19..55b75e9c 100644
--- a/components/common/labels/Grid.tsx
+++ b/components/common/labels/Grid.tsx
@@ -2,7 +2,6 @@ import { useState } from 'react'
 import Select from 'react-tailwindcss-select'
 import {
   labelOptions,
-  displayLabel,
   groupLabelList,
   getLabelGroupInfo,
   buildAllLabelOptions,
diff --git a/components/common/labels/Input.tsx b/components/common/labels/Input.tsx
deleted file mode 100644
index c78e3b62..00000000
--- a/components/common/labels/Input.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Fragment } from 'react'
-import { Popover, Transition } from '@headlessui/react'
-import { useSyncedState } from '@/lib/useSyncedState'
-import { LabelChip, LabelList, LabelListEmpty } from './List'
-import {
-  labelOptions,
-  displayLabel,
-  groupLabelList,
-  getLabelGroupInfo,
-  buildAllLabelOptions,
-  isSelfLabel,
-  unFlagSelfLabel,
-} from './util'
-import { classNames } from '@/lib/util'
-
-const EMPTY_ARR = []
-
-export function LabelsInput(props: LabelsProps) {
-  const {
-    id,
-    formId,
-    name,
-    className = '',
-    defaultLabels = EMPTY_ARR,
-    options = labelOptions,
-    disabled,
-    ...others
-  } = props
-  const allOptions = buildAllLabelOptions(defaultLabels, options)
-  const [packedCurrent, setPackedCurrent] = useSyncedState(
-    packMemo(defaultLabels),
-  )
-  const current = unpackMemo<string[]>(packedCurrent)
-  const groupedLabelList = groupLabelList(allOptions)
-
-  return (
-    <Popover className="relative">
-      <Popover.Button
-        as={LabelList}
-        // @ts-ignore
-        disabled={disabled}
-        className={`${disabled ? '' : 'cursor-pointer'}	${className}`}
-        {...others}
-      >
-        {!current.length && <LabelListEmpty>(click to add)</LabelListEmpty>}
-        {current.map((label) => {
-          const labelGroup = getLabelGroupInfo(unFlagSelfLabel(label))
-          return (
-            <LabelChip key={label} style={{ color: labelGroup.color }}>
-              {displayLabel(label)}
-              <input type="hidden" name={name} value={label} />
-            </LabelChip>
-          )
-        })}
-      </Popover.Button>
-      <Transition
-        as={Fragment}
-        enter="transition ease-out duration-200"
-        enterFrom="opacity-0 translate-y-1"
-        enterTo="opacity-100 translate-y-0"
-        leave="transition ease-in duration-150"
-        leaveFrom="opacity-100 translate-y-0"
-        leaveTo="opacity-0 translate-y-1"
-        beforeLeave={() => {
-          const form = document.getElementById(formId) as HTMLFormElement
-          if (!form) throw new Error(`Form with id ${formId} doesn't exist`)
-          const nextLabels = new FormData(form)
-            .getAll(`${name}-staged`)
-            .map((val) => String(val))
-          setPackedCurrent(packMemo(nextLabels))
-        }}
-      >
-        <Popover.Panel className="absolute left-1/2 z-10 mt-1 flex w-screen max-w-max -translate-x-1/2 px-4">
-          <div className="w-screen max-w-sm flex-auto rounded bg-white p-4 text-sm leading-6 shadow-lg ring-1 ring-gray-900/5">
-            <div
-              className="space-y-1 flex flex-row flex-wrap justify-between"
-              id={`${id}-staged-container`}
-            >
-              {Object.values(groupedLabelList).map((group, groupIndex) => {
-                const groupTitle = group.strings.settings.en.name
-                return (
-                  <div
-                    key={`label_group_${groupTitle}`}
-                    className={`w-1/2 ${
-                      [0, 1].includes(groupIndex) ? '' : 'pt-2'
-                    }`}
-                  >
-                    <p className="pb-1" style={{ color: group.color }}>
-                      {groupTitle}
-                    </p>
-                    <div className="flex flex-col">
-                      {group.labels.map((opt, i) => {
-                        const labelText = typeof opt === 'string' ? opt : opt.id
-                        const cantChange = isSelfLabel(labelText)
-                        return (
-                          <div
-                            key={labelText}
-                            className={classNames(
-                              `relative flex items-start mr-2`,
-                              cantChange ? 'opacity-75' : '',
-                            )}
-                          >
-                            <div className="flex h-6 items-center">
-                              <input
-                                id={`${groupIndex}-${id}-opt-${i}`}
-                                name={`${name}-staged`}
-                                type="checkbox"
-                                disabled={cantChange}
-                                value={labelText}
-                                defaultChecked={current.includes(labelText)}
-                                className="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600"
-                              />
-                            </div>
-                            <label
-                              htmlFor={`${groupIndex}-${id}-opt-${i}`}
-                              className="ml-3 text-sm leading-6 font-medium text-gray-900"
-                            >
-                              {displayLabel(labelText)}
-                            </label>
-                          </div>
-                        )
-                      })}
-                    </div>
-                  </div>
-                )
-              })}
-            </div>
-          </div>
-        </Popover.Panel>
-      </Transition>
-    </Popover>
-  )
-}
-
-type LabelsProps = {
-  id: string
-  formId: string
-  name: string
-  disabled?: boolean
-  className?: string
-  defaultLabels?: string[]
-  options?: string[]
-}
-
-function packMemo(val: unknown) {
-  return JSON.stringify(val)
-}
-
-function unpackMemo<T>(memo: string) {
-  return JSON.parse(memo) as T
-}
diff --git a/components/common/labels/index.ts b/components/common/labels/index.ts
index 83e657cd..26ea7451 100644
--- a/components/common/labels/index.ts
+++ b/components/common/labels/index.ts
@@ -1,3 +1,2 @@
-export * from './Input'
 export * from './List'
 export * from './util'
diff --git a/components/common/posts/PostsFeed.tsx b/components/common/posts/PostsFeed.tsx
index b0c69729..3455a1ad 100644
--- a/components/common/posts/PostsFeed.tsx
+++ b/components/common/posts/PostsFeed.tsx
@@ -23,9 +23,10 @@ import { RichText } from '../RichText'
 import {
   LabelChip,
   LabelList,
-  getLabelGroupInfo,
   doesLabelNeedBlur,
   toLabelVal,
+  LabelGroupInfo,
+  getLabelGroupInfo,
 } from '../labels'
 import { CollectionId } from '@/reports/helpers/subject'
 import { ProfileAvatar } from '@/repositories/ProfileAvatar'
@@ -354,7 +355,10 @@ function PostEmbeds({ item }: { item: AppBskyFeedDefs.FeedViewPost }) {
         <div className="flex gap-2 pb-2 pl-14 flex-col border-2 border-gray-400 border-dashed my-2 rounded pt-2">
           <p className="text-sm font-medium text-gray-600 dark:text-gray-100">
             The author of the original post blocked the author.{' '}
-            <Link className=" text-gray-900 dark:text-gray-200 underline" href={repoLink}>
+            <Link
+              className=" text-gray-900 dark:text-gray-200 underline"
+              href={repoLink}
+            >
               See quoted post
             </Link>
             {' · '}
@@ -415,10 +419,11 @@ function PostLabels({
       {labels?.map((label, i) => {
         const { val, src } = label
         const labelGroup = getLabelGroupInfo(val)
-
         return (
           <LabelChip
-            className={`${i === 0 ? 'ml-0' : ''} text-[${labelGroup.color}]`}
+            className={`${i === 0 ? 'ml-0' : ''} text-[${
+              labelGroup.color
+            }]`}
             // TODO: Ideally, we should just use inline class name but it only works when the class names are static
             // so trying to work around that with style prop for now
             style={{ color: labelGroup.color }}
diff --git a/components/mod-event/EventItem.tsx b/components/mod-event/EventItem.tsx
index 0e0d005d..7239b491 100644
--- a/components/mod-event/EventItem.tsx
+++ b/components/mod-event/EventItem.tsx
@@ -1,3 +1,4 @@
+import { Card } from '@/common/Card'
 import {
   LabelChip,
   LabelList,
@@ -21,7 +22,7 @@ const Comment = ({
   }
 }) => {
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p className="flex justify-between text-gray-500">
         <span>
           By{' '}
@@ -45,7 +46,7 @@ const Comment = ({
         header="Removed: "
         labels={modEvent.event.negateLabelVals as string[] | undefined}
       />
-    </div>
+    </Card>
   )
 }
 
@@ -57,7 +58,7 @@ const Email = ({
   }
 }) => {
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p className="text-gray-500">
         By{' '}
         {modEvent.creatorHandle
@@ -68,7 +69,7 @@ const Email = ({
         <p>Subject: {modEvent.event.subjectLine}</p>
       )}
       {modEvent.event.comment && <p>{modEvent.event.comment}</p>}
-    </div>
+    </Card>
   )
 }
 
@@ -82,7 +83,7 @@ const Report = ({
   const isAppeal =
     modEvent.event.reportType === ComAtprotoModerationDefs.REASONAPPEAL
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p className="flex justify-between">
         <span>
           By{' '}
@@ -97,7 +98,7 @@ const Report = ({
       {modEvent.event.comment && (
         <p className="mt-1">{modEvent.event.comment}</p>
       )}
-    </div>
+    </Card>
   )
 }
 
@@ -112,7 +113,7 @@ const TakedownOrMute = ({
 }) => {
   const expiresAt = getExpiresAtFromEvent(modEvent)
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p className="flex justify-between">
         <span>
           By{' '}
@@ -141,7 +142,7 @@ const TakedownOrMute = ({
         header="Removed: "
         labels={modEvent.event.negateLabelVals as string[] | undefined}
       />
-    </div>
+    </Card>
   )
 }
 
@@ -176,7 +177,7 @@ const Label = ({
   } & ComAtprotoAdminDefs.ModEventView
 }) => {
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p>
         <span>
           By{' '}
@@ -190,7 +191,7 @@ const Label = ({
       ) : null}
       <EventLabels header="Added: " labels={modEvent.event.createLabelVals} />
       <EventLabels header="Removed: " labels={modEvent.event.negateLabelVals} />
-    </div>
+    </Card>
   )
 }
 
@@ -202,7 +203,7 @@ const Tag = ({
   } & ComAtprotoAdminDefs.ModEventView
 }) => {
   return (
-    <div className="shadow dark:shadow-slate-700 bg-white dark:bg-slate-800 rounded-sm p-2">
+    <Card>
       <p>
         <span>
           By{' '}
@@ -216,7 +217,7 @@ const Tag = ({
       ) : null}
       <EventLabels header="Added: " labels={modEvent.event.add} />
       <EventLabels header="Removed: " labels={modEvent.event.remove} />
-    </div>
+    </Card>
   )
 }
 
@@ -250,7 +251,9 @@ export const ModEventItem = ({
     ComAtprotoAdminDefs.isModEventComment(modEvent.event) ||
     ComAtprotoAdminDefs.isModEventUnmute(modEvent.event) ||
     ComAtprotoAdminDefs.isModEventResolveAppeal(modEvent.event) ||
-    ComAtprotoAdminDefs.isModEventReverseTakedown(modEvent.event)
+    ComAtprotoAdminDefs.isModEventReverseTakedown(modEvent.event) ||
+    // This is temporary since the api package with this new type check is not yet published
+    modEvent.event.$type === 'com.atproto.admin.defs#modEventDivert'
   ) {
     eventItem = <Comment modEvent={modEvent} />
   }
diff --git a/components/mod-event/SelectorButton.tsx b/components/mod-event/SelectorButton.tsx
index 6f696d46..42387a76 100644
--- a/components/mod-event/SelectorButton.tsx
+++ b/components/mod-event/SelectorButton.tsx
@@ -28,6 +28,10 @@ const actions = [
     text: 'Resolve Appeal',
     key: MOD_EVENTS.RESOLVE_APPEAL,
   },
+  {
+    text: 'Divert',
+    key: MOD_EVENTS.DIVERT,
+  },
 ]
 const actionsByKey = actions.reduce((acc, action) => {
   acc[action.key] = action.text
@@ -38,10 +42,12 @@ export const ModEventSelectorButton = ({
   subjectStatus,
   selectedAction,
   setSelectedAction,
+  hasBlobs,
 }: {
   subjectStatus?: ComAtprotoAdminDefs.SubjectStatusView | null
   selectedAction: string
   setSelectedAction: (action: string) => void
+  hasBlobs: boolean
 }) => {
   const availableActions = useMemo(() => {
     return actions.filter(({ key, text }) => {
@@ -58,7 +64,14 @@ export const ModEventSelectorButton = ({
         return false
       }
       // Don't show takedown action if subject is already takendown
-      if (key === MOD_EVENTS.TAKEDOWN && subjectStatus?.takendown) {
+      if (
+        (key === MOD_EVENTS.TAKEDOWN || key === MOD_EVENTS.DIVERT) &&
+        subjectStatus?.takendown
+      ) {
+        return false
+      }
+      // Don't show divert action if the subject does not have any blobs
+      if (key === MOD_EVENTS.DIVERT && !hasBlobs) {
         return false
       }
       // Don't show reverse takedown action if subject is not takendown
@@ -88,6 +101,7 @@ export const ModEventSelectorButton = ({
     subjectStatus?.muteUntil,
     subjectStatus?.reviewState,
     subjectStatus?.appealed,
+    hasBlobs,
   ])
   return (
     <Dropdown
diff --git a/components/mod-event/constants.ts b/components/mod-event/constants.ts
index 22a47604..7782ab6a 100644
--- a/components/mod-event/constants.ts
+++ b/components/mod-event/constants.ts
@@ -11,6 +11,7 @@ export const MOD_EVENTS = {
   RESOLVE_APPEAL: 'com.atproto.admin.defs#modEventResolveAppeal',
   EMAIL: 'com.atproto.admin.defs#modEventEmail',
   TAG: 'com.atproto.admin.defs#modEventTag',
+  DIVERT: 'com.atproto.admin.defs#modEventDivert',
 } as const
 
 export const MOD_EVENT_TITLES = {
@@ -26,4 +27,5 @@ export const MOD_EVENT_TITLES = {
   [MOD_EVENTS.EMAIL]: 'Email Sent',
   [MOD_EVENTS.RESOLVE_APPEAL]: 'Appeal Resolved',
   [MOD_EVENTS.TAG]: 'Tag',
+  [MOD_EVENTS.DIVERT]: 'Divert',
 }
diff --git a/components/reports/ModerationForm/ActionError.tsx b/components/reports/ModerationForm/ActionError.tsx
new file mode 100644
index 00000000..494e4d3b
--- /dev/null
+++ b/components/reports/ModerationForm/ActionError.tsx
@@ -0,0 +1,26 @@
+import { Card } from '@/common/Card'
+
+const ActionErrors = {
+  'blob-selection-required': {
+    title: 'No blobs selected',
+    description: 'You must select at least one blob to be diverted',
+  },
+}
+
+export type ActionErrorKey = keyof typeof ActionErrors | string
+
+export const ActionError = ({ error }: { error: ActionErrorKey }) => {
+  if (ActionErrors[error]) {
+    return (
+      <Card variation="error">
+        <h4 className='font-bold'>{ActionErrors[error].title}</h4>
+        <p>{ActionErrors[error].description}</p>
+      </Card>
+    )
+  }
+  return (
+    <Card variation="error">
+      <p>{error}</p>
+    </Card>
+  )
+}