diff --git a/src/components/admin/reminders-section.tsx b/src/components/admin/reminders-section.tsx
index 779780777..cd2bf61de 100644
--- a/src/components/admin/reminders-section.tsx
+++ b/src/components/admin/reminders-section.tsx
@@ -236,9 +236,9 @@ export function RemindersSection() {
             {testNotification.data.results.map((r, i) => (
               <div key={i} className="flex items-center gap-1.5 text-xs">
                 {r.success ? (
-                  <CheckCircle2 className="h-3.5 w-3.5 shrink-0 text-green-400" />
+                  <CheckCircle2 className="text-success dark:text-green-400 h-3.5 w-3.5 shrink-0" />
                 ) : (
-                  <XCircle className="h-3.5 w-3.5 shrink-0 text-red-400" />
+                  <XCircle className="text-destructive dark:text-red-400 h-3.5 w-3.5 shrink-0" />
                 )}
                 <span className="font-medium">{r.channel}</span>
                 {r.error && (
@@ -281,11 +281,11 @@ export function RemindersSection() {
                   {med.schedules.map((sched, j) => {
                     const statusColor =
                       sched.status === "open"
-                        ? "text-green-400"
+                        ? "text-success dark:text-green-400"
                         : sched.status === "threshold"
-                          ? "text-yellow-400"
+                          ? "text-warning dark:text-yellow-400"
                           : sched.status === "missed"
-                            ? "text-red-400"
+                            ? "text-destructive dark:text-red-400"
                             : sched.status === "skipped"
                               ? "text-muted-foreground"
                               : "";
@@ -299,7 +299,7 @@ export function RemindersSection() {
                         </span>
                         <span className={statusColor}>{sched.label}</span>
                         {sched.notificationSent && (
-                          <span className="flex shrink-0 items-center gap-0.5 text-green-400">
+                          <span className="text-success dark:text-green-400 flex shrink-0 items-center gap-0.5">
                             <Bell className="h-3 w-3" />
                             {t("admin.reminderCheckNotifSent")}
                           </span>
diff --git a/src/components/medications/intake-history-list-v2.tsx b/src/components/medications/intake-history-list-v2.tsx
index 27cdb3432..a35dd9796 100644
--- a/src/components/medications/intake-history-list-v2.tsx
+++ b/src/components/medications/intake-history-list-v2.tsx
@@ -361,7 +361,7 @@ export function IntakeHistoryListV2({
                         {isTaken ? (
                           <Badge
                             variant="secondary"
-                            className="gap-1 bg-green-500/20 text-xs text-green-400"
+                            className="bg-success/15 text-success dark:bg-green-500/20 dark:text-green-400 gap-1 text-xs"
                           >
                             <Check aria-hidden="true" className="h-3 w-3" />
                             {t("medications.intakeHistoryStatusTaken")}