diff --git a/src/components/admin/AdminOrdersPanel.tsx b/src/components/admin/AdminOrdersPanel.tsx
index 2701ced..3b01c12 100644
--- a/src/components/admin/AdminOrdersPanel.tsx
+++ b/src/components/admin/AdminOrdersPanel.tsx
@@ -16,19 +16,14 @@ import { markPickupComplete } from "@/actions/pickup";
 import { createAdminOrder, type AdminCreateOrderItem } from "@/actions/orders/create-admin-order";
 import { formatDate } from "@/lib/format-date";
 import AdminBadge from "./design-system/AdminBadge";
-import {
-  AdminButton,
-  AdminSearchInput,
-  AdminFilterTabs,
-  AdminIconButton,
-  useToast,
-  AdminInput,
-  AdminTextInput,
-  AdminSelect,
-  EmptyState,
-  KPIStat,
-} from "./design-system";
-import { Skeleton } from "./design-system";
+import AdminButton, { AdminIconButton } from "./design-system/AdminButton";
+import AdminSearchInput from "./design-system/AdminSearchInput";
+import AdminFilterTabs from "./design-system/AdminFilterTabs";
+import { useToast } from "./Toast";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import EmptyState from "./EmptyState";
+import KPIStat from "./KPIStat";
+import { Skeleton } from "./design-system/Skeleton";
 
 type OrderItem = {
   id: string;
diff --git a/src/components/admin/BrandSettingsForm.tsx b/src/components/admin/BrandSettingsForm.tsx
index 358916c..b9bda33 100644
--- a/src/components/admin/BrandSettingsForm.tsx
+++ b/src/components/admin/BrandSettingsForm.tsx
@@ -10,7 +10,7 @@ import {
   uploadOlatheSweetLogoDark,
   type BrandSettings,
 } from "@/actions/brand-settings";
-import { AdminInput, AdminTextInput, AdminTextarea, AdminSelect } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminTextarea, AdminSelect  } from "./design-system/AdminFormElements";
 
 type Props = {
   settings: BrandSettings | null;
diff --git a/src/components/admin/ContactListPanel.tsx b/src/components/admin/ContactListPanel.tsx
index 0c9fc54..0b8e1bf 100644
--- a/src/components/admin/ContactListPanel.tsx
+++ b/src/components/admin/ContactListPanel.tsx
@@ -4,7 +4,7 @@ import { useState, useCallback } from "react";
 import type { Contact, ContactSource } from "@/actions/communications/contacts";
 import { getContacts, deleteContact, exportContacts } from "@/actions/communications/contacts";
 import { formatDate } from "@/lib/format-date";
-import { AdminButton } from "./design-system";
+import AdminButton from "./design-system/AdminButton";
 
 const SOURCE_COLORS: Record<ContactSource, string> = {
   order: "bg-blue-100 text-blue-700",
diff --git a/src/components/admin/HeadgateEditForm.tsx b/src/components/admin/HeadgateEditForm.tsx
index 89801f5..4dad80a 100644
--- a/src/components/admin/HeadgateEditForm.tsx
+++ b/src/components/admin/HeadgateEditForm.tsx
@@ -3,8 +3,8 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { updateWaterHeadgate, deleteWaterHeadgate } from "@/actions/water-log/admin";
-import { AdminInput, AdminTextInput, AdminSelect } from "./design-system";
-import { AdminButton } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
 
 type Headgate = {
   id: string;
diff --git a/src/components/admin/MessageLogPanel.tsx b/src/components/admin/MessageLogPanel.tsx
index 0c0cec0..1a01319 100644
--- a/src/components/admin/MessageLogPanel.tsx
+++ b/src/components/admin/MessageLogPanel.tsx
@@ -4,7 +4,7 @@
 import { useState, useEffect, useCallback } from "react";
 import { getMessageLogs, type MessageLogEntry } from "@/actions/communications/send";
 import { formatDate } from "@/lib/format-date";
-import { AdminButton } from "./design-system";
+import AdminButton from "./design-system/AdminButton";
 
 const PAGE_SIZE = 20;
 
diff --git a/src/components/admin/NewProductForm.tsx b/src/components/admin/NewProductForm.tsx
index b487b92..1eaa7ec 100644
--- a/src/components/admin/NewProductForm.tsx
+++ b/src/components/admin/NewProductForm.tsx
@@ -6,7 +6,7 @@ import { useState, useRef } from "react";
 import { useRouter } from "next/navigation";
 import { uploadProductImage } from "@/actions/products/upload-image";
 import { createProduct } from "@/actions/products/create-product";
-import { AdminInput, AdminTextInput, AdminTextarea, AdminSelect } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminTextarea, AdminSelect  } from "./design-system/AdminFormElements";
 
 async function resizeImage(file: File, maxWidth: number): Promise<ArrayBuffer> {
   return new Promise((resolve, reject) => {
diff --git a/src/components/admin/NewStopForm.tsx b/src/components/admin/NewStopForm.tsx
index 470724e..4013bfc 100644
--- a/src/components/admin/NewStopForm.tsx
+++ b/src/components/admin/NewStopForm.tsx
@@ -4,7 +4,9 @@ import { useState } from "react";
 import { useRouter } from "next/navigation";
 import Link from "next/link";
 import { createStop } from "@/actions/stops/create-stop";
-import { AdminInput, AdminTextInput, AdminSelect, AdminButton, useToast } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
+import { useToast } from "./Toast";
 
 type Stop = {
   city: string;
diff --git a/src/components/admin/OrderEditForm.tsx b/src/components/admin/OrderEditForm.tsx
index fa5716f..fe44db2 100644
--- a/src/components/admin/OrderEditForm.tsx
+++ b/src/components/admin/OrderEditForm.tsx
@@ -3,7 +3,9 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { updateOrder, updateOrderItem, deleteOrderItem } from "@/actions/orders/update-order";
-import { AdminInput, AdminTextInput, AdminTextarea, useToast, AdminButton } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminTextarea  } from "./design-system/AdminFormElements";
+import { useToast } from "./Toast";
+import AdminButton from "./design-system/AdminButton";
 
 type OrderItem = {
   id: string;
diff --git a/src/components/admin/OrderPaymentSection.tsx b/src/components/admin/OrderPaymentSection.tsx
index 1be7d6c..176d0c0 100644
--- a/src/components/admin/OrderPaymentSection.tsx
+++ b/src/components/admin/OrderPaymentSection.tsx
@@ -5,7 +5,8 @@ import { useRouter } from "next/navigation";
 import { formatDate } from "@/lib/format-date";
 import { updateOrder } from "@/actions/orders/update-order";
 import { createRefund } from "@/actions/orders/create-refund";
-import { useToast, AdminButton, AdminInput } from "./design-system";
+import { useToast } from "./Toast";
+import AdminButton from "./design-system/AdminButton";
 
 type Refund = {
   id: string;
diff --git a/src/components/admin/PaymentSettingsForm.tsx b/src/components/admin/PaymentSettingsForm.tsx
index 3f7f10a..ec3bacd 100644
--- a/src/components/admin/PaymentSettingsForm.tsx
+++ b/src/components/admin/PaymentSettingsForm.tsx
@@ -6,8 +6,9 @@ import { useState, useEffect } from "react";
 import { savePaymentSettings, type PaymentProvider, type PaymentSettings } from "@/actions/payments";
 import { syncSquareNow, getSyncLog, type SyncLogEntry } from "@/actions/square-sync-ui";
 import WebhookLogsSection from "@/components/admin/WebhookLogsSection";
-import { AdminInput, AdminTextInput, AdminSelect, AdminButton } from "./design-system";
-import { AdminToggle } from "./design-system/AdminToggle";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
+import AdminToggle from "./design-system/AdminToggle";
 
 type InventoryMode = "none" | "rc_to_square" | "square_to_rc" | "bidirectional";
 
diff --git a/src/components/admin/ProductEditForm.tsx b/src/components/admin/ProductEditForm.tsx
index 8d95c96..10ec613 100644
--- a/src/components/admin/ProductEditForm.tsx
+++ b/src/components/admin/ProductEditForm.tsx
@@ -6,7 +6,7 @@ import { useState, useRef } from "react";
 import { useRouter } from "next/navigation";
 import { uploadProductImage, deleteProductImage } from "@/actions/products/upload-image";
 import { updateProduct } from "@/actions/products/update-product";
-import { AdminInput, AdminTextInput, AdminTextarea, AdminSelect } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminTextarea, AdminSelect  } from "./design-system/AdminFormElements";
 
 async function resizeImage(file: File, maxWidth: number): Promise<ArrayBuffer> {
   return new Promise((resolve, reject) => {
diff --git a/src/components/admin/SettingsSections.tsx b/src/components/admin/SettingsSections.tsx
index 8458cfd..6fad3e3 100644
--- a/src/components/admin/SettingsSections.tsx
+++ b/src/components/admin/SettingsSections.tsx
@@ -20,8 +20,9 @@ import {
   type TimeTrackingSettings,
   type NotificationLogEntry,
 } from "@/actions/time-tracking";
-import { AdminToggle } from "./design-system/AdminToggle";
-import { AdminInput, AdminTextInput, AdminSelect, AdminButton } from "./design-system";
+import AdminToggle from "./design-system/AdminToggle";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
 
 const DAYS = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 
diff --git a/src/components/admin/ShippingFulfillmentPanel.tsx b/src/components/admin/ShippingFulfillmentPanel.tsx
index 65f85a0..502a02a 100644
--- a/src/components/admin/ShippingFulfillmentPanel.tsx
+++ b/src/components/admin/ShippingFulfillmentPanel.tsx
@@ -6,15 +6,13 @@ import { Truck, Search, Package, ExternalLink, Sprout, X } from "lucide-react";
 import { updateShippingStatus } from "@/actions/shipping";
 import { getFedExRates, type FedExRate, type FedExServiceType } from "@/actions/shipping/fedex-rates";
 import { createFedExShipment } from "@/actions/shipping/fedex-labels";
-import {
-  AdminButton,
-  AdminSearchInput,
-  AdminFilterTabs,
-  AdminBadge,
-  AdminEmptyState,
-  AdminCard,
-  GlassModal,
-} from "./design-system";
+import AdminButton from "./design-system/AdminButton";
+import AdminSearchInput from "./design-system/AdminSearchInput";
+import AdminFilterTabs from "./design-system/AdminFilterTabs";
+import AdminBadge from "./design-system/AdminBadge";
+import AdminEmptyState from "./design-system/AdminEmptyState";
+import AdminCard from "./design-system/AdminCard";
+import GlassModal from "./GlassModal";
 
 type OrderItem = {
   id: string;
diff --git a/src/components/admin/ShippingSettingsForm.tsx b/src/components/admin/ShippingSettingsForm.tsx
index b57438d..1b2c763 100644
--- a/src/components/admin/ShippingSettingsForm.tsx
+++ b/src/components/admin/ShippingSettingsForm.tsx
@@ -7,8 +7,9 @@ import {
   testFedExConnection,
   type ShippingSettings,
 } from "@/actions/shipping/settings";
-import { AdminInput, AdminTextInput, AdminTextarea, AdminSelect, AdminButton } from "./design-system";
-import { AdminToggle } from "./design-system/AdminToggle";
+import { AdminInput,  AdminTextInput, AdminTextarea, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
+import AdminToggle from "./design-system/AdminToggle";
 
 const SERVICE_OPTIONS = [
   { value: "FEDEX_OVERNIGHT", label: "FedEx Overnight" },
diff --git a/src/components/admin/StopEditForm.tsx b/src/components/admin/StopEditForm.tsx
index c87b498..6654053 100644
--- a/src/components/admin/StopEditForm.tsx
+++ b/src/components/admin/StopEditForm.tsx
@@ -3,7 +3,9 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { updateStop } from "@/actions/stops/update-stop";
-import { AdminInput, AdminTextInput, AdminSelect, AdminButton, useToast } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
+import { useToast } from "./Toast";
 
 type Brand = {
   id: string;
diff --git a/src/components/admin/TimeTrackingAdminPanel.tsx b/src/components/admin/TimeTrackingAdminPanel.tsx
index 3079491..42969c0 100644
--- a/src/components/admin/TimeTrackingAdminPanel.tsx
+++ b/src/components/admin/TimeTrackingAdminPanel.tsx
@@ -21,7 +21,8 @@ import {
 } from "@/actions/time-tracking";
 import { formatDate } from "@/lib/format-date";
 import TimeTrackingSettingsClient from "./TimeTrackingSettingsClient";
-import { AdminButton, AdminFilterTabs } from "./design-system";
+import AdminButton from "./design-system/AdminButton";
+import AdminFilterTabs from "./design-system/AdminFilterTabs";
 
 // One-color outline icons
 const Icons = {
diff --git a/src/components/admin/WaterLogAdminPanel.tsx b/src/components/admin/WaterLogAdminPanel.tsx
index 3cd51d6..c733bdb 100644
--- a/src/components/admin/WaterLogAdminPanel.tsx
+++ b/src/components/admin/WaterLogAdminPanel.tsx
@@ -48,7 +48,7 @@ import {
   type WaterLogReportRow,
 } from "@/lib/water-log-reporting";
 import { WaterGauge, SeasonMark } from "@/components/water/icons";
-import { AdminButton } from "./design-system";
+import AdminButton from "./design-system/AdminButton";
 import { formatDate, formatDateTime } from "@/lib/format-date";
 
 type Props = {
diff --git a/src/components/admin/WaterLogEntryEditForm.tsx b/src/components/admin/WaterLogEntryEditForm.tsx
index 20ad5e3..62d801b 100644
--- a/src/components/admin/WaterLogEntryEditForm.tsx
+++ b/src/components/admin/WaterLogEntryEditForm.tsx
@@ -3,7 +3,8 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { updateWaterEntry, deleteWaterEntry } from "@/actions/water-log/admin";
-import { AdminInput, AdminTextInput, AdminTextarea, AdminSelect, AdminButton } from "./design-system";
+import { AdminInput,  AdminTextInput, AdminTextarea, AdminSelect  } from "./design-system/AdminFormElements";
+import AdminButton from "./design-system/AdminButton";
 
 type WaterEntry = {
   id: string;
diff --git a/src/components/admin/WaterUserEditForm.tsx b/src/components/admin/WaterUserEditForm.tsx
index 6a3d31b..ee29cea 100644
--- a/src/components/admin/WaterUserEditForm.tsx
+++ b/src/components/admin/WaterUserEditForm.tsx
@@ -3,7 +3,7 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { updateWaterIrrigator, resetWaterIrrigatorPin, deleteWaterUser } from "@/actions/water-log/admin";
-import { AdminButton } from "./design-system";
+import AdminButton from "./design-system/AdminButton";
 
 type WaterUser = {
   id: string;