diff --git a/.github/ISSUE_TEMPLATE/zui.md b/.github/ISSUE_TEMPLATE/zui.md
index c7647df7c9..ab890f3b55 100644
--- a/.github/ISSUE_TEMPLATE/zui.md
+++ b/.github/ISSUE_TEMPLATE/zui.md
@@ -20,14 +20,19 @@ You need to be logged into a Figma account to properly view the Figma content.
 
 ## Open questions
 
-## Possible implementations
+## Workflow
 
-Develop this using Storybook. We want all the design system components to be documented through their own Storybook stories.
-
-For reference, you can look at the already existing ZUI components created on the `undocumented/new-design-system` branch (not ZUI components that exist on `main`, as they are not part of the new design system.)
-
-## Git
+### Git
 
 The main git branch for the work on the new design system is `undocumented/new-design-system`. Unless otherwise instructed, do your work on a new branch branched off from this branch.
 
 Name your branch `issue-number/zui-name`, ex: `issue-928/zui-button` for a branch where work is done that is documented in the issue with number 928, where a button component is being made.
+
+### Storybook
+
+Use [Storybook](https://storybook.js.org/) to develop the new design system components. If you are not familiar with working with Storybook, please ask and Ziggi or someone else will be happy to introduce you!
+When you have checked out the branch `undocumented/new-design-system` (and, as always when checking out a branch just to be sure, run `yarn install`), run `yarn storybook` in the terminal. This starts Storybook locally, and should open your browser to `localhost:6006` where you see all the components. Note that you want to only look at the ones under the "New design system" headline.
+
+### Files
+
+Create a folder in `src/zui/components` and give it a name for your component, like `ZUIButton`. Inside that folder, create one file `index.tsx` (this is where you write your component) and one `index.stories.tsx` (this is where you write your Storybook stories). Look at the components in `src/zui/components` for inspiration/reference! Note that there are lots of components with names that start with "ZUI" outside the `src/zui/components` folder, but only the ones in `src/zui/components` are relevant as reference/inspiration for the work you will be doing.
diff --git a/src/features/callAssignments/hooks/useCallAssignment.ts b/src/features/callAssignments/hooks/useCallAssignment.ts
index 5912db0422..594dda848d 100644
--- a/src/features/callAssignments/hooks/useCallAssignment.ts
+++ b/src/features/callAssignments/hooks/useCallAssignment.ts
@@ -4,6 +4,7 @@ import { CallAssignmentData } from '../apiTypes';
 import { futureToObject } from 'core/caching/futures';
 import { loadItemIfNecessary } from 'core/caching/cacheUtils';
 import {
+  callAssignmentDeleted,
   callAssignmentLoad,
   callAssignmentLoaded,
   callAssignmentUpdate,
@@ -23,6 +24,7 @@ interface UseCallAssignmentReturn {
   updateTargets: (query: Partial<ZetkinQuery>) => void;
   start: () => void;
   updateCallAssignment: (data: Partial<ZetkinCallAssignment>) => void;
+  deleteAssignment: () => void;
 }
 
 export default function useCallAssignment(
@@ -186,8 +188,16 @@ export default function useCallAssignment(
     });
   };
 
+  const deleteAssignment = async () => {
+    await apiClient.delete(
+      `/api/orgs/${orgId}/call_assignments/${assignmentId}`
+    );
+    dispatch(callAssignmentDeleted(assignmentId));
+  };
+
   return {
     ...futureToObject(callAssignmentFuture),
+    deleteAssignment,
     end,
     isTargeted,
     start,
diff --git a/src/features/callAssignments/l10n/messageIds.ts b/src/features/callAssignments/l10n/messageIds.ts
index 91d02cab48..f0153c8bb0 100644
--- a/src/features/callAssignments/l10n/messageIds.ts
+++ b/src/features/callAssignments/l10n/messageIds.ts
@@ -4,8 +4,10 @@ import { m, makeMessages } from 'core/i18n';
 
 export default makeMessages('feat.callAssignments', {
   actions: {
+    delete: m('Delete'),
     end: m('End assignment'),
     start: m('Start assignment'),
+    warning: m<{ title: string }>('"{title}" will be deleted.'),
   },
   blocked: {
     callBackLater: m('Asked us to call back later'),
diff --git a/src/features/callAssignments/layout/CallAssignmentLayout.tsx b/src/features/callAssignments/layout/CallAssignmentLayout.tsx
index 12f91b2566..8b4d8e4d81 100644
--- a/src/features/callAssignments/layout/CallAssignmentLayout.tsx
+++ b/src/features/callAssignments/layout/CallAssignmentLayout.tsx
@@ -1,5 +1,7 @@
+import React, { useContext } from 'react';
 import { Box, Button, Typography } from '@mui/material';
-import { Headset, People } from '@mui/icons-material';
+import { Delete, Headset, People } from '@mui/icons-material';
+import { useRouter } from 'next/router';
 
 import CallAssignmentStatusChip from '../components/CallAssignmentStatusChip';
 import getCallAssignmentUrl from '../utils/getCallAssignmentUrl';
@@ -16,6 +18,7 @@ import { Msg, useMessages } from 'core/i18n';
 import useCallAssignmentState, {
   CallAssignmentState,
 } from '../hooks/useCallAssignmentState';
+import { ZUIConfirmDialogContext } from 'zui/ZUIConfirmDialogProvider';
 
 interface CallAssignmentLayoutProps {
   children: React.ReactNode;
@@ -26,17 +29,27 @@ const CallAssignmentLayout: React.FC<CallAssignmentLayoutProps> = ({
 }) => {
   const messages = useMessages(messageIds);
   const { orgId, callAssId } = useNumericRouteParams();
+  const router = useRouter();
+  const { showConfirmDialog } = useContext(ZUIConfirmDialogContext);
 
   const {
     data: callAssignment,
     end,
     start,
     updateCallAssignment,
+    deleteAssignment,
   } = useCallAssignment(orgId, callAssId);
   const { statsFuture } = useCallAssignmentStats(orgId, callAssId);
   const { filteredCallersFuture } = useCallers(orgId, callAssId);
   const state = useCallAssignmentState(orgId, callAssId);
 
+  const handleDelete = () => {
+    deleteAssignment();
+    router.push(
+      `/organize/${orgId}/projects/${callAssignment?.campaign?.id || ''} `
+    );
+  };
+
   if (!callAssignment) {
     return null;
   }
@@ -66,6 +79,21 @@ const CallAssignmentLayout: React.FC<CallAssignmentLayoutProps> = ({
         />
       }
       defaultTab="/"
+      ellipsisMenuItems={[
+        {
+          label: messages.actions.delete(),
+          onSelect: () => {
+            showConfirmDialog({
+              onSubmit: handleDelete,
+              title: messages.actions.delete(),
+              warningText: messages.actions.warning({
+                title: callAssignment.title,
+              }),
+            });
+          },
+          startIcon: <Delete />,
+        },
+      ]}
       subtitle={
         <Box alignItems="center" display="flex">
           <Box marginRight={1}>
diff --git a/src/features/callAssignments/store.ts b/src/features/callAssignments/store.ts
index 90602215c2..62ec020c00 100644
--- a/src/features/callAssignments/store.ts
+++ b/src/features/callAssignments/store.ts
@@ -57,6 +57,13 @@ const callAssignmentsSlice = createSlice({
           ]);
       }
     },
+    callAssignmentDeleted: (state, action: PayloadAction<number>) => {
+      const id = action.payload;
+      const item = state.assignmentList.items.find((item) => item.id == id);
+      if (item) {
+        item.deleted;
+      }
+    },
     callAssignmentLoad: (state, action: PayloadAction<number>) => {
       const id = action.payload;
       const item = state.assignmentList.items.find((item) => item.id == id);
@@ -291,6 +298,7 @@ export default callAssignmentsSlice;
 export const {
   callAssignmentCreate,
   callAssignmentCreated,
+  callAssignmentDeleted,
   callAssignmentLoad,
   callAssignmentLoaded,
   callAssignmentUpdate,
diff --git a/src/features/duplicates/components/DuplicateCard.tsx b/src/features/duplicates/components/DuplicateCard.tsx
index f4ce2eccbc..a5d91d5a5e 100644
--- a/src/features/duplicates/components/DuplicateCard.tsx
+++ b/src/features/duplicates/components/DuplicateCard.tsx
@@ -2,7 +2,7 @@ import { Box, Button, Paper, Typography } from '@mui/material';
 import { FC, useContext, useState } from 'react';
 
 import theme from 'theme';
-import ConfigureModal from './ConfigureModal';
+import PotentialDuplicateModal from './PotentialDuplicateModal';
 import messageIds from '../l10n/messageIds';
 import { PotentialDuplicate } from '../store';
 import useDuplicatesMutations from '../hooks/useDuplicatesMutations';
@@ -64,7 +64,7 @@ const DuplicateCard: FC<DuplicateCardProps> = ({ cluster }) => {
           </Box>
         </Box>
       </Paper>
-      <ConfigureModal
+      <PotentialDuplicateModal
         onClose={() => setOpenModal(false)}
         open={openModal}
         potentialDuplicate={cluster}
diff --git a/src/features/duplicates/components/ManualMergingModal.tsx b/src/features/duplicates/components/ManualMergingModal.tsx
new file mode 100644
index 0000000000..1f38bf3d78
--- /dev/null
+++ b/src/features/duplicates/components/ManualMergingModal.tsx
@@ -0,0 +1,33 @@
+import { FC } from 'react';
+import React from 'react';
+
+import MergeModal from './MergeModal';
+import { ZetkinPerson } from 'utils/types/zetkin';
+import useMergePersons from '../hooks/useMergePersons';
+import { useNumericRouteParams } from 'core/hooks';
+
+interface Props {
+  initialPersons: ZetkinPerson[];
+  onClose: () => void;
+  open: boolean;
+}
+
+const ManualMergingModal: FC<Props> = ({ initialPersons, open, onClose }) => {
+  const { orgId } = useNumericRouteParams();
+  const mergePersons = useMergePersons(orgId);
+
+  return (
+    <MergeModal
+      initiallyShowManualSearch
+      onClose={onClose}
+      onMerge={(personIds, overrides) => {
+        mergePersons(personIds, overrides);
+        onClose();
+      }}
+      open={open}
+      persons={initialPersons}
+    />
+  );
+};
+
+export default ManualMergingModal;
diff --git a/src/features/duplicates/components/ConfigureModal.tsx b/src/features/duplicates/components/MergeModal.tsx
similarity index 53%
rename from src/features/duplicates/components/ConfigureModal.tsx
rename to src/features/duplicates/components/MergeModal.tsx
index 37c7875806..d70798eb06 100644
--- a/src/features/duplicates/components/ConfigureModal.tsx
+++ b/src/features/duplicates/components/MergeModal.tsx
@@ -14,39 +14,40 @@ import React, { useEffect } from 'react';
 import theme from 'theme';
 import FieldSettings from './FieldSettings';
 import messageIds from '../l10n/messageIds';
-import { PotentialDuplicate } from '../store';
 import PotentialDuplicatesLists from './PotentialDuplicatesLists';
-import useDuplicatesMutations from '../hooks/useDuplicatesMutations';
 import useFieldSettings from '../hooks/useFieldSettings';
 import { useMessages } from 'core/i18n';
-import { useNumericRouteParams } from 'core/hooks';
 import { ZetkinPerson } from 'utils/types/zetkin';
 
-interface ConfigureModalProps {
-  potentialDuplicate: PotentialDuplicate;
+type Props = {
+  initiallyShowManualSearch?: boolean;
   onClose: () => void;
+  onMerge: (personIds: number[], overrides: Partial<ZetkinPerson>) => void;
   open: boolean;
-}
+  persons: ZetkinPerson[];
+};
 
-const ConfigureModal: FC<ConfigureModalProps> = ({
-  potentialDuplicate,
+const MergeModal: FC<Props> = ({
+  initiallyShowManualSearch = false,
   open,
   onClose,
+  onMerge,
+  persons,
 }) => {
-  const { orgId } = useNumericRouteParams();
   const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
   const messages = useMessages(messageIds);
-  const { mergeDuplicate } = useDuplicatesMutations(orgId);
+  const [additionalPeople, setAdditionalPeople] = useState<ZetkinPerson[]>([]);
 
   const [selectedIds, setSelectedIds] = useState<number[]>(
-    potentialDuplicate?.duplicates.map((person) => person.id) ?? []
+    persons.map((person) => person.id) ?? []
   );
 
-  const peopleToMerge = potentialDuplicate?.duplicates.filter((person) =>
-    selectedIds.includes(person.id)
-  );
+  const peopleToMerge = [
+    ...persons.filter((person) => selectedIds.includes(person.id)),
+    ...additionalPeople,
+  ];
 
-  const peopleNotToMerge = potentialDuplicate?.duplicates.filter(
+  const peopleNotToMerge = persons.filter(
     (person) => !selectedIds.includes(person.id)
   );
 
@@ -55,28 +56,45 @@ const ConfigureModal: FC<ConfigureModalProps> = ({
   const [overrides, setOverrides] = useState(initialOverrides);
 
   useEffect(() => {
-    setSelectedIds(
-      potentialDuplicate?.duplicates.map((person) => person.id) ?? []
-    );
+    setSelectedIds(persons.map((person) => person.id) ?? []);
   }, [open]);
 
   return (
-    <Dialog fullScreen={fullScreen} maxWidth={'lg'} open={open}>
+    <Dialog fullScreen={fullScreen} fullWidth maxWidth="lg" open={open}>
       <DialogTitle sx={{ paddingLeft: 2 }} variant="h5">
         {messages.modal.title()}
       </DialogTitle>
       <Box display="flex" flexGrow={1} overflow="hidden">
         <Box paddingX={2} sx={{ overflowY: 'auto' }} width="50%">
           <PotentialDuplicatesLists
+            initiallyShowManualSearch={initiallyShowManualSearch}
             onDeselect={(person: ZetkinPerson) => {
-              const filteredIds = selectedIds.filter(
-                (item) => item !== person.id
+              const isPredefined = persons.some(
+                (predefinedPerson) => predefinedPerson.id == person.id
               );
-              setSelectedIds(filteredIds);
+
+              if (isPredefined) {
+                const filteredIds = selectedIds.filter(
+                  (item) => item !== person.id
+                );
+                setSelectedIds(filteredIds);
+              } else {
+                const filteredAdditionals = additionalPeople.filter(
+                  (item) => item.id != person.id
+                );
+                setAdditionalPeople(filteredAdditionals);
+              }
             }}
             onSelect={(person: ZetkinPerson) => {
-              const selectedIdsUpdated = [...selectedIds, person.id];
-              setSelectedIds(selectedIdsUpdated);
+              const isPredefined = persons.some(
+                (predefinedPerson) => predefinedPerson.id == person.id
+              );
+              if (isPredefined) {
+                const selectedIdsUpdated = [...selectedIds, person.id];
+                setSelectedIds(selectedIdsUpdated);
+              } else {
+                setAdditionalPeople([...additionalPeople, person]);
+              }
             }}
             peopleNotToMerge={peopleNotToMerge}
             peopleToMerge={peopleToMerge}
@@ -106,14 +124,27 @@ const ConfigureModal: FC<ConfigureModalProps> = ({
         </Box>
       </Box>
       <DialogActions sx={{ p: 2 }}>
-        <Button onClick={() => onClose()} variant="text">
+        <Button
+          onClick={() => {
+            setAdditionalPeople([]);
+            onClose();
+          }}
+          variant="text"
+        >
           {messages.modal.cancelButton()}
         </Button>
         <Button
-          disabled={selectedIds.length > 1 ? false : true}
-          onClick={() =>
-            mergeDuplicate(potentialDuplicate.id, selectedIds, overrides)
+          disabled={
+            additionalPeople.length + selectedIds.length > 1 ? false : true
           }
+          onClick={() => {
+            const idSet = new Set([
+              ...selectedIds,
+              ...additionalPeople.map((person) => person.id),
+            ]);
+            onMerge(Array.from(idSet), overrides);
+            setAdditionalPeople([]);
+          }}
           variant="contained"
         >
           {messages.modal.mergeButton()}
@@ -123,4 +154,4 @@ const ConfigureModal: FC<ConfigureModalProps> = ({
   );
 };
 
-export default ConfigureModal;
+export default MergeModal;
diff --git a/src/features/duplicates/components/PotentialDuplicateModal.tsx b/src/features/duplicates/components/PotentialDuplicateModal.tsx
new file mode 100644
index 0000000000..d3405e4275
--- /dev/null
+++ b/src/features/duplicates/components/PotentialDuplicateModal.tsx
@@ -0,0 +1,35 @@
+import { FC } from 'react';
+import React from 'react';
+
+import { PotentialDuplicate } from '../store';
+import useDuplicatesMutations from '../hooks/useDuplicatesMutations';
+import { useNumericRouteParams } from 'core/hooks';
+import MergeModal from './MergeModal';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  potentialDuplicate: PotentialDuplicate;
+}
+
+const PotentialDuplicateModal: FC<Props> = ({
+  potentialDuplicate,
+  open,
+  onClose,
+}) => {
+  const { orgId } = useNumericRouteParams();
+  const { mergeDuplicate } = useDuplicatesMutations(orgId);
+
+  return (
+    <MergeModal
+      onClose={onClose}
+      onMerge={(personIds, overrides) => {
+        mergeDuplicate(potentialDuplicate.id, personIds, overrides);
+      }}
+      open={open}
+      persons={potentialDuplicate.duplicates}
+    />
+  );
+};
+
+export default PotentialDuplicateModal;
diff --git a/src/features/duplicates/components/PotentialDuplicatesLists.tsx b/src/features/duplicates/components/PotentialDuplicatesLists.tsx
index 5e01d0f164..4d9e5fa767 100644
--- a/src/features/duplicates/components/PotentialDuplicatesLists.tsx
+++ b/src/features/duplicates/components/PotentialDuplicatesLists.tsx
@@ -1,12 +1,15 @@
-import { FC } from 'react';
+import { FC, useState } from 'react';
 import { Box, Divider, Typography } from '@mui/material';
 
 import MergeCandidateList from './MergeCandidateList';
 import messageIds from '../l10n/messageIds';
 import { useMessages } from 'core/i18n';
 import { ZetkinPerson } from 'utils/types/zetkin';
+import ZUIEllipsisMenu from 'zui/ZUIEllipsisMenu';
+import { MUIOnlyPersonSelect } from 'zui/ZUIPersonSelect';
 
 interface PotentialDuplicatesListsProps {
+  initiallyShowManualSearch: boolean;
   onDeselect: (person: ZetkinPerson) => void;
   onSelect: (person: ZetkinPerson) => void;
   peopleNotToMerge: ZetkinPerson[];
@@ -14,16 +17,49 @@ interface PotentialDuplicatesListsProps {
 }
 
 const PotentialDuplicatesLists: FC<PotentialDuplicatesListsProps> = ({
+  initiallyShowManualSearch,
   onDeselect,
   onSelect,
   peopleNotToMerge,
   peopleToMerge,
 }) => {
   const messages = useMessages(messageIds);
+  const [addingManually, setAddingManually] = useState(
+    initiallyShowManualSearch
+  );
 
   return (
     <>
-      <Typography variant="h6">{messages.modal.peopleToMerge()}</Typography>
+      <Box display="flex" justifyContent="space-between">
+        <Typography variant="h6">{messages.modal.peopleToMerge()}</Typography>
+        <ZUIEllipsisMenu
+          items={[
+            {
+              label: addingManually
+                ? messages.modal.lists.hideManual()
+                : messages.modal.lists.showManual(),
+              onSelect() {
+                setAddingManually(!addingManually);
+              },
+            },
+          ]}
+        />
+      </Box>
+      {addingManually && (
+        <Box my={1}>
+          <MUIOnlyPersonSelect
+            getOptionDisabled={(option) =>
+              peopleToMerge.some((person) => person.id == option.id) ||
+              peopleNotToMerge.some((person) => person.id == option.id)
+            }
+            onChange={function (person: ZetkinPerson): void {
+              onSelect(person);
+            }}
+            placeholder={messages.modal.findCandidateManually()}
+            selectedPerson={null}
+          />
+        </Box>
+      )}
       <MergeCandidateList
         buttonLabel={messages.modal.notDuplicateButton()}
         onButtonClick={onDeselect}
diff --git a/src/features/duplicates/hooks/useDuplicatesMutations.tsx b/src/features/duplicates/hooks/useDuplicatesMutations.tsx
index 5dd627e8b6..76030b3ce7 100644
--- a/src/features/duplicates/hooks/useDuplicatesMutations.tsx
+++ b/src/features/duplicates/hooks/useDuplicatesMutations.tsx
@@ -5,6 +5,7 @@ import {
   PotentialDuplicate,
 } from '../store';
 import { useApiClient, useAppDispatch } from 'core/hooks';
+import useMergePersons from './useMergePersons';
 
 type DuplicatesMutationsReturn = {
   dismissDuplicate: (duplicateId: number) => void;
@@ -20,17 +21,12 @@ export default function useDuplicatesMutations(
 ): DuplicatesMutationsReturn {
   const apiClient = useApiClient();
   const dispatch = useAppDispatch();
+  const mergePersons = useMergePersons(orgId);
 
   type PotentialDuplicatePatchBody = {
     dismissed?: boolean;
   };
 
-  type MergePostBody = {
-    objects: number[];
-    override: Partial<ZetkinPerson>;
-    type: 'person';
-  };
-
   const dismissDuplicate = async (duplicateId: number) => {
     await apiClient
       .patch<PotentialDuplicate, PotentialDuplicatePatchBody>(
@@ -47,15 +43,8 @@ export default function useDuplicatesMutations(
     duplicatesIds: number[],
     override: Partial<ZetkinPerson>
   ) => {
-    await apiClient
-      .post<ZetkinPerson, MergePostBody>(`/api/orgs/${orgId}/merges`, {
-        objects: duplicatesIds,
-        override,
-        type: 'person',
-      })
-      .then(() => {
-        dispatch(duplicateMerged(potentialDuplicateId));
-      });
+    await mergePersons(duplicatesIds, override);
+    dispatch(duplicateMerged(potentialDuplicateId));
   };
 
   return {
diff --git a/src/features/duplicates/hooks/useMergePersons.tsx b/src/features/duplicates/hooks/useMergePersons.tsx
new file mode 100644
index 0000000000..adbf8374e1
--- /dev/null
+++ b/src/features/duplicates/hooks/useMergePersons.tsx
@@ -0,0 +1,22 @@
+import { useApiClient, useAppDispatch } from 'core/hooks';
+import { ZetkinPerson } from 'utils/types/zetkin';
+import { MergePostBody } from '../types';
+import { personsMerged } from 'features/profile/store';
+
+export default function useMergePersons(orgId: number) {
+  const apiClient = useApiClient();
+  const dispatch = useAppDispatch();
+
+  return async (personIds: number[], overrides: Partial<ZetkinPerson>) => {
+    await apiClient.post<ZetkinPerson, MergePostBody>(
+      `/api/orgs/${orgId}/merges`,
+      {
+        objects: personIds,
+        override: overrides,
+        type: 'person',
+      }
+    );
+
+    dispatch(personsMerged(personIds));
+  };
+}
diff --git a/src/features/duplicates/l10n/messageIds.ts b/src/features/duplicates/l10n/messageIds.ts
index c3200b6c41..eec3ee80f7 100644
--- a/src/features/duplicates/l10n/messageIds.ts
+++ b/src/features/duplicates/l10n/messageIds.ts
@@ -14,7 +14,12 @@ export default makeMessages('feat.duplicates', {
       noValue: m('No value'),
       title: m('Data to merge'),
     },
+    findCandidateManually: m('Type to find a potential duplicate'),
     isDuplicateButton: m('Include'),
+    lists: {
+      hideManual: m('Hide manual search'),
+      showManual: m('Show manual search'),
+    },
     mergeButton: m('Merge'),
     notDuplicateButton: m('Exclude'),
     peopleNotBeingMerged: m('People not being merged'),
diff --git a/src/features/duplicates/types.ts b/src/features/duplicates/types.ts
new file mode 100644
index 0000000000..5448c04aa0
--- /dev/null
+++ b/src/features/duplicates/types.ts
@@ -0,0 +1,7 @@
+import { ZetkinPerson } from 'utils/types/zetkin';
+
+export type MergePostBody = {
+  objects: number[];
+  override: Partial<ZetkinPerson>;
+  type: 'person';
+};
diff --git a/src/features/emails/components/EmailTargetsBlocked.tsx b/src/features/emails/components/EmailTargetsBlocked.tsx
index 94b2a11272..c986445f2b 100644
--- a/src/features/emails/components/EmailTargetsBlocked.tsx
+++ b/src/features/emails/components/EmailTargetsBlocked.tsx
@@ -39,19 +39,25 @@ const EmailTargetsBlocked: FC<EmailTargetsBlockedProps> = ({
           {(animatedValue) => (
             <Box
               sx={{
-                backgroundColor: theme.palette.statusColors.orange,
+                backgroundColor:
+                  parseInt(animatedValue) > 0
+                    ? theme.palette.statusColors.orange
+                    : theme.palette.statusColors.gray,
                 borderRadius: '1em',
-                color: 'white',
+                color:
+                  parseInt(animatedValue) > 0
+                    ? 'white'
+                    : theme.palette.text.secondary,
                 display: 'flex',
                 flexShrink: 0,
                 fontSize: '1.8em',
                 lineHeight: 'normal',
                 marginRight: '0.1em',
                 overflow: 'hidden',
-                padding: parseInt(animatedValue) === 0 ? '' : '0.2em 0.7em',
+                padding: '0.2em 0.7em',
               }}
             >
-              {parseInt(animatedValue) > 0 ? animatedValue : ''}
+              {parseInt(animatedValue) > 0 ? animatedValue : 0}
             </Box>
           )}
         </ZUIAnimatedNumber>
diff --git a/src/features/emails/components/EmailTargetsReady.tsx b/src/features/emails/components/EmailTargetsReady.tsx
index 30c18f506d..9e9f9eaea2 100644
--- a/src/features/emails/components/EmailTargetsReady.tsx
+++ b/src/features/emails/components/EmailTargetsReady.tsx
@@ -18,7 +18,6 @@ import ZUIAnimatedNumber from 'zui/ZUIAnimatedNumber';
 interface EmailTargetsReadyProps {
   isLocked: boolean;
   isLoading: boolean;
-  isTargeted: boolean;
   lockedReadyTargets: number | null;
   onToggleLocked: () => void;
   readyTargets: number;
@@ -28,14 +27,13 @@ interface EmailTargetsReadyProps {
 const EmailTargetsReady: FC<EmailTargetsReadyProps> = ({
   isLocked,
   isLoading,
-  isTargeted,
   lockedReadyTargets,
   onToggleLocked,
   readyTargets,
   state,
 }) => {
   const theme = useTheme();
-  const showUnlockInfo = isTargeted && state != EmailState.SENT;
+  const showUnlockInfo = state != EmailState.SENT;
 
   return (
     <Card>
@@ -79,19 +77,25 @@ const EmailTargetsReady: FC<EmailTargetsReadyProps> = ({
             {(animatedValue) => (
               <Box
                 sx={{
-                  backgroundColor: theme.palette.statusColors.green,
+                  backgroundColor:
+                    parseInt(animatedValue) > 0
+                      ? theme.palette.statusColors.green
+                      : theme.palette.statusColors.gray,
                   borderRadius: '1em',
-                  color: 'white',
+                  color:
+                    parseInt(animatedValue) > 0
+                      ? 'white'
+                      : theme.palette.text.secondary,
                   display: 'flex',
                   flexShrink: 0,
                   fontSize: '1.8em',
                   lineHeight: 'normal',
                   marginRight: '0.1em',
                   overflow: 'hidden',
-                  padding: parseInt(animatedValue) === 0 ? '' : '0.2em 0.7em',
+                  padding: '0.2em 0.7em',
                 }}
               >
-                {parseInt(animatedValue) > 0 ? animatedValue : ''}
+                {parseInt(animatedValue) > 0 ? animatedValue : 0}
               </Box>
             )}
           </ZUIAnimatedNumber>
@@ -130,7 +134,7 @@ const EmailTargetsReady: FC<EmailTargetsReadyProps> = ({
             )}
             {!isLoading && (
               <Button
-                disabled={state === EmailState.SCHEDULED}
+                disabled={readyTargets === 0 || state === EmailState.SCHEDULED}
                 onClick={onToggleLocked}
                 startIcon={isLocked ? <LockOpen /> : <Lock />}
                 variant={isLocked ? 'outlined' : 'contained'}
diff --git a/src/features/events/components/EventActionButtons.tsx b/src/features/events/components/EventActionButtons.tsx
index 4d5d961b32..178f46feef 100644
--- a/src/features/events/components/EventActionButtons.tsx
+++ b/src/features/events/components/EventActionButtons.tsx
@@ -52,6 +52,10 @@ const EventActionButtons: React.FunctionComponent<EventActionButtonsProps> = ({
     if (newDateIsDifferent) {
       setPublished(date);
     }
+
+    if (!date) {
+      setPublished(null);
+    }
   };
 
   const handleDelete = () => {
diff --git a/src/features/profile/components/PersonActionButtons.tsx b/src/features/profile/components/PersonActionButtons.tsx
new file mode 100644
index 0000000000..49f6d65a5e
--- /dev/null
+++ b/src/features/profile/components/PersonActionButtons.tsx
@@ -0,0 +1,40 @@
+import { FC, useState } from 'react';
+
+import ZUIEllipsisMenu from 'zui/ZUIEllipsisMenu';
+import messageIds from '../l10n/messageIds';
+import { useMessages } from 'core/i18n';
+import ManualMergingModal from 'features/duplicates/components/ManualMergingModal';
+import { ZetkinPerson } from 'utils/types/zetkin';
+
+type Props = {
+  person: ZetkinPerson;
+};
+
+const PersonActionButtons: FC<Props> = ({ person }) => {
+  const messages = useMessages(messageIds);
+  const [merging, setMerging] = useState(false);
+
+  return (
+    <>
+      <ZUIEllipsisMenu
+        items={[
+          {
+            label: messages.ellipsisMenu.merge(),
+            onSelect() {
+              setMerging(true);
+            },
+          },
+        ]}
+      />
+      <ManualMergingModal
+        initialPersons={[person]}
+        onClose={() => {
+          setMerging(false);
+        }}
+        open={merging}
+      />
+    </>
+  );
+};
+
+export default PersonActionButtons;
diff --git a/src/features/profile/l10n/messageIds.ts b/src/features/profile/l10n/messageIds.ts
index cb8164a387..037249bafa 100644
--- a/src/features/profile/l10n/messageIds.ts
+++ b/src/features/profile/l10n/messageIds.ts
@@ -16,6 +16,9 @@ export default makeMessages('feat.profile', {
   editButtonClose: m<{ title: string }>('Stop editing {title}'),
   editButtonLabel: m('Edit Details'),
   editPersonHeader: m<{ person: string }>('Edit {person}'),
+  ellipsisMenu: {
+    merge: m('Merge with...'),
+  },
   genders: {
     f: m('Female'),
     m: m('Male'),
diff --git a/src/features/profile/layout/SinglePersonLayout.tsx b/src/features/profile/layout/SinglePersonLayout.tsx
index baeff4c313..89ccacaf51 100644
--- a/src/features/profile/layout/SinglePersonLayout.tsx
+++ b/src/features/profile/layout/SinglePersonLayout.tsx
@@ -6,6 +6,7 @@ import TabbedLayout from '../../../utils/layout/TabbedLayout';
 import { useNumericRouteParams } from 'core/hooks';
 import usePerson from '../hooks/usePerson';
 import { Msg, useMessages } from 'core/i18n';
+import PersonActionButtons from '../components/PersonActionButtons';
 
 interface SinglePersonLayoutProps {
   children: React.ReactNode;
@@ -26,6 +27,7 @@ const SinglePersonLayout: FunctionComponent<SinglePersonLayoutProps> = ({
 
   return (
     <TabbedLayout
+      actionButtons={<PersonActionButtons person={person} />}
       avatar={`/api/orgs/${orgId}/people/${personId}/avatar`}
       baseHref={`/organize/${orgId}/people/${personId}`}
       defaultTab="/"
diff --git a/src/features/profile/store.ts b/src/features/profile/store.ts
index 8ed2863c7d..f38d69c480 100644
--- a/src/features/profile/store.ts
+++ b/src/features/profile/store.ts
@@ -98,6 +98,21 @@ const profilesSlice = createSlice({
         item.mutating = [];
       }
     },
+    personsMerged: (state, action: PayloadAction<number[]>) => {
+      const ids = action.payload;
+
+      // The first one might be stale
+      ids.forEach((id, index) => {
+        const personItem = state.personById[id];
+        if (personItem) {
+          if (index == 0) {
+            personItem.isStale = true;
+          } else {
+            personItem.deleted = true;
+          }
+        }
+      });
+    },
   },
 });
 
@@ -113,4 +128,5 @@ export const {
   personOrgRemoved,
   personUpdate,
   personUpdated,
+  personsMerged,
 } = profilesSlice.actions;
diff --git a/src/features/surveys/hooks/useSurveyMutations.ts b/src/features/surveys/hooks/useSurveyMutations.ts
index 4316390c41..578bd87b31 100644
--- a/src/features/surveys/hooks/useSurveyMutations.ts
+++ b/src/features/surveys/hooks/useSurveyMutations.ts
@@ -21,6 +21,7 @@ import {
   elementOptionUpdated,
   elementsReordered,
   elementUpdated,
+  surveyDeleted,
   surveyUpdate,
   surveyUpdated,
 } from '../store';
@@ -84,6 +85,7 @@ type UseSurveyEditingReturn = {
   ) => Promise<void>;
   deleteElement: (elemId: number) => Promise<void>;
   deleteElementOption: (elemId: number, optionId: number) => Promise<void>;
+  deleteSurvey: () => Promise<void>;
   publish: () => Promise<void>;
   unpublish: () => Promise<void>;
   updateElement: (
@@ -181,6 +183,11 @@ export default function useSurveyMutations(
     dispatch(elementOptionDeleted([surveyId, elemId, optionId]));
   }
 
+  async function deleteSurvey() {
+    await apiClient.delete(`/api/orgs/${orgId}/surveys/${surveyId}`);
+    dispatch(surveyDeleted(surveyId));
+  }
+
   async function publish() {
     if (!surveyData) {
       return;
@@ -302,6 +309,7 @@ export default function useSurveyMutations(
     addElementOptionsFromText,
     deleteElement,
     deleteElementOption,
+    deleteSurvey,
     publish,
     unpublish,
     updateElement,
diff --git a/src/features/surveys/l10n/messageIds.ts b/src/features/surveys/l10n/messageIds.ts
index 054c19c136..f83e84f67a 100644
--- a/src/features/surveys/l10n/messageIds.ts
+++ b/src/features/surveys/l10n/messageIds.ts
@@ -110,8 +110,10 @@ export default makeMessages('feat.surveys', {
   },
   layout: {
     actions: {
+      delete: m('Delete survey'),
       publish: m('Publish survey'),
       unpublish: m('Unpublish survey'),
+      warning: m<{ surveyTitle: string }>('"{surveyTitle}" will be deleted.'),
     },
     stats: {
       questions: m<{ numQuestions: number }>(
@@ -121,6 +123,7 @@ export default makeMessages('feat.surveys', {
         '{numSubmissions, plural, one {1 submission} other {# submissions}}'
       ),
     },
+    unknownTitle: m('Untitled survey'),
   },
   optionCollapse: {
     collapse: m('Collapse'),
diff --git a/src/features/surveys/layout/SurveyLayout.tsx b/src/features/surveys/layout/SurveyLayout.tsx
index 36c3bd256f..ba14e9a4c1 100644
--- a/src/features/surveys/layout/SurveyLayout.tsx
+++ b/src/features/surveys/layout/SurveyLayout.tsx
@@ -1,6 +1,7 @@
 import { useRouter } from 'next/router';
 import { Box, Button } from '@mui/material';
-import { ChatBubbleOutline, QuizOutlined } from '@mui/icons-material';
+import { ChatBubbleOutline, Delete, QuizOutlined } from '@mui/icons-material';
+import { useContext } from 'react';
 
 import { ELEMENT_TYPE } from 'utils/types/zetkin';
 import getSurveyUrl from '../utils/getSurveyUrl';
@@ -12,6 +13,7 @@ import useSurvey from '../hooks/useSurvey';
 import useSurveyElements from '../hooks/useSurveyElements';
 import useSurveyMutations from '../hooks/useSurveyMutations';
 import useSurveyStats from '../hooks/useSurveyStats';
+import { ZUIConfirmDialogContext } from 'zui/ZUIConfirmDialogProvider';
 import ZUIDateRangePicker from 'zui/ZUIDateRangePicker/ZUIDateRangePicker';
 import ZUIEditTextinPlace from 'zui/ZUIEditTextInPlace';
 import ZUIFuture from 'zui/ZUIFuture';
@@ -37,9 +39,10 @@ const SurveyLayout: React.FC<SurveyLayoutProps> = ({
   const router = useRouter();
   const parsedOrg = parseInt(orgId);
   const messages = useMessages(messageIds);
+  const { showConfirmDialog } = useContext(ZUIConfirmDialogContext);
   const statsFuture = useSurveyStats(parsedOrg, parseInt(surveyId));
   const surveyFuture = useSurvey(parsedOrg, parseInt(surveyId));
-  const { publish, unpublish, updateSurvey } = useSurveyMutations(
+  const { publish, unpublish, updateSurvey, deleteSurvey } = useSurveyMutations(
     parsedOrg,
     parseInt(surveyId)
   );
@@ -71,6 +74,13 @@ const SurveyLayout: React.FC<SurveyLayoutProps> = ({
       />
     );
   };
+  const handleDelete = () => {
+    deleteSurvey();
+    router.push(
+      `/organize/${orgId}/projects/${surveyFuture.data?.campaign?.id || ''} `
+    );
+  };
+
   return (
     <TabbedLayout
       actionButtons={
@@ -108,6 +118,22 @@ const SurveyLayout: React.FC<SurveyLayoutProps> = ({
         />
       }
       defaultTab="/"
+      ellipsisMenuItems={[
+        {
+          label: messages.layout.actions.delete(),
+          onSelect: () => {
+            showConfirmDialog({
+              onSubmit: handleDelete,
+              title: messages.layout.actions.delete(),
+              warningText: messages.layout.actions.warning({
+                surveyTitle:
+                  surveyFuture.data?.title || messages.layout.unknownTitle(),
+              }),
+            });
+          },
+          startIcon: <Delete />,
+        },
+      ]}
       onClickAlertBtn={() => {
         router.push(
           `/organize/${originalOrgId}/projects/${surveyFuture.data?.campaign?.id}/surveys/${surveyId}`
diff --git a/src/features/surveys/store.ts b/src/features/surveys/store.ts
index 39a30aba21..db05138783 100644
--- a/src/features/surveys/store.ts
+++ b/src/features/surveys/store.ts
@@ -252,6 +252,13 @@ const surveysSlice = createSlice({
         );
       }
     },
+    surveyDeleted: (state, action: PayloadAction<number>) => {
+      const id = action.payload;
+      const item = state.surveyList.items.find((item) => item.id == id);
+      if (item) {
+        item.deleted = true;
+      }
+    },
     surveyLoad: (state, action: PayloadAction<number>) => {
       const id = action.payload;
       const item = state.surveyList.items.find((item) => item.id == id);
@@ -419,6 +426,7 @@ export const {
   statsLoaded,
   surveyCreate,
   surveyCreated,
+  surveyDeleted,
   surveyLoad,
   surveyLoaded,
   surveySubmissionUpdate,
diff --git a/src/pages/organize/[orgId]/projects/[campId]/emails/[emailId]/index.tsx b/src/pages/organize/[orgId]/projects/[campId]/emails/[emailId]/index.tsx
index 23eedd13ac..2df0f2e0da 100644
--- a/src/pages/organize/[orgId]/projects/[campId]/emails/[emailId]/index.tsx
+++ b/src/pages/organize/[orgId]/projects/[campId]/emails/[emailId]/index.tsx
@@ -74,7 +74,6 @@ const EmailPage: PageWithLayout = () => {
               <EmailTargetsReady
                 isLoading={mutating.includes('locked')}
                 isLocked={isLocked}
-                isTargeted={isTargeted}
                 lockedReadyTargets={lockedReadyTargets}
                 onToggleLocked={() => updateEmail({ locked: !email.locked })}
                 readyTargets={readyTargets}