diff --git a/.server-changes/fix-light-mode-contrast-on-indigo-buttons.md b/.server-changes/fix-light-mode-contrast-on-indigo-buttons.md
new file mode 100644
index 0000000000..334adb8fe6
--- /dev/null
+++ b/.server-changes/fix-light-mode-contrast-on-indigo-buttons.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: fix
+---
+
+Fix unreadable dark text in light mode on the "Mark error as…" button and on selected dates in date pickers — both now use white text on their blue background.
diff --git a/apps/webapp/app/components/primitives/Calendar.tsx b/apps/webapp/app/components/primitives/Calendar.tsx
index 22ddc7d414..c4f723d065 100644
--- a/apps/webapp/app/components/primitives/Calendar.tsx
+++ b/apps/webapp/app/components/primitives/Calendar.tsx
@@ -104,7 +104,7 @@ export function Calendar({
         range_start: "day-range-start rounded-l-md",
         range_end: "day-range-end rounded-r-md",
         selected:
-          "bg-indigo-600 text-text-bright hover:bg-indigo-600 hover:text-text-bright focus:bg-indigo-600 focus:text-text-bright rounded-md",
+          "bg-indigo-600 text-white hover:bg-indigo-600 hover:text-white focus:bg-indigo-600 focus:text-white rounded-md",
         today: "bg-background-raised text-text-bright rounded-md",
         outside:
           "day-outside text-text-dimmed opacity-50 aria-selected:bg-background-raised/50 aria-selected:text-text-dimmed aria-selected:opacity-30",
diff --git a/apps/webapp/app/components/primitives/Popover.tsx b/apps/webapp/app/components/primitives/Popover.tsx
index fccba52a89..323996a85e 100644
--- a/apps/webapp/app/components/primitives/Popover.tsx
+++ b/apps/webapp/app/components/primitives/Popover.tsx
@@ -213,9 +213,9 @@ const popoverArrowTriggerVariants = {
   },
   primary: {
     trigger:
-      "bg-indigo-600 border border-indigo-500 text-text-bright hover:bg-indigo-500 hover:border-indigo-400 disabled:opacity-50 disabled:pointer-events-none",
-    text: "text-text-bright hover:text-white",
-    icon: "text-text-bright",
+      "bg-indigo-600 border border-indigo-500 text-white hover:bg-indigo-500 hover:border-indigo-400 disabled:opacity-50 disabled:pointer-events-none",
+    text: "text-white",
+    icon: "text-white",
   },
   secondary: {
     trigger:
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
index dbf3233c23..ad184ddc4a 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
@@ -801,7 +801,7 @@ function ErrorStatusDropdown({
     <>
       <Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
         <PopoverArrowTrigger variant="primary" disabled={isSubmitting} className="items-center">
-          <IconCircleDotted className="-ml-1 mr-1 size-3.5 text-text-bright" />
+          <IconCircleDotted className="-ml-1 mr-1 size-3.5 text-white" />
           Mark error as…
         </PopoverArrowTrigger>
         <PopoverContent className="inline-flex min-w-0! flex-col p-1" align="end">