diff --git a/client/src/components/Auth/ErrorMessage.tsx b/client/src/components/Auth/ErrorMessage.tsx
index 383ff9a930..562212bda9 100644
--- a/client/src/components/Auth/ErrorMessage.tsx
+++ b/client/src/components/Auth/ErrorMessage.tsx
@@ -1,9 +1,12 @@
+import { Alert } from '@librechat/client';
+
 export const ErrorMessage = ({ children }: { children: React.ReactNode }) => (
-  <div
-    role="alert"
+  <Alert
+    variant="error"
+    icon={false}
     aria-live="assertive"
-    className="relative mt-6 rounded-xl border border-red-500/20 bg-red-50/50 px-6 py-4 text-red-700 shadow-sm transition-all dark:bg-red-950/30 dark:text-red-100"
+    className="mt-6 px-6 py-4 shadow-sm transition-all"
   >
     {children}
-  </div>
+  </Alert>
 );
diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsx
index 10996847fe..d95954cf00 100644
--- a/client/src/components/Auth/RequestPasswordReset.tsx
+++ b/client/src/components/Auth/RequestPasswordReset.tsx
@@ -1,6 +1,6 @@
 import { useForm } from 'react-hook-form';
 import { useState, ReactNode } from 'react';
-import { Spinner, Button } from '@librechat/client';
+import { Spinner, Button, Alert } from '@librechat/client';
 import { useOutletContext } from 'react-router-dom';
 import { useRequestPasswordResetMutation } from 'librechat-data-provider/react-query';
 import { loginPage } from 'librechat-data-provider';
@@ -11,12 +11,9 @@ import { useLocalize } from '~/hooks';
 
 const BodyTextWrapper: FC<{ children: ReactNode }> = ({ children }) => {
   return (
-    <div
-      className="relative mt-6 rounded-xl border border-green-500/20 bg-green-50/50 px-6 py-4 text-green-700 shadow-sm transition-all dark:bg-green-950/30 dark:text-green-100"
-      role="alert"
-    >
+    <Alert variant="success" icon={false} className="mt-6 px-6 py-4 shadow-sm transition-all">
       {children}
-    </div>
+    </Alert>
   );
 };
 
diff --git a/client/src/components/Tools/AssistantToolsDialog.tsx b/client/src/components/Tools/AssistantToolsDialog.tsx
index 98e8043ebe..7124afe5af 100644
--- a/client/src/components/Tools/AssistantToolsDialog.tsx
+++ b/client/src/components/Tools/AssistantToolsDialog.tsx
@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
 import { Search, X } from 'lucide-react';
+import { Alert } from '@librechat/client';
 import { Dialog, DialogPanel, DialogTitle, Description } from '@headlessui/react';
 import { useFormContext } from 'react-hook-form';
 import { isAgentsEndpoint } from 'librechat-data-provider';
@@ -186,12 +187,9 @@ function AssistantToolsDialog({
             </div>
           </div>
           {error && (
-            <div
-              className="relative m-4 rounded border border-red-400 bg-red-100 px-4 py-3 text-red-700"
-              role="alert"
-            >
+            <Alert variant="error" icon={false} className="m-4">
               {localize('com_nav_plugin_auth_error')} {errorMessage}
-            </div>
+            </Alert>
           )}
           {showPluginAuthForm && (
             <div className="p-4 sm:p-6 sm:pt-4">
diff --git a/packages/client/src/components/Alert.tsx b/packages/client/src/components/Alert.tsx
new file mode 100644
index 0000000000..49155d1c23
--- /dev/null
+++ b/packages/client/src/components/Alert.tsx
@@ -0,0 +1,56 @@
+import * as React from 'react';
+import { Info, AlertCircle, AlertTriangle, CheckCircle2 } from 'lucide-react';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { cn } from '~/utils';
+
+const alertVariants = cva('relative flex gap-3 rounded-xl border px-4 py-3 text-sm', {
+  variants: {
+    variant: {
+      info: 'border-status-info bg-status-info-subtle text-status-info',
+      success: 'border-status-success bg-status-success-subtle text-status-success',
+      warning: 'border-status-warning bg-status-warning-subtle text-status-warning',
+      error: 'border-status-error bg-status-error-subtle text-status-error',
+      neutral: 'border-status-neutral bg-status-neutral-subtle text-status-neutral',
+    },
+  },
+  defaultVariants: {
+    variant: 'info',
+  },
+});
+
+type AlertVariant = NonNullable<VariantProps<typeof alertVariants>['variant']>;
+
+const defaultIcons: Record<AlertVariant, React.ComponentType<{ className?: string }>> = {
+  info: Info,
+  success: CheckCircle2,
+  warning: AlertTriangle,
+  error: AlertCircle,
+  neutral: Info,
+};
+
+export interface AlertProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    VariantProps<typeof alertVariants> {
+  /** Override the default per-variant icon, or pass `false` to hide it. */
+  icon?: React.ReactNode | false;
+}
+
+const Alert = React.forwardRef<HTMLDivElement, AlertProps>(
+  ({ className, variant = 'info', icon, role = 'alert', children, ...props }, ref) => {
+    const resolvedVariant = (variant ?? 'info') as AlertVariant;
+    const DefaultIcon = defaultIcons[resolvedVariant];
+    return (
+      <div ref={ref} role={role} className={cn(alertVariants({ variant }), className)} {...props}>
+        {icon !== false && (
+          <span className="mt-0.5 shrink-0" aria-hidden="true">
+            {icon ?? <DefaultIcon className="size-4" />}
+          </span>
+        )}
+        <div className="min-w-0 flex-1">{children}</div>
+      </div>
+    );
+  },
+);
+Alert.displayName = 'Alert';
+
+export { Alert, alertVariants };
diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts
index e3e66b7559..0080307858 100644
--- a/packages/client/src/components/index.ts
+++ b/packages/client/src/components/index.ts
@@ -1,5 +1,6 @@
 export * from './Accordion';
 export * from './AnimatedTabs';
+export * from './Alert';
 export * from './AlertDialog';
 export * from './Breadcrumb';
 export * from './Button';