diff --git a/surfsense_web/atoms/image-gen-config/image-gen-config-mutation.atoms.ts b/surfsense_web/atoms/image-gen-config/image-gen-config-mutation.atoms.ts
index dd8bcd324..362c3a690 100644
--- a/surfsense_web/atoms/image-gen-config/image-gen-config-mutation.atoms.ts
+++ b/surfsense_web/atoms/image-gen-config/image-gen-config-mutation.atoms.ts
@@ -2,6 +2,8 @@ import { atomWithMutation } from "jotai-tanstack-query";
 import { toast } from "sonner";
 import type {
 	CreateImageGenConfigRequest,
+	CreateImageGenConfigResponse,
+	DeleteImageGenConfigResponse,
 	GetImageGenConfigsResponse,
 	UpdateImageGenConfigRequest,
 	UpdateImageGenConfigResponse,
@@ -23,8 +25,8 @@ export const createImageGenConfigMutationAtom = atomWithMutation((get) => {
 		mutationFn: async (request: CreateImageGenConfigRequest) => {
 			return imageGenConfigApiService.createConfig(request);
 		},
-		onSuccess: () => {
-			toast.success("Image model created");
+		onSuccess: (_: CreateImageGenConfigResponse, request: CreateImageGenConfigRequest) => {
+			toast.success(`${request.name} created`);
 			queryClient.invalidateQueries({
 				queryKey: cacheKeys.imageGenConfigs.all(Number(searchSpaceId)),
 			});
@@ -48,7 +50,7 @@ export const updateImageGenConfigMutationAtom = atomWithMutation((get) => {
 			return imageGenConfigApiService.updateConfig(request);
 		},
 		onSuccess: (_: UpdateImageGenConfigResponse, request: UpdateImageGenConfigRequest) => {
-			toast.success("Image model updated");
+			toast.success(`${request.data.name ?? "Configuration"} updated`);
 			queryClient.invalidateQueries({
 				queryKey: cacheKeys.imageGenConfigs.all(Number(searchSpaceId)),
 			});
@@ -71,16 +73,16 @@ export const deleteImageGenConfigMutationAtom = atomWithMutation((get) => {
 	return {
 		mutationKey: ["image-gen-configs", "delete"],
 		enabled: !!searchSpaceId,
-		mutationFn: async (id: number) => {
-			return imageGenConfigApiService.deleteConfig(id);
+		mutationFn: async (request: { id: number; name: string }) => {
+			return imageGenConfigApiService.deleteConfig(request.id);
 		},
-		onSuccess: (_, id: number) => {
-			toast.success("Image model deleted");
+		onSuccess: (_: DeleteImageGenConfigResponse, request: { id: number; name: string }) => {
+			toast.success(`${request.name} deleted`);
 			queryClient.setQueryData(
 				cacheKeys.imageGenConfigs.all(Number(searchSpaceId)),
 				(oldData: GetImageGenConfigsResponse | undefined) => {
 					if (!oldData) return oldData;
-					return oldData.filter((config) => config.id !== id);
+					return oldData.filter((config) => config.id !== request.id);
 				}
 			);
 		},
diff --git a/surfsense_web/components/settings/image-model-manager.tsx b/surfsense_web/components/settings/image-model-manager.tsx
index 1c8394c9c..b5a98dcbe 100644
--- a/surfsense_web/components/settings/image-model-manager.tsx
+++ b/surfsense_web/components/settings/image-model-manager.tsx
@@ -121,7 +121,7 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 	const handleDelete = async () => {
 		if (!configToDelete) return;
 		try {
-			await deleteConfig(configToDelete.id);
+			await deleteConfig({ id: configToDelete.id, name: configToDelete.name });
 			setConfigToDelete(null);
 		} catch {
 			// Error handled by mutation
@@ -398,12 +398,11 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 				open={!!configToDelete}
 				onOpenChange={(open) => !open && setConfigToDelete(null)}
 			>
-				<AlertDialogContent>
-					<AlertDialogHeader>
-						<AlertDialogTitle className="flex items-center gap-2">
-							<Trash2 className="h-5 w-5 text-destructive" />
-							Delete Image Model
-						</AlertDialogTitle>
+				<AlertDialogContent className="select-none">
+				<AlertDialogHeader>
+					<AlertDialogTitle>
+						Delete Image Model
+					</AlertDialogTitle>
 						<AlertDialogDescription>
 							Are you sure you want to delete{" "}
 							<span className="font-semibold text-foreground">{configToDelete?.name}</span>?
@@ -411,23 +410,14 @@ export function ImageModelManager({ searchSpaceId }: ImageModelManagerProps) {
 					</AlertDialogHeader>
 					<AlertDialogFooter>
 						<AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
-						<AlertDialogAction
-							onClick={handleDelete}
-							disabled={isDeleting}
-							className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-						>
-							{isDeleting ? (
-								<>
-									<Spinner size="sm" className="mr-2" />
-									Deleting
-								</>
-							) : (
-								<>
-									<Trash2 className="mr-2 h-4 w-4" />
-									Delete
-								</>
-							)}
-						</AlertDialogAction>
+					<AlertDialogAction
+						onClick={handleDelete}
+						disabled={isDeleting}
+						className="relative bg-destructive text-destructive-foreground hover:bg-destructive/90"
+					>
+						<span className={isDeleting ? "opacity-0" : ""}>Delete</span>
+						{isDeleting && <Spinner size="sm" className="absolute" />}
+					</AlertDialogAction>
 					</AlertDialogFooter>
 				</AlertDialogContent>
 			</AlertDialog>
diff --git a/surfsense_web/components/shared/image-config-dialog.tsx b/surfsense_web/components/shared/image-config-dialog.tsx
index 4a9c3862a..a364b6a64 100644
--- a/surfsense_web/components/shared/image-config-dialog.tsx
+++ b/surfsense_web/components/shared/image-config-dialog.tsx
@@ -460,38 +460,34 @@ export function ImageConfigDialog({
 						Cancel
 					</Button>
 					{mode === "create" || (mode === "edit" && !isGlobal) ? (
-						<Button
-							onClick={handleSubmit}
-							disabled={isSubmitting || !isFormValid}
-							className="text-sm h-9 min-w-[120px]"
-						>
-							{isSubmitting ? (
-								<>
-									<Spinner size="sm" />
-									{mode === "edit" ? "Saving" : "Creating"}
-								</>
-							) : mode === "edit" ? (
-								"Save Changes"
-							) : (
-								"Create & Use"
-							)}
-						</Button>
+					<Button
+						onClick={handleSubmit}
+						disabled={isSubmitting || !isFormValid}
+						className="relative text-sm h-9 min-w-[120px]"
+					>
+						<span className={isSubmitting ? "opacity-0" : ""}>
+							{mode === "edit" ? "Save Changes" : "Create & Use"}
+						</span>
+						{isSubmitting && <Spinner size="sm" className="absolute" />}
+					</Button>
 					) : isAutoMode ? (
-						<Button
-							className="text-sm h-9 gap-2 bg-gradient-to-r from-violet-500 to-purple-600 hover:from-violet-600 hover:to-purple-700"
-							onClick={handleUseGlobalConfig}
-							disabled={isSubmitting}
-						>
-							{isSubmitting ? "Loading..." : "Use Auto Mode"}
-						</Button>
+					<Button
+						className="relative text-sm h-9 bg-gradient-to-r from-violet-500 to-purple-600 hover:from-violet-600 hover:to-purple-700"
+						onClick={handleUseGlobalConfig}
+						disabled={isSubmitting}
+					>
+						<span className={isSubmitting ? "opacity-0" : ""}>Use Auto Mode</span>
+						{isSubmitting && <Spinner size="sm" className="absolute" />}
+					</Button>
 					) : isGlobal && config ? (
-						<Button
-							className="text-sm h-9 gap-2"
-							onClick={handleUseGlobalConfig}
-							disabled={isSubmitting}
-						>
-							{isSubmitting ? "Loading..." : "Use This Model"}
-						</Button>
+					<Button
+						className="relative text-sm h-9"
+						onClick={handleUseGlobalConfig}
+						disabled={isSubmitting}
+					>
+						<span className={isSubmitting ? "opacity-0" : ""}>Use This Model</span>
+						{isSubmitting && <Spinner size="sm" className="absolute" />}
+					</Button>
 					) : null}
 				</div>
 			</DialogContent>