diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index c104bb37..923fc000 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,7 +4,6 @@ import { Manrope } from "next/font/google";
 import { UserProvider } from "@/lib/client/userContext";
 import { AppToaster } from "@/components/ui/AppToaster";
 import { TopNavBar } from "@/components/ui/TopNavBar";
-import { Toaster } from "react-hot-toast";
 import "./globals.css";
 
 const manrope = Manrope({
@@ -41,7 +40,6 @@ export default function RootLayout({
         suppressHydrationWarning
       >
         <UserProvider>
-          <Toaster position="top-center" toastOptions={{ duration: 4000 }} />
           <TopNavBar />
           {children}
           <AppToaster />
diff --git a/src/components/ui/AppToaster.tsx b/src/components/ui/AppToaster.tsx
index 0fb35a55..3c410bf4 100644
--- a/src/components/ui/AppToaster.tsx
+++ b/src/components/ui/AppToaster.tsx
@@ -1,8 +1,12 @@
 "use client";
 
+import type { JSX } from "react";
 import { Toaster } from "react-hot-toast";
+import { AlertCircle, CheckCircle2, Loader2 } from "lucide-react";
 
-export function AppToaster(): React.JSX.Element {
+const iconClass = "h-5 w-5 shrink-0";
+
+export function AppToaster(): JSX.Element {
   return (
     <Toaster
       position="top-center"
@@ -11,6 +15,27 @@ export function AppToaster(): React.JSX.Element {
         style: {
           fontFamily: "var(--font-manrope), system-ui, sans-serif",
         },
+        success: {
+          icon: (
+            <CheckCircle2
+              className={`${iconClass} text-emerald-600`}
+              aria-hidden
+            />
+          ),
+        },
+        error: {
+          icon: (
+            <AlertCircle className={`${iconClass} text-red-600`} aria-hidden />
+          ),
+        },
+        loading: {
+          icon: (
+            <Loader2
+              className={`${iconClass} animate-spin text-gray-600`}
+              aria-hidden
+            />
+          ),
+        },
       }}
     />
   );
diff --git a/src/components/volunteers/EditableCell.tsx b/src/components/volunteers/EditableCell.tsx
index 1ee131af..bf9b7748 100644
--- a/src/components/volunteers/EditableCell.tsx
+++ b/src/components/volunteers/EditableCell.tsx
@@ -9,7 +9,7 @@ import { CellContext } from "@tanstack/react-table";
 import toast from "react-hot-toast";
 import { Volunteer } from "./types";
 import { VolunteerTag } from "./VolunteerTag";
-import { ArrowRight } from "lucide-react";
+import { ArrowRight, Tag } from "lucide-react";
 import { NotesDisplay } from "./NotesDisplay";
 
 const SCREEN_EDGE_PADDING_PX = 16;
@@ -204,7 +204,7 @@ export const EditableCell = ({
         const toastId = `new-tag-${info.column.id}-${newTag.toLowerCase()}`;
         toast(`New tag "${newTag}" created — remember to save your changes.`, {
           id: toastId,
-          icon: "tag",
+          icon: <Tag className="h-5 w-5 shrink-0 text-gray-700" aria-hidden />,
           duration: 4000,
         });
       }
diff --git a/src/components/volunteers/TableToolbar.tsx b/src/components/volunteers/TableToolbar.tsx
index 43fc0a52..108cdca9 100644
--- a/src/components/volunteers/TableToolbar.tsx
+++ b/src/components/volunteers/TableToolbar.tsx
@@ -121,7 +121,7 @@ export const TableToolbar = ({
     const ro = new ResizeObserver(() => updateToolsScrollHints());
     ro.observe(el);
     return (): void => ro.disconnect();
-  }, [updateToolsScrollHints, filters.length, sorting.length, role]);
+  }, [updateToolsScrollHints, filters.length, sorting.length, role, hasEdits]);
 
   useEffect(() => {
     if (!isCopyMenuOpen) return;
@@ -317,7 +317,7 @@ export const TableToolbar = ({
               />
             </div>
 
-            {role === "admin" && (
+            {role === "admin" && !hasEdits && (
               <button
                 type="button"
                 onClick={onOpenShortcuts}
@@ -328,7 +328,7 @@ export const TableToolbar = ({
               </button>
             )}
 
-            {role === "admin" && (
+            {role === "admin" && !hasEdits && (
               <button
                 type="button"
                 onClick={onOpenAddVolunteer}
@@ -350,7 +350,7 @@ export const TableToolbar = ({
               </button>
             )}
 
-            {role === "admin" && (
+            {role === "admin" && !hasEdits && (
               <button
                 type="button"
                 onClick={onOpenManageTags}
diff --git a/src/components/volunteers/VolunteersTable.tsx b/src/components/volunteers/VolunteersTable.tsx
index 3a4cb9f1..ead9b2dc 100644
--- a/src/components/volunteers/VolunteersTable.tsx
+++ b/src/components/volunteers/VolunteersTable.tsx
@@ -140,6 +140,9 @@ const VolunteersTableContent = ({
     setRowSelection,
     debouncedGlobalFilter,
     fetchInitialData,
+    bumpDisplayRefresh,
+    refreshRolesAndCohorts,
+    setAllVolunteers,
     debouncedFilters,
   } = useVolunteersData({ isAdmin, editedRowsRef });
 
@@ -162,8 +165,11 @@ const VolunteersTableContent = ({
     allRoles,
     allCohorts,
     setData,
-    setLoading,
+    setAllVolunteers,
+    bumpDisplayRefresh,
+    refreshRolesAndCohorts,
     fetchInitialData,
+    syncedEditedRowsRef: editedRowsRef,
   });
 
   const filterOptions = useMemo(() => {
diff --git a/src/components/volunteers/useVolunteerEdits.ts b/src/components/volunteers/useVolunteerEdits.ts
index 676e6ba8..9f4d7885 100644
--- a/src/components/volunteers/useVolunteerEdits.ts
+++ b/src/components/volunteers/useVolunteerEdits.ts
@@ -1,5 +1,7 @@
-import { useState, useCallback, useRef } from "react";
+import { createElement, useState, useCallback, useRef } from "react";
+import { flushSync } from "react-dom";
 import toast from "react-hot-toast";
+import { Pencil } from "lucide-react";
 import { Volunteer, RoleRow, CohortRow } from "./types";
 import { updateVolunteer } from "@/lib/api/updateVolunteer";
 import { createRole } from "@/lib/api/createRole";
@@ -15,8 +17,12 @@ interface UseVolunteerEditsProps {
   allRoles: RoleRow[];
   allCohorts: CohortRow[];
   setData: React.Dispatch<React.SetStateAction<Volunteer[]>>;
-  setLoading: (l: boolean) => void;
+  setAllVolunteers: React.Dispatch<React.SetStateAction<Volunteer[]>>;
+  bumpDisplayRefresh: () => void;
+  refreshRolesAndCohorts: () => Promise<void>;
   fetchInitialData: () => Promise<void>;
+  /** Ref mirrored to `editedRows` for filter pipeline (useVolunteersData); cleared on cancel before display refresh. */
+  syncedEditedRowsRef: React.RefObject<Record<number, Partial<Volunteer>>>;
 }
 
 interface EditStep {
@@ -48,6 +54,22 @@ export interface UseVolunteerEditsReturn {
 
 const MAX_HISTORY = 100;
 
+function mergeSavedVolunteersIntoAll(
+  prev: Volunteer[],
+  editsSnapshot: Record<number, Partial<Volunteer>>,
+  remainingEdits: Record<number, Partial<Volunteer>>
+): Volunteer[] {
+  const failedIds = new Set(
+    Object.keys(remainingEdits).map((k) => Number.parseInt(k, 10))
+  );
+  return prev.map((v) => {
+    if (failedIds.has(v.id) || !editsSnapshot[v.id]) {
+      return v;
+    }
+    return { ...v, ...editsSnapshot[v.id] };
+  });
+}
+
 const normalizeValue = (colId: string, value: unknown): unknown => {
   if (colId === "pronouns") {
     if (Array.isArray(value)) {
@@ -79,8 +101,11 @@ export const useVolunteerEdits = ({
   allRoles,
   allCohorts,
   setData,
-  setLoading,
+  setAllVolunteers,
+  bumpDisplayRefresh,
+  refreshRolesAndCohorts,
   fetchInitialData,
+  syncedEditedRowsRef,
 }: UseVolunteerEditsProps): UseVolunteerEditsReturn => {
   const [isSaving, setIsSaving] = useState<boolean>(false);
   const [saveErrors, setSaveErrors] = useState<string[]>([]);
@@ -174,7 +199,10 @@ export const useVolunteerEdits = ({
         if (showTrackingToast) {
           queueMicrotask((): void => {
             toast("Tracking changes — save when ready", {
-              icon: "edit",
+              icon: createElement(Pencil, {
+                className: "h-5 w-5 shrink-0 text-gray-700",
+                "aria-hidden": true,
+              }),
               id: "tracking-edits",
             });
           });
@@ -294,11 +322,13 @@ export const useVolunteerEdits = ({
 
   const handleSaveEdits = async (): Promise<void> => {
     setIsSaving(true);
-    setLoading(true);
     setSaveErrors([]);
     const savingToast = toast.loading("Saving changes...");
     const currentErrors: string[] = [];
     const remainingEdits = { ...editedRows };
+    const editsSnapshot = { ...editedRows };
+    let referenceDataDirty = false;
+    let usedFullRefetchAfterFatalError = false;
 
     try {
       const knownCohortTerms = new Set(
@@ -326,6 +356,7 @@ export const useVolunteerEdits = ({
                 is_active: true,
               });
               knownCohortTerms.add(cohortKey);
+              referenceDataDirty = true;
             }
           }
         }
@@ -345,6 +376,7 @@ export const useVolunteerEdits = ({
                   `Failed to create role ${cleanName}: ${res.error}`
                 );
               knownRoles.add(roleKey);
+              referenceDataDirty = true;
             }
           }
         };
@@ -444,36 +476,60 @@ export const useVolunteerEdits = ({
           ? err.message
           : "A fatal error occurred during tag creation.";
       currentErrors.push(errorMessage);
+      try {
+        await fetchInitialData();
+        usedFullRefetchAfterFatalError = true;
+      } catch (fetchErr) {
+        console.error("Refetch after save failure failed:", fetchErr);
+      }
     }
 
     setEditedRows(remainingEdits);
+    syncedEditedRowsRef.current = remainingEdits;
     if (currentErrors.length > 0) setSaveErrors(currentErrors);
     else setSaveErrors([]);
 
-    await fetchInitialData();
-    setIsSaving(false);
-    hadEditsRef.current = Object.keys(remainingEdits).length > 0;
-    undoStackRef.current = [];
-    redoStackRef.current = [];
-    syncHistoryStacks();
+    try {
+      if (!usedFullRefetchAfterFatalError) {
+        setAllVolunteers((prev) =>
+          mergeSavedVolunteersIntoAll(prev, editsSnapshot, remainingEdits)
+        );
+        if (referenceDataDirty) {
+          try {
+            await refreshRolesAndCohorts();
+          } catch (e) {
+            console.error("Error refreshing roles/cohorts after save:", e);
+          }
+        }
+      }
+    } finally {
+      setIsSaving(false);
+      hadEditsRef.current = Object.keys(remainingEdits).length > 0;
+      undoStackRef.current = [];
+      redoStackRef.current = [];
+      syncHistoryStacks();
 
-    if (currentErrors.length > 0) {
-      toast.error(`${currentErrors.length} update(s) failed`, {
-        id: savingToast,
-      });
-    } else {
-      toast.success("All changes saved", { id: savingToast });
+      if (currentErrors.length > 0) {
+        toast.error(`${currentErrors.length} update(s) failed`, {
+          id: savingToast,
+        });
+      } else {
+        toast.success("All changes saved", { id: savingToast });
+      }
     }
   };
 
   const handleCancelEdits = (): void => {
-    setEditedRows({});
+    flushSync(() => {
+      setEditedRows({});
+    });
+    syncedEditedRowsRef.current = {};
     setSaveErrors([]);
     hadEditsRef.current = false;
     undoStackRef.current = [];
     redoStackRef.current = [];
     syncHistoryStacks();
-    setData(allVolunteers.map((v) => v));
+    bumpDisplayRefresh();
     toast("Changes discarded");
   };
 
diff --git a/src/components/volunteers/useVolunteersData.ts b/src/components/volunteers/useVolunteersData.ts
index 6d0cf933..0fa377f7 100644
--- a/src/components/volunteers/useVolunteersData.ts
+++ b/src/components/volunteers/useVolunteersData.ts
@@ -1,4 +1,11 @@
-import { useState, useEffect, useCallback, useRef } from "react";
+import {
+  useState,
+  useEffect,
+  useCallback,
+  useRef,
+  type Dispatch,
+  type SetStateAction,
+} from "react";
 import { Volunteer, CohortRow, RoleRow } from "./types";
 import {
   FilterTuple,
@@ -63,6 +70,10 @@ export interface UseVolunteersDataReturn {
   rowSelection: RowSelectionState;
   setRowSelection: React.Dispatch<React.SetStateAction<RowSelectionState>>;
   fetchInitialData: () => Promise<void>;
+  /** Increment to re-run filter → display sync (e.g. after discarding edits) without refetching all volunteers. */
+  bumpDisplayRefresh: () => void;
+  refreshRolesAndCohorts: () => Promise<void>;
+  setAllVolunteers: Dispatch<SetStateAction<Volunteer[]>>;
   debouncedFilters: FilterTuple[];
 }
 
@@ -72,6 +83,7 @@ export const useVolunteersData = ({
 }: UseVolunteersDataProps): UseVolunteersDataReturn => {
   const [data, setData] = useState<Volunteer[]>([]);
   const [allVolunteers, setAllVolunteers] = useState<Volunteer[]>([]);
+  const [displayRefreshEpoch, setDisplayRefreshEpoch] = useState(0);
   const [loading, setLoading] = useState<boolean>(true);
 
   const [allRoles, setAllRoles] = useState<RoleRow[]>([]);
@@ -136,6 +148,21 @@ export const useVolunteersData = ({
     }
   }, [isAdmin]);
 
+  const bumpDisplayRefresh = useCallback((): void => {
+    setDisplayRefreshEpoch((e) => e + 1);
+  }, []);
+
+  const refreshRolesAndCohorts = useCallback(async (): Promise<void> => {
+    if (!isAdmin) return;
+    try {
+      const [roles, cohorts] = await Promise.all([getRoles(), getCohorts()]);
+      setAllRoles(roles);
+      setAllCohorts(cohorts);
+    } catch (e) {
+      console.error("Error refreshing roles/cohorts:", e);
+    }
+  }, [isAdmin]);
+
   useEffect(() => {
     setLoading(true);
   }, [filters, globalOp]);
@@ -250,7 +277,13 @@ export const useVolunteersData = ({
     return (): void => {
       ignore = true;
     };
-  }, [debouncedFilters, debouncedGlobalOp, allVolunteers, editedRowsRef]);
+  }, [
+    debouncedFilters,
+    debouncedGlobalOp,
+    allVolunteers,
+    editedRowsRef,
+    displayRefreshEpoch,
+  ]);
 
   return {
     data,
@@ -272,6 +305,9 @@ export const useVolunteersData = ({
     rowSelection,
     setRowSelection,
     fetchInitialData,
+    bumpDisplayRefresh,
+    refreshRolesAndCohorts,
+    setAllVolunteers,
     debouncedFilters,
   };
 };