diff --git a/frontend/common/theme/tokens.json b/frontend/common/theme/tokens.json
index fcad1cb37f7d..4e2312aad725 100644
--- a/frontend/common/theme/tokens.json
+++ b/frontend/common/theme/tokens.json
@@ -105,9 +105,9 @@
       "tertiary": { "cssVar": "--color-text-tertiary", "light": "#9da4ae", "dark": "rgba(255, 255, 255, 0.48)" },
       "disabled": { "cssVar": "--color-text-disabled", "light": "#9da4ae", "dark": "rgba(255, 255, 255, 0.32)" },
       "action": { "cssVar": "--color-text-action", "light": "#6837fc", "dark": "#906af6" },
-      "danger": { "cssVar": "--color-text-danger", "light": "#ef4d56", "dark": "#ef4d56" },
-      "success": { "cssVar": "--color-text-success", "light": "#27ab95", "dark": "#27ab95" },
-      "warning": { "cssVar": "--color-text-warning", "light": "#ff9f43", "dark": "#ff9f43" },
+      "danger": { "cssVar": "--color-text-danger", "light": "#bb1720", "dark": "#ef4d56", "description": "In light mode, darker than border/icon danger to clear 4.5:1 on the tint." },
+      "success": { "cssVar": "--color-text-success", "light": "#13787b", "dark": "#27ab95", "description": "In light mode, darker than border/icon success to clear 4.5:1 on the tint." },
+      "warning": { "cssVar": "--color-text-warning", "light": "#9f5208", "dark": "#ff9f43", "description": "In light mode, darker than border/icon warning to clear 4.5:1 on the tint." },
       "info": { "cssVar": "--color-text-info", "light": "#0aaddf", "dark": "#0aaddf" }
     },
     "code": {
diff --git a/frontend/common/theme/tokens.ts b/frontend/common/theme/tokens.ts
index 7397d1972cfa..d9e244ea0838 100644
--- a/frontend/common/theme/tokens.ts
+++ b/frontend/common/theme/tokens.ts
@@ -198,14 +198,14 @@ export const colorSurfaceWarning =
 
 // Text
 export const colorTextAction = 'var(--color-text-action, #6837fc)'
-export const colorTextDanger = 'var(--color-text-danger, #ef4d56)'
+export const colorTextDanger = 'var(--color-text-danger, #bb1720)'
 export const colorTextDefault = 'var(--color-text-default, #1a2634)'
 export const colorTextDisabled = 'var(--color-text-disabled, #9da4ae)'
 export const colorTextInfo = 'var(--color-text-info, #0aaddf)'
 export const colorTextSecondary = 'var(--color-text-secondary, #656d7b)'
-export const colorTextSuccess = 'var(--color-text-success, #27ab95)'
+export const colorTextSuccess = 'var(--color-text-success, #13787b)'
 export const colorTextTertiary = 'var(--color-text-tertiary, #9da4ae)'
-export const colorTextWarning = 'var(--color-text-warning, #ff9f43)'
+export const colorTextWarning = 'var(--color-text-warning, #9f5208)'
 
 // Chart
 export const colorChart1 = 'var(--color-chart-1, #0aaddf)'
diff --git a/frontend/documentation/TokenReference.generated.stories.tsx b/frontend/documentation/TokenReference.generated.stories.tsx
index 97c711495103..8a8326e98877 100644
--- a/frontend/documentation/TokenReference.generated.stories.tsx
+++ b/frontend/documentation/TokenReference.generated.stories.tsx
@@ -205,7 +205,7 @@ export const AllTokens: StoryObj = {
               <code>--color-text-danger</code>
             </td>
             <td>
-              <code>var(--red-500)</code>
+              <code>var(--red-700)</code>
             </td>
           </tr>
           <tr>
@@ -213,7 +213,7 @@ export const AllTokens: StoryObj = {
               <code>--color-text-success</code>
             </td>
             <td>
-              <code>var(--green-500)</code>
+              <code>var(--green-600)</code>
             </td>
           </tr>
           <tr>
@@ -221,7 +221,7 @@ export const AllTokens: StoryObj = {
               <code>--color-text-warning</code>
             </td>
             <td>
-              <code>var(--orange-500)</code>
+              <code>var(--orange-800)</code>
             </td>
           </tr>
           <tr>
diff --git a/frontend/web/styles/_tokens.scss b/frontend/web/styles/_tokens.scss
index c5b653e2c50b..cb2b8066d444 100644
--- a/frontend/web/styles/_tokens.scss
+++ b/frontend/web/styles/_tokens.scss
@@ -105,14 +105,14 @@
 
   // Text
   --color-text-action: var(--purple-600);
-  --color-text-danger: var(--red-500);
+  --color-text-danger: var(--red-700);
   --color-text-default: var(--slate-600);
   --color-text-disabled: var(--slate-300);
   --color-text-info: var(--blue-500);
   --color-text-secondary: var(--slate-500);
-  --color-text-success: var(--green-500);
+  --color-text-success: var(--green-600);
   --color-text-tertiary: var(--slate-300);
-  --color-text-warning: var(--orange-500);
+  --color-text-warning: var(--orange-800);
 
   // Code
   --color-code-builtin: var(--gold-700);
@@ -208,10 +208,13 @@
   --color-surface-success: oklch(from var(--green-500) 0.18 0.02 h);
   --color-surface-warning: oklch(from var(--orange-500) 0.18 0.02 h);
   --color-text-action: var(--purple-400);
+  --color-text-danger: var(--red-500);
   --color-text-default: var(--slate-0);
   --color-text-disabled: oklch(from var(--slate-0) l c h / 0.32);
   --color-text-secondary: var(--slate-300);
+  --color-text-success: var(--green-500);
   --color-text-tertiary: oklch(from var(--slate-0) l c h / 0.48);
+  --color-text-warning: var(--orange-500);
   --color-code-builtin: var(--gold-400);
   --color-code-comment: var(--slate-500);
   --color-code-keyword: var(--purple-400);