diff --git a/frontend/src/app/(dashboard)/appointments/page.tsx b/frontend/src/app/(dashboard)/appointments/page.tsx
index ead192c..1f6a85b 100644
--- a/frontend/src/app/(dashboard)/appointments/page.tsx
+++ b/frontend/src/app/(dashboard)/appointments/page.tsx
@@ -14,9 +14,10 @@ import { AppointmentScheduleGrid } from '@/components/ui/appointments/Appointmen
 import { AppointmentsPatientSearch } from '@/components/ui/appointments/AppointmentsPatientSearch';
 import { AppointmentScheduleLegend } from '@/components/ui/appointments/AppointmentScheduleLegend';
 import { ScheduleDayPicker } from '@/components/ui/common/ScheduleDayPicker';
+import { Toast } from '@/components/ui/common/Toast';
 import type { AppointmentPurpose } from '@/types/appointment';
 import { formatApiErrorMessage } from '@/lib/formatApiError';
-import { getLocalDayIsoRange, startOfLocalDay } from '@/lib/appointmentTime';
+import { compareLocalDayStart, getLocalDayIsoRange, startOfLocalDay } from '@/lib/appointmentTime';
 
 const EMPTY_PATIENT_FORM: CreatePatientInput = {
   firstName: '',
@@ -47,6 +48,7 @@ export default function AppointmentsPage() {
   const [bookingHour, setBookingHour] = useState(9);
   const [bookingProviderId, setBookingProviderId] = useState<string | null>(null);
   const [bookingProviderName, setBookingProviderName] = useState('');
+  const [editingAppointmentId, setEditingAppointmentId] = useState<string | null>(null);
   const [savingAppointment, setSavingAppointment] = useState(false);
 
   const [toastError, setToastError] = useState('');
@@ -57,6 +59,14 @@ export default function AppointmentsPage() {
   const canEditPatients = hasPermission(currentOrganization, 'TAB_PATIENTS_EDIT');
 
   const todayStart = useMemo(() => startOfLocalDay(new Date()), []);
+  const isViewingPastDay = useMemo(
+    () => compareLocalDayStart(scheduleDate, todayStart) < 0,
+    [scheduleDate, todayStart],
+  );
+  const activeEditingAppointment = useMemo(
+    () => appointments.find((a) => a.id === editingAppointmentId) ?? null,
+    [appointments, editingAppointmentId],
+  );
 
   const scheduleLoadGen = useRef(0);
 
@@ -154,6 +164,12 @@ export default function AppointmentsPage() {
   }
 
   function handleSlotClick(hour: number, providerUserId: string, providerName: string) {
+    if (isViewingPastDay) {
+      setToastSuccess('');
+      setToastError('');
+      setToastInfo('Past appointments are view-only.');
+      return;
+    }
     if (!selectedPatient) {
       setToastSuccess('');
       setToastError('');
@@ -163,6 +179,22 @@ export default function AppointmentsPage() {
     setBookingHour(hour);
     setBookingProviderId(providerUserId);
     setBookingProviderName(providerName);
+    setEditingAppointmentId(null);
+    setBookingOpen(true);
+  }
+
+  function handleAppointmentClick(appointment: AppointmentRecord) {
+    if (isViewingPastDay) {
+      setToastSuccess('');
+      setToastError('');
+      setToastInfo('Past appointments are view-only.');
+      return;
+    }
+    const provider = providers.find((p) => p.userId === appointment.providerUserId);
+    setBookingHour(new Date(appointment.startAt).getHours());
+    setBookingProviderId(appointment.providerUserId);
+    setBookingProviderName(provider?.name ?? bookingProviderName);
+    setEditingAppointmentId(appointment.id);
     setBookingOpen(true);
   }
 
@@ -178,15 +210,22 @@ export default function AppointmentsPage() {
     setToastSuccess('');
     setToastInfo('');
     try {
-      await appointmentsApi.create(payload);
+      if (activeEditingAppointment) {
+        await appointmentsApi.update(activeEditingAppointment.id, payload);
+      } else {
+        await appointmentsApi.create(payload);
+      }
       setBookingOpen(false);
-      setToastSuccess('Appointment saved.');
+      setEditingAppointmentId(null);
+      setToastSuccess(activeEditingAppointment ? 'Appointment updated.' : 'Appointment saved.');
       await loadSchedule();
     } catch (err: unknown) {
       const message =
         err && typeof err === 'object' && 'message' in err
           ? String((err as { message: unknown }).message)
-          : 'Could not save appointment.';
+          : activeEditingAppointment
+            ? 'Could not update appointment.'
+            : 'Could not save appointment.';
       setToastError(message);
     } finally {
       setSavingAppointment(false);
@@ -280,20 +319,15 @@ export default function AppointmentsPage() {
             )}
           </div>
 
-          {scheduleError && (
-            <div className="rounded-[var(--radius-sm)] border border-red-500/50 bg-red-500/10 px-3 py-2 text-sm text-red-300">
-              {scheduleError}
-            </div>
-          )}
-
           <AppointmentScheduleGrid
             day={scheduleDate}
             providers={providers}
             appointments={appointments}
-            canBook={canManageAppointments}
+            canBook={canManageAppointments && !isViewingPastDay}
             canDelete={canManageAppointments}
             onDeleteAppointment={(id) => void handleDeleteAppointment(id)}
             onSlotClick={(hour, uid, name) => handleSlotClick(hour, uid, name)}
+            onAppointmentClick={(apt) => handleAppointmentClick(apt)}
           />
         </div>
       </div>
@@ -305,7 +339,11 @@ export default function AppointmentsPage() {
         providerUserId={bookingProviderId}
         providerName={bookingProviderName}
         initialHour={bookingHour}
-        onClose={() => setBookingOpen(false)}
+        editingAppointment={activeEditingAppointment}
+        onClose={() => {
+          setBookingOpen(false);
+          setEditingAppointmentId(null);
+        }}
         onSubmit={handleSaveAppointment}
         loading={savingAppointment}
       />
@@ -323,24 +361,13 @@ export default function AppointmentsPage() {
         </div>
       )}
 
-      {(toastError || toastSuccess || toastInfo) && (
-        <div className="fixed bottom-4 left-4 right-4 z-[70] flex justify-center pointer-events-none">
-          <div className="pointer-events-auto w-full max-w-lg space-y-2">
-            {toastError && (
-              <div className="rounded-[var(--radius-sm)] border border-red-500/50 bg-red-500/10 px-3 py-2 text-sm text-red-300 shadow-lg">
-                {toastError}
-              </div>
-            )}
-            {toastInfo && (
-              <div className="rounded-[var(--radius-sm)] border border-amber-500/45 bg-amber-500/10 px-3 py-2 text-sm text-amber-100 shadow-lg">
-                {toastInfo}
-              </div>
-            )}
-            {toastSuccess && (
-              <div className="rounded-[var(--radius-sm)] border border-emerald-500/50 bg-emerald-500/10 px-3 py-2 text-sm text-emerald-300 shadow-lg">
-                {toastSuccess}
-              </div>
-            )}
+      {(scheduleError || toastError || toastSuccess || toastInfo) && (
+        <div className="fixed bottom-4 left-0 right-0 z-[70] px-4 pointer-events-none">
+          <div className="pointer-events-auto w-full space-y-2">
+            {scheduleError && <Toast variant="danger">{scheduleError}</Toast>}
+            {toastError && <Toast variant="danger">{toastError}</Toast>}
+            {toastInfo && <Toast variant="warning">{toastInfo}</Toast>}
+            {toastSuccess && <Toast variant="success">{toastSuccess}</Toast>}
           </div>
         </div>
       )}
diff --git a/frontend/src/app/(dashboard)/billing/page.tsx b/frontend/src/app/(dashboard)/billing/page.tsx
index 6464010..b28de1c 100644
--- a/frontend/src/app/(dashboard)/billing/page.tsx
+++ b/frontend/src/app/(dashboard)/billing/page.tsx
@@ -4,6 +4,7 @@ import { useState } from 'react';
 import { Pencil } from 'lucide-react';
 import { Button } from '@/components/ui/common/Button';
 import { Badge } from '@/components/ui/common/Badge';
+import { Card } from '@/components/ui/common/Card';
 import { Table } from '@/components/ui/common/Table';
 import { SearchBar } from '@/components/ui/common/SearchBar';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -195,19 +196,19 @@ export default function BillingPage() {
 }
 function StatCard({ title, count, amount, color }: StatCardProps) {
     const colors: Record<StatCardColor, string> = {
-        blue: 'bg-sky-900/30 text-sky-300 border-sky-700/60',
-        yellow: 'bg-amber-900/30 text-amber-300 border-amber-700/60',
-        green: 'bg-emerald-900/30 text-emerald-300 border-emerald-700/60',
-        red: 'bg-red-950/30 text-red-300 border-red-700/60',
+        blue: '!bg-purpose-visit-bg !text-purpose-visit-fg !border-purpose-visit-border',
+        yellow: '!bg-badge-warning-bg !text-badge-warning-fg !border-badge-warning-border',
+        green: '!bg-badge-success-bg !text-badge-success-fg !border-badge-success-border',
+        red: '!bg-badge-danger-bg !text-badge-danger-fg !border-badge-danger-border',
     };
 
     return (
-        <div className={`p-4 rounded-xl border ${colors[color]}`}>
-            <p className="text-sm font-medium opacity-80">{title}</p>
+        <Card className={`${colors[color]}`}>
+            <p className="text-sm font-medium">{title}</p>
             <p className="text-2xl font-bold mt-1">{count}</p>
             <p className="text-sm font-medium mt-1">
                 ${amount.toLocaleString()}
             </p>
-        </div>
+        </Card>
     );
 }
diff --git a/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx b/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
index e5ab6b1..e6f6450 100644
--- a/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
+++ b/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { authApi } from '@/lib/api/auth';
 import { Button } from '@/components/ui/common/Button';
+import { Toast } from '@/components/ui/common/Toast';
 import type { SubscriptionAlertData } from '@/types/subscription';
 
 const PLAN_OPTIONS = [
@@ -69,7 +70,7 @@ export default function SubscriptionsSettingsPage() {
           : 'text-red-400';
 
   return (
-    <div className="space-y-6">
+    <div className="relative space-y-6 pb-24">
       <div>
         <Link
           href="/today"
@@ -189,13 +190,16 @@ export default function SubscriptionsSettingsPage() {
           >
             Start purchase process
           </Button>
-          {purchaseNotice && (
-            <div className="rounded-[var(--radius-md)] border border-emerald-500/30 bg-emerald-500/10 px-4 py-3">
-              <p className="text-sm text-emerald-200">{purchaseNotice}</p>
-            </div>
-          )}
         </div>
       </div>
+
+      {purchaseNotice && (
+        <div className="fixed bottom-4 left-0 right-0 z-[70] px-4 pointer-events-none">
+          <div className="pointer-events-auto w-full">
+            <Toast variant="success">{purchaseNotice}</Toast>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/frontend/src/app/(dashboard)/today/page.tsx b/frontend/src/app/(dashboard)/today/page.tsx
index 5ac0d34..7ac754e 100644
--- a/frontend/src/app/(dashboard)/today/page.tsx
+++ b/frontend/src/app/(dashboard)/today/page.tsx
@@ -2,6 +2,7 @@
 
 import Link from 'next/link';
 import { useAuth } from '@/lib/hooks/useAuth';
+import { Card } from '@/components/ui/common/Card';
 
 export default function TodayPage() {
   const { currentOrganization } = useAuth();
@@ -27,29 +28,26 @@ export default function TodayPage() {
       )}
 
       <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-4">
-        <Card title="Today's Appointments" value="12" sub="Monday 2/5/2026" />
-        <Card title="Active Patients" value="675" />
-        <Card title="New Lab Case" value="5" sub="35 ↑" />
-        <Card title="Today invoices" value="1200$" sub="21,300 $" />
+        <Card>
+          <p className="text-sm text-card-muted">Today's Appointments</p>
+          <p className="text-2xl font-semibold mt-2">12</p>
+          <p className="text-xs text-text-muted mt-1">Monday 2/5/2026</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">Active Patients</p>
+          <p className="text-2xl font-semibold mt-2">675</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">New Lab Case</p>
+          <p className="text-2xl font-semibold mt-2">5</p>
+          <p className="text-xs text-text-muted mt-1">35 ↑</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">Today invoices</p>
+          <p className="text-2xl font-semibold mt-2">1200$</p>
+          <p className="text-xs text-text-muted mt-1">21,300 $</p>
+        </Card>
       </div>
     </div>
   );
-}
-
-function Card({
-  title,
-  value,
-  sub,
-}: {
-  title: string;
-  value: string;
-  sub?: string;
-}) {
-  return (
-    <div className="surface-card p-4">
-      <p className="text-sm text-text-secondary">{title}</p>
-      <p className="text-2xl font-semibold mt-2">{value}</p>
-      {sub && <p className="text-xs text-text-muted mt-1">{sub}</p>}
-    </div>
-  );
 }
\ No newline at end of file
diff --git a/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx b/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
index d5f4903..770f753 100644
--- a/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
@@ -4,11 +4,12 @@ import { useEffect, useState } from 'react';
 import { X } from 'lucide-react';
 import { Button } from '@/components/ui/common/Button';
 import { Dropdown } from '@/components/ui/common/Dropdown';
-import type { AppointmentPurpose } from '@/types/appointment';
+import type { AppointmentPurpose, AppointmentRecord } from '@/types/appointment';
 import { APPOINTMENT_PURPOSE_LABEL } from '@/components/ui/appointments/appointmentPurposeStyles';
 import type { Patient } from '@/types/patient';
 import {
   combineLocalDateAndTime,
+  compareLocalDayStart,
   formatTimeForInput,
   isSameLocalCalendarDay,
 } from '@/lib/appointmentTime';
@@ -28,6 +29,7 @@ interface AppointmentBookingModalProps {
     endAt: string;
     purpose: AppointmentPurpose;
   }) => Promise<void>;
+  editingAppointment?: AppointmentRecord | null;
   loading?: boolean;
 }
 
@@ -40,6 +42,7 @@ export function AppointmentBookingModal({
   initialHour,
   onClose,
   onSubmit,
+  editingAppointment = null,
   loading = false,
 }: AppointmentBookingModalProps) {
   const [startTime, setStartTime] = useState('09:00');
@@ -61,29 +64,37 @@ export function AppointmentBookingModal({
     if (!open) {
       return;
     }
-    const start = new Date(
-      scheduleDate.getFullYear(),
-      scheduleDate.getMonth(),
-      scheduleDate.getDate(),
-      initialHour,
-      0,
-      0,
-      0,
-    );
-    const end = new Date(
-      scheduleDate.getFullYear(),
-      scheduleDate.getMonth(),
-      scheduleDate.getDate(),
-      initialHour < 23 ? initialHour + 1 : 23,
-      initialHour < 23 ? 0 : 59,
-      0,
-      0,
-    );
-    setStartTime(formatTimeForInput(start));
-    setEndTime(formatTimeForInput(end));
-    setPurpose('consultation');
+    if (editingAppointment) {
+      const start = new Date(editingAppointment.startAt);
+      const end = new Date(editingAppointment.endAt);
+      setStartTime(formatTimeForInput(start));
+      setEndTime(formatTimeForInput(end));
+      setPurpose((editingAppointment.purpose as AppointmentPurpose) ?? 'consultation');
+    } else {
+      const start = new Date(
+        scheduleDate.getFullYear(),
+        scheduleDate.getMonth(),
+        scheduleDate.getDate(),
+        initialHour,
+        0,
+        0,
+        0,
+      );
+      const end = new Date(
+        scheduleDate.getFullYear(),
+        scheduleDate.getMonth(),
+        scheduleDate.getDate(),
+        initialHour < 23 ? initialHour + 1 : 23,
+        initialHour < 23 ? 0 : 59,
+        0,
+        0,
+      );
+      setStartTime(formatTimeForInput(start));
+      setEndTime(formatTimeForInput(end));
+      setPurpose('consultation');
+    }
     setError('');
-  }, [open, scheduleDate, initialHour]);
+  }, [open, scheduleDate, initialHour, editingAppointment]);
 
   if (!open || !providerUserId) {
     return null;
@@ -97,7 +108,7 @@ export function AppointmentBookingModal({
     if (!providerUserId) {
       return;
     }
-    if (!patient) {
+    if (!editingAppointment && !patient) {
       setError('Select a patient first.');
       return;
     }
@@ -116,9 +127,22 @@ export function AppointmentBookingModal({
       return;
     }
 
+    const today = new Date();
+    if (compareLocalDayStart(scheduleDate, today) < 0) {
+      setError('Past appointments are view-only.');
+      return;
+    }
+
+    const effectivePatientId = editingAppointment?.patientId ?? patient?.id;
+    const effectiveProviderId = editingAppointment?.providerUserId ?? providerUserId;
+    if (!effectivePatientId || !effectiveProviderId) {
+      setError('Missing appointment details.');
+      return;
+    }
+
     await onSubmit({
-      patientId: patient.id,
-      providerUserId,
+      patientId: effectivePatientId,
+      providerUserId: effectiveProviderId,
       startAt: startAt.toISOString(),
       endAt: endAt.toISOString(),
       purpose,
@@ -135,7 +159,7 @@ export function AppointmentBookingModal({
       >
         <div className="flex items-start justify-between gap-2">
           <h2 id="appointment-modal-title" className="text-lg font-semibold text-text-primary pr-2">
-            New appointment
+            {editingAppointment ? 'Edit appointment' : 'New appointment'}
           </h2>
           <button
             type="button"
@@ -154,7 +178,11 @@ export function AppointmentBookingModal({
         <div>
           <label className="block text-sm font-medium text-text-secondary mb-1">Patient</label>
           <p className="text-sm text-text-primary rounded-[var(--radius-md)] border border-border bg-background-secondary/60 px-3 py-2">
-            {patient ? `${patient.firstName} ${patient.lastName}` : '—'}
+            {editingAppointment
+              ? `${editingAppointment.patient.firstName} ${editingAppointment.patient.lastName}`
+              : patient
+                ? `${patient.firstName} ${patient.lastName}`
+                : '—'}
           </p>
         </div>
 
diff --git a/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx b/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
index fd0a98f..acb47a4 100644
--- a/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
@@ -3,7 +3,10 @@
 import { Trash2 } from 'lucide-react';
 import type { AppointmentColumnProvider, AppointmentRecord } from '@/types/appointment';
 import { formatHourLabel } from '@/lib/appointmentTime';
-import { purposeDeleteIconClass, purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
+import {
+  purposeDeleteIconClass,
+  purposeStyle,
+} from '@/components/ui/appointments/appointmentPurposeStyles';
 
 const HOUR_PX = 40;
 const HOURS = Array.from({ length: 24 }, (_, i) => i);
@@ -32,6 +35,7 @@ interface AppointmentScheduleGridProps {
   canDelete?: boolean;
   onDeleteAppointment?: (id: string) => void;
   onSlotClick: (hour: number, providerUserId: string, providerName: string) => void;
+  onAppointmentClick?: (appointment: AppointmentRecord) => void;
 }
 
 export function AppointmentScheduleGrid({
@@ -42,6 +46,7 @@ export function AppointmentScheduleGrid({
   canDelete = false,
   onDeleteAppointment,
   onSlotClick,
+  onAppointmentClick,
 }: AppointmentScheduleGridProps) {
   const gridHeight = HOURS.length * HOUR_PX;
 
@@ -117,9 +122,11 @@ export function AppointmentScheduleGrid({
                       return null;
                     }
                     return (
-                      <div
+                      <button
+                        type="button"
                         key={apt.id}
-                        className={`absolute left-0.5 right-0.5 rounded-[var(--radius-sm)] border pointer-events-none z-10 flex flex-row items-center gap-1.5 px-1.5 py-1 min-h-[36px] ${purposeStyle(apt.purpose)}`}
+                        onClick={() => onAppointmentClick?.(apt)}
+                        className={`absolute left-0.5 right-0.5 rounded-[var(--radius-sm)] border pointer-events-auto z-10 flex flex-row items-center gap-1.5 px-1.5 py-1 min-h-[36px] text-left ${purposeStyle(apt.purpose)} focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/35`}
                         style={{ top: pos.top, height: pos.height, minHeight: 36 }}
                       >
                         <div className="pointer-events-none flex-1 min-w-0 overflow-hidden text-left">
@@ -133,7 +140,7 @@ export function AppointmentScheduleGrid({
                         {canDelete && onDeleteAppointment && (
                           <button
                             type="button"
-                            className="group pointer-events-auto shrink-0 self-center z-20 mr-2 ml-1 inline-flex cursor-pointer items-center justify-center rounded-[var(--radius-sm)] border-0 bg-transparent p-1 outline-none focus-visible:ring-2 focus-visible:ring-primary/35"
+                            className="group pointer-events-auto shrink-0 self-center z-20 mr-0.5 ml-0.5 inline-flex cursor-pointer items-center justify-center rounded-[var(--radius-sm)] bg-transparent p-1 outline-none focus-visible:ring-2 focus-visible:ring-primary/35"
                             aria-label="Delete appointment"
                             title="Delete appointment"
                             onClick={(e) => {
@@ -144,7 +151,7 @@ export function AppointmentScheduleGrid({
                             <Trash2 className={`w-4 h-4 ${purposeDeleteIconClass(apt.purpose)}`} />
                           </button>
                         )}
-                      </div>
+                      </button>
                     );
                   })}
               </div>
diff --git a/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts b/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
index 6b1e5e5..6230ad5 100644
--- a/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
+++ b/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
@@ -10,11 +10,12 @@ export const APPOINTMENT_PURPOSE_LABEL: Record<AppointmentPurpose, string> = {
 
 /** Background + border for blocks / legend (matches reference palette). */
 export const APPOINTMENT_PURPOSE_STYLES: Record<AppointmentPurpose, string> = {
-  consultation: 'bg-violet-500/25 border-violet-400/50 text-violet-100',
-  filling: 'bg-orange-500/25 border-orange-400/50 text-orange-100',
-  endo: 'bg-red-500/25 border-red-400/50 text-red-100',
-  visit: 'bg-sky-500/25 border-sky-400/50 text-sky-100',
-  hygiene: 'bg-lime-500/20 border-lime-400/45 text-lime-100',
+  consultation:
+    'bg-purpose-consultation-bg border-purpose-consultation-border text-purpose-consultation-fg',
+  filling: 'bg-purpose-filling-bg border-purpose-filling-border text-purpose-filling-fg',
+  endo: 'bg-purpose-endo-bg border-purpose-endo-border text-purpose-endo-fg',
+  visit: 'bg-purpose-visit-bg border-purpose-visit-border text-purpose-visit-fg',
+  hygiene: 'bg-purpose-hygiene-bg border-purpose-hygiene-border text-purpose-hygiene-fg',
 };
 
 export function purposeStyle(purpose: string): string {
@@ -26,13 +27,13 @@ export function purposeStyle(purpose: string): string {
 export function purposeDeleteIconClass(purpose: string): string {
   const p = purpose as AppointmentPurpose;
   const map: Record<AppointmentPurpose, string> = {
-    consultation: '!text-violet-400 group-hover:!text-violet-300',
-    filling: '!text-orange-400 group-hover:!text-orange-300',
-    endo: '!text-red-400 group-hover:!text-red-300',
-    visit: '!text-sky-400 group-hover:!text-sky-300',
-    hygiene: '!text-lime-600 group-hover:!text-lime-500',
+    consultation: '!text-purpose-consultation-fg',
+    filling: '!text-purpose-filling-fg',
+    endo: '!text-purpose-endo-fg',
+    visit: '!text-purpose-visit-fg',
+    hygiene: '!text-purpose-hygiene-fg',
   };
-  return map[p] ?? '!text-text-muted group-hover:!text-text-secondary';
+  return map[p] ?? '!text-text-muted';
 }
 
 /** Small swatch for legend (background + border only). */
diff --git a/frontend/src/components/ui/common/Badge.tsx b/frontend/src/components/ui/common/Badge.tsx
index afc8f5f..823419d 100644
--- a/frontend/src/components/ui/common/Badge.tsx
+++ b/frontend/src/components/ui/common/Badge.tsx
@@ -14,10 +14,10 @@ interface BadgeProps {
 }
 
 const variantStyles: Record<BadgeVariant, string> = {
-  success: 'bg-emerald-900/30 text-emerald-300 border-emerald-700/60',
-  warning: 'bg-amber-900/30 text-amber-300 border-amber-700/60',
-  danger: 'bg-red-950/30 text-red-300 border-red-700/60',
-  default: 'bg-background-secondary text-text-secondary border-border',
+  success: 'bg-badge-success-bg text-badge-success-fg border-badge-success-border',
+  warning: 'bg-badge-warning-bg text-badge-warning-fg border-badge-warning-border',
+  danger: 'bg-badge-danger-bg text-badge-danger-fg border-badge-danger-border',
+  default: 'bg-badge-default-bg text-badge-default-fg border-badge-default-border',
 };
 
 /** Explicit width + height so every row matches; flex centers label optically. */
diff --git a/frontend/src/components/ui/common/Card.tsx b/frontend/src/components/ui/common/Card.tsx
new file mode 100644
index 0000000..6470d90
--- /dev/null
+++ b/frontend/src/components/ui/common/Card.tsx
@@ -0,0 +1,36 @@
+import type { ElementType, ReactNode } from 'react';
+
+type CardPadding = 'none' | 'sm' | 'md' | 'lg';
+
+type CardProps<T extends ElementType = 'div'> = {
+  children: ReactNode;
+  padding?: CardPadding;
+  as?: T;
+  className?: string;
+} & Omit<React.ComponentPropsWithoutRef<T>, 'as' | 'children' | 'className'>;
+
+const paddingClassMap: Record<CardPadding, string> = {
+  none: '',
+  sm: 'p-3',
+  md: 'p-4',
+  lg: 'p-6',
+};
+
+export function Card<T extends ElementType = 'div'>({
+  children,
+  as,
+  className = '',
+  padding = 'md',
+  ...props
+}: CardProps<T>) {
+  const Component = as ?? 'div';
+
+  return (
+    <Component
+      className={`rounded-[var(--radius-lg)] border border-card-border bg-card text-card-foreground ${paddingClassMap[padding]} ${className}`}
+      {...props}
+    >
+      {children}
+    </Component>
+  );
+}
diff --git a/frontend/src/components/ui/common/ScheduleDayPicker.tsx b/frontend/src/components/ui/common/ScheduleDayPicker.tsx
index 744f308..e174d21 100644
--- a/frontend/src/components/ui/common/ScheduleDayPicker.tsx
+++ b/frontend/src/components/ui/common/ScheduleDayPicker.tsx
@@ -1,19 +1,17 @@
 'use client';
 
 import { ChevronLeft, ChevronRight } from 'lucide-react';
-import { addCalendarDays, compareLocalDayStart } from '@/lib/appointmentTime';
+import { addCalendarDays } from '@/lib/appointmentTime';
 
 interface ScheduleDayPickerProps {
   value: Date;
   onChange: (day: Date) => void;
-  /** Inclusive minimum calendar day (typically today at local midnight). */
-  minDate: Date;
+  /** Optional lower bound; picker navigation is unrestricted for history browsing. */
+  minDate?: Date;
   label?: string;
 }
 
-export function ScheduleDayPicker({ value, onChange, minDate, label = 'Schedule date' }: ScheduleDayPickerProps) {
-  const canGoPrev = compareLocalDayStart(value, minDate) > 0;
-
+export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }: ScheduleDayPickerProps) {
   const labelText = value.toLocaleDateString(undefined, {
     weekday: 'short',
     month: 'short',
@@ -27,9 +25,8 @@ export function ScheduleDayPicker({ value, onChange, minDate, label = 'Schedule
       <div className="flex items-center gap-1 rounded-[var(--radius-md)] border border-border bg-background-secondary/90 px-1 py-1 shadow-[inset_0_1px_0_rgba(255,255,255,0.02)]">
         <button
           type="button"
-          disabled={!canGoPrev}
           onClick={() => onChange(addCalendarDays(value, -1))}
-          className="shrink-0 rounded-[var(--radius-sm)] p-2 text-text-muted hover:text-text-primary hover:bg-background-card/80 disabled:opacity-35 disabled:pointer-events-none focus:outline-none focus:ring-2 focus:ring-primary/35"
+          className="shrink-0 rounded-[var(--radius-sm)] p-2 text-text-muted hover:text-text-primary hover:bg-background-card/80 focus:outline-none focus:ring-2 focus:ring-primary/35"
           aria-label="Previous day"
         >
           <ChevronLeft className="h-4 w-4 icon-flat" />
diff --git a/frontend/src/components/ui/common/Toast.tsx b/frontend/src/components/ui/common/Toast.tsx
new file mode 100644
index 0000000..094531e
--- /dev/null
+++ b/frontend/src/components/ui/common/Toast.tsx
@@ -0,0 +1,26 @@
+import type { ReactNode } from 'react';
+import type { BadgeVariant } from '@/components/ui/common/Badge';
+
+interface ToastProps {
+  children: ReactNode;
+  variant?: BadgeVariant;
+  className?: string;
+}
+
+const variantStyles: Record<BadgeVariant, string> = {
+  success: 'bg-badge-success-bg text-badge-success-fg border-badge-success-border',
+  warning: 'bg-badge-warning-bg text-badge-warning-fg border-badge-warning-border',
+  danger: 'bg-badge-danger-bg text-badge-danger-fg border-badge-danger-border',
+  default: 'bg-badge-default-bg text-badge-default-fg border-badge-default-border',
+};
+
+export function Toast({ children, variant = 'default', className = '' }: ToastProps) {
+  return (
+    <div
+      role="status"
+      className={`w-full rounded-[var(--radius-md)] border px-4 py-3 text-sm shadow-lg ${variantStyles[variant]} ${className}`}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/treatment/AppointmentsStrip.tsx b/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
index 4b06018..b77a795 100644
--- a/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
+++ b/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
@@ -2,6 +2,7 @@
 
 import { CalendarDays } from 'lucide-react';
 import { purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
+import { Card } from '@/components/ui/common/Card';
 import { ScheduleDayPicker } from '@/components/ui/common/ScheduleDayPicker';
 import { startOfLocalDay } from '@/lib/appointmentTime';
 import type { TreatmentAppointment } from '@/types/treatment';
@@ -32,7 +33,7 @@ export function AppointmentsStrip({
 }: AppointmentsStripProps) {
   if (stripHidden) {
     return (
-      <div className="surface-card p-3 flex items-center justify-between gap-3 flex-wrap">
+      <Card className="flex items-center justify-between gap-3 flex-wrap" padding="sm">
         <p className="text-sm text-text-secondary">Appointments are hidden.</p>
         <button
           type="button"
@@ -41,12 +42,12 @@ export function AppointmentsStrip({
         >
           Show appointments
         </button>
-      </div>
+      </Card>
     );
   }
 
   return (
-    <div className="surface-card p-4 space-y-4">
+    <Card className="space-y-4">
       <div className="flex items-center justify-between gap-3 flex-wrap">
         <div className="flex items-center gap-2 min-w-0">
           <CalendarDays className="w-5 h-5 text-text-muted shrink-0 icon-flat" aria-hidden />
@@ -89,12 +90,14 @@ export function AppointmentsStrip({
           })}`;
           const palette = purposeStyle(a.purpose);
           return (
-            <button
+            <Card
+              as="button"
               key={a.id}
               type="button"
               onClick={() => onSelectAppointment(a.id)}
+              padding="none"
               className={`
-                text-left rounded-[var(--radius-sm)] border px-3 py-2 min-w-[200px] max-w-[280px] transition-shadow min-h-[52px]
+                text-left rounded-[var(--radius-sm)] px-3 py-2 min-w-[200px] max-w-[280px] transition-shadow min-h-[52px]
                 focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/45
                 ${palette}
                 ${sel ? 'ring-2 ring-primary ring-offset-2 ring-offset-background-secondary shadow-[inset_0_1px_0_rgba(255,255,255,0.06)]' : 'hover:brightness-110'}
@@ -105,10 +108,10 @@ export function AppointmentsStrip({
                 {a.patientFirstName} {a.patientLastName}
               </p>
               <p className="text-[11px] opacity-90 capitalize mt-0.5">{a.purpose}</p>
-            </button>
+            </Card>
           );
         })}
       </div>
-    </div>
+    </Card>
   );
 }
diff --git a/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
index e18ce0f..0c20616 100644
--- a/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
@@ -8,6 +8,7 @@ import { Checkbox } from '@/components/ui/common/Checkbox';
 import { Button } from '@/components/ui/common/Button';
 import { Dropdown } from '@/components/ui/common/Dropdown';
 import { SearchBar } from '@/components/ui/common/SearchBar';
+import { Toast } from '@/components/ui/common/Toast';
 import { isSameLocalCalendarDay, startOfLocalDay } from '@/lib/appointmentTime';
 import {
   fetchLinkedOrganizations,
@@ -325,7 +326,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
   }
 
   return (
-    <div className="space-y-6">
+    <div className="relative space-y-6 pb-24">
       <header className="space-y-1">
         <h1 className="text-2xl font-semibold text-text-primary">Treatment</h1>
         <p className="text-sm text-text-secondary">
@@ -345,12 +346,6 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         loading={apptsLoading}
       />
 
-      {banner && (
-        <div className="rounded-[var(--radius-md)] border border-primary/40 bg-primary-soft px-4 py-2 text-sm text-text-primary">
-          {banner}
-        </div>
-      )}
-
       <div className="grid grid-cols-1 xl:grid-cols-[minmax(280px,380px)_minmax(0,1fr)] gap-6 items-start">
         <div className="space-y-4">
           {selectedAppointment ? (
@@ -651,6 +646,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
           </div>
         </div>
       </div>
+
+      {banner && (
+        <div className="fixed bottom-4 left-0 right-0 z-[70] px-4 pointer-events-none">
+          <div className="pointer-events-auto w-full">
+            <Toast variant="success">{banner}</Toast>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/frontend/src/lib/api/appointments.ts b/frontend/src/lib/api/appointments.ts
index 76237b0..9ba35dc 100644
--- a/frontend/src/lib/api/appointments.ts
+++ b/frontend/src/lib/api/appointments.ts
@@ -9,6 +9,8 @@ export interface CreateAppointmentBody {
   purpose: string;
 }
 
+export type UpdateAppointmentBody = Partial<CreateAppointmentBody>;
+
 export const appointmentsApi = {
   columnProviders: async (): Promise<{ success: boolean; data: AppointmentColumnProvider[] }> => {
     const response = await apiClient.get('/appointments/column-providers');
@@ -25,6 +27,14 @@ export const appointmentsApi = {
     return response.data;
   },
 
+  update: async (
+    id: string,
+    body: UpdateAppointmentBody,
+  ): Promise<{ success: boolean; data: AppointmentRecord }> => {
+    const response = await apiClient.patch(`/appointments/${id}`, body);
+    return response.data;
+  },
+
   remove: async (id: string): Promise<{ success: boolean }> => {
     const response = await apiClient.delete(`/appointments/${id}`);
     return response.data;
diff --git a/frontend/src/styles/globals.css b/frontend/src/styles/globals.css
index 27dc929..6205780 100644
--- a/frontend/src/styles/globals.css
+++ b/frontend/src/styles/globals.css
@@ -18,6 +18,40 @@
   --color-border: #d2dcec;
   --color-border-strong: #aec0de;
 
+  --color-card-background: #ffffff;
+  --color-card-foreground: #0f172a;
+  --color-card-muted: #475569;
+  --color-card-border: #d2dcec;
+
+  --color-badge-default-bg: #edf3fb;
+  --color-badge-default-fg: #1e293b;
+  --color-badge-default-border: #c9d8ec;
+  --color-badge-success-bg: #e6f7ef;
+  --color-badge-success-fg: #14532d;
+  --color-badge-success-border: #98d8b5;
+  --color-badge-warning-bg: #fff4df;
+  --color-badge-warning-fg: #92400e;
+  --color-badge-warning-border: #f6c88b;
+  --color-badge-danger-bg: #ffe8e8;
+  --color-badge-danger-fg: #991b1b;
+  --color-badge-danger-border: #f2b0b0;
+
+  --color-purpose-consultation-bg: #f1eafe;
+  --color-purpose-consultation-fg: #5b21b6;
+  --color-purpose-consultation-border: #cfb8f7;
+  --color-purpose-filling-bg: #fff1e5;
+  --color-purpose-filling-fg: #9a3412;
+  --color-purpose-filling-border: #f8c9a6;
+  --color-purpose-endo-bg: #ffe9e9;
+  --color-purpose-endo-fg: #991b1b;
+  --color-purpose-endo-border: #f4b6b6;
+  --color-purpose-visit-bg: #e7f4ff;
+  --color-purpose-visit-fg: #0c4a6e;
+  --color-purpose-visit-border: #abd8f3;
+  --color-purpose-hygiene-bg: #effadf;
+  --color-purpose-hygiene-fg: #3f6212;
+  --color-purpose-hygiene-border: #cbe9a1;
+
   --color-primary: #009cae;
   --color-primary-contrast: #031014;
   --color-primary-soft: rgba(0, 156, 174, 0.16);
@@ -42,6 +76,40 @@
   --color-border: #29456a;
   --color-border-strong: #3b5f8f;
 
+  --color-card-background: #14253d;
+  --color-card-foreground: #f5f9ff;
+  --color-card-muted: #b6c6dd;
+  --color-card-border: #29456a;
+
+  --color-badge-default-bg: #1b2f4e;
+  --color-badge-default-fg: #b6c6dd;
+  --color-badge-default-border: #3b5f8f;
+  --color-badge-success-bg: rgba(6, 78, 59, 0.45);
+  --color-badge-success-fg: #86efac;
+  --color-badge-success-border: rgba(21, 128, 61, 0.5);
+  --color-badge-warning-bg: rgba(120, 53, 15, 0.48);
+  --color-badge-warning-fg: #fcd34d;
+  --color-badge-warning-border: rgba(180, 83, 9, 0.55);
+  --color-badge-danger-bg: rgba(127, 29, 29, 0.42);
+  --color-badge-danger-fg: #fca5a5;
+  --color-badge-danger-border: rgba(185, 28, 28, 0.52);
+
+  --color-purpose-consultation-bg: rgba(139, 92, 246, 0.25);
+  --color-purpose-consultation-fg: #ddd6fe;
+  --color-purpose-consultation-border: rgba(167, 139, 250, 0.5);
+  --color-purpose-filling-bg: rgba(249, 115, 22, 0.25);
+  --color-purpose-filling-fg: #fed7aa;
+  --color-purpose-filling-border: rgba(251, 146, 60, 0.5);
+  --color-purpose-endo-bg: rgba(239, 68, 68, 0.25);
+  --color-purpose-endo-fg: #fecaca;
+  --color-purpose-endo-border: rgba(248, 113, 113, 0.5);
+  --color-purpose-visit-bg: rgba(14, 165, 233, 0.25);
+  --color-purpose-visit-fg: #bae6fd;
+  --color-purpose-visit-border: rgba(56, 189, 248, 0.5);
+  --color-purpose-hygiene-bg: rgba(132, 204, 22, 0.2);
+  --color-purpose-hygiene-fg: #d9f99d;
+  --color-purpose-hygiene-border: rgba(163, 230, 53, 0.45);
+
   --color-primary: #09a9bc;
   --color-primary-contrast: #001117;
   --color-primary-soft: rgba(9, 169, 188, 0.2);
@@ -66,6 +134,40 @@
   --color-border: #29456a;
   --color-border-strong: #3b5f8f;
 
+  --color-card-background: #14253d;
+  --color-card-foreground: #f5f9ff;
+  --color-card-muted: #b6c6dd;
+  --color-card-border: #29456a;
+
+  --color-badge-default-bg: #1b2f4e;
+  --color-badge-default-fg: #b6c6dd;
+  --color-badge-default-border: #3b5f8f;
+  --color-badge-success-bg: rgba(6, 78, 59, 0.45);
+  --color-badge-success-fg: #86efac;
+  --color-badge-success-border: rgba(21, 128, 61, 0.5);
+  --color-badge-warning-bg: rgba(120, 53, 15, 0.48);
+  --color-badge-warning-fg: #fcd34d;
+  --color-badge-warning-border: rgba(180, 83, 9, 0.55);
+  --color-badge-danger-bg: rgba(127, 29, 29, 0.42);
+  --color-badge-danger-fg: #fca5a5;
+  --color-badge-danger-border: rgba(185, 28, 28, 0.52);
+
+  --color-purpose-consultation-bg: rgba(139, 92, 246, 0.25);
+  --color-purpose-consultation-fg: #ddd6fe;
+  --color-purpose-consultation-border: rgba(167, 139, 250, 0.5);
+  --color-purpose-filling-bg: rgba(249, 115, 22, 0.25);
+  --color-purpose-filling-fg: #fed7aa;
+  --color-purpose-filling-border: rgba(251, 146, 60, 0.5);
+  --color-purpose-endo-bg: rgba(239, 68, 68, 0.25);
+  --color-purpose-endo-fg: #fecaca;
+  --color-purpose-endo-border: rgba(248, 113, 113, 0.5);
+  --color-purpose-visit-bg: rgba(14, 165, 233, 0.25);
+  --color-purpose-visit-fg: #bae6fd;
+  --color-purpose-visit-border: rgba(56, 189, 248, 0.5);
+  --color-purpose-hygiene-bg: rgba(132, 204, 22, 0.2);
+  --color-purpose-hygiene-fg: #d9f99d;
+  --color-purpose-hygiene-border: rgba(163, 230, 53, 0.45);
+
   --color-primary: #09a9bc;
   --color-primary-contrast: #001117;
   --color-primary-soft: rgba(9, 169, 188, 0.2);
@@ -89,6 +191,37 @@
 
   --color-border: var(--color-border);
   --color-border-strong: var(--color-border-strong);
+  --color-card: var(--color-card-background);
+  --color-card-foreground: var(--color-card-foreground);
+  --color-card-muted: var(--color-card-muted);
+  --color-card-border: var(--color-card-border);
+  --color-badge-default-bg: var(--color-badge-default-bg);
+  --color-badge-default-fg: var(--color-badge-default-fg);
+  --color-badge-default-border: var(--color-badge-default-border);
+  --color-badge-success-bg: var(--color-badge-success-bg);
+  --color-badge-success-fg: var(--color-badge-success-fg);
+  --color-badge-success-border: var(--color-badge-success-border);
+  --color-badge-warning-bg: var(--color-badge-warning-bg);
+  --color-badge-warning-fg: var(--color-badge-warning-fg);
+  --color-badge-warning-border: var(--color-badge-warning-border);
+  --color-badge-danger-bg: var(--color-badge-danger-bg);
+  --color-badge-danger-fg: var(--color-badge-danger-fg);
+  --color-badge-danger-border: var(--color-badge-danger-border);
+  --color-purpose-consultation-bg: var(--color-purpose-consultation-bg);
+  --color-purpose-consultation-fg: var(--color-purpose-consultation-fg);
+  --color-purpose-consultation-border: var(--color-purpose-consultation-border);
+  --color-purpose-filling-bg: var(--color-purpose-filling-bg);
+  --color-purpose-filling-fg: var(--color-purpose-filling-fg);
+  --color-purpose-filling-border: var(--color-purpose-filling-border);
+  --color-purpose-endo-bg: var(--color-purpose-endo-bg);
+  --color-purpose-endo-fg: var(--color-purpose-endo-fg);
+  --color-purpose-endo-border: var(--color-purpose-endo-border);
+  --color-purpose-visit-bg: var(--color-purpose-visit-bg);
+  --color-purpose-visit-fg: var(--color-purpose-visit-fg);
+  --color-purpose-visit-border: var(--color-purpose-visit-border);
+  --color-purpose-hygiene-bg: var(--color-purpose-hygiene-bg);
+  --color-purpose-hygiene-fg: var(--color-purpose-hygiene-fg);
+  --color-purpose-hygiene-border: var(--color-purpose-hygiene-border);
   --color-primary: var(--color-primary);
   --color-primary-contrast: var(--color-primary-contrast);
   --color-primary-soft: var(--color-primary-soft);
@@ -115,8 +248,9 @@ body {
 }
 
 .surface-card {
-  background: color-mix(in srgb, var(--color-background-card) 92%, transparent);
-  border: 1px solid var(--color-border);
+  background: color-mix(in srgb, var(--color-card-background) 92%, transparent);
+  border: 1px solid var(--color-card-border);
+  color: var(--color-card-foreground);
   border-radius: var(--radius-lg);
 }