diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
index 3060e804395..d2d3f9597e0 100644
--- a/apps/theming/css/default.css
+++ b/apps/theming/css/default.css
@@ -18,12 +18,17 @@
   --color-text-maxcontrast: #6b6b6b;
   --color-text-maxcontrast-default: #6b6b6b;
   --color-text-maxcontrast-background-blur: #595959;
-  --color-text-error: #c90000;
+  --color-text-error: #bf0000;
   --color-text-success: #066e03;
-  /** @deprecated use ` --color-main-text` instead */
-  --color-text-light: var(--color-main-text);
-  /** @deprecated use `--color-text-maxcontrast` instead */
-  --color-text-lighter: var(--color-text-maxcontrast);
+  --color-element-error: #c90000;
+  --color-element-info: #0077C7;
+  --color-element-success: #099f05;
+  --color-element-warning: #BF7900;
+  --color-border: #ededed;
+  --color-border-dark: #dbdbdb;
+  --color-border-maxcontrast: #7d7d7d;
+  --color-border-error: var(--color-element-error);
+  --color-border-success: var(--color-element-success);
   --color-scrollbar: var(--color-border-maxcontrast) transparent;
   --color-error: #FFE7E7;
   --color-error-hover: #ffc3c3;
@@ -50,11 +55,6 @@
   --color-loading-dark: #444444;
   --color-box-shadow-rgb: 77,77,77;
   --color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5);
-  --color-border: #ededed;
-  --color-border-dark: #dbdbdb;
-  --color-border-maxcontrast: #7d7d7d;
-  --color-border-error: #c90000;
-  --color-border-success: #099f05;
   --font-face: system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   --default-font-size: 15px;
   --font-size-small: 13px;
diff --git a/apps/theming/lib/Themes/DarkHighContrastTheme.php b/apps/theming/lib/Themes/DarkHighContrastTheme.php
index fd61db1515f..afa324d2eca 100644
--- a/apps/theming/lib/Themes/DarkHighContrastTheme.php
+++ b/apps/theming/lib/Themes/DarkHighContrastTheme.php
@@ -68,6 +68,16 @@ class DarkHighContrastTheme extends DarkTheme implements ITheme {
 				'--color-text-maxcontrast-background-blur' => $colorMainText,
 				'--color-text-error' => $this->util->lighten($colorError, 65),
 				'--color-text-success' => $this->util->lighten($colorSuccess, 65),
+				'--color-text-warning' => $this->util->lighten($colorWarning, 65),
+
+				'--color-element-error' => $this->util->lighten($colorError, 30),
+				'--color-element-info' => $this->util->lighten($colorInfo, 30),
+				'--color-element-success' => $this->util->lighten($colorSuccess, 30),
+				'--color-element-warning' => $this->util->lighten($colorWarning, 30),
+
+				'--color-border' => $this->util->lighten($colorMainBackground, 50),
+				'--color-border-dark' => $this->util->lighten($colorMainBackground, 50),
+				'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 55),
 
 				'--color-error' => $colorError,
 				'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
@@ -97,12 +107,6 @@ class DarkHighContrastTheme extends DarkTheme implements ITheme {
 
 				'--color-box-shadow-rgb' => $colorMainText,
 				'--color-box-shadow' => $colorMainText,
-
-				'--color-border' => $this->util->lighten($colorMainBackground, 50),
-				'--color-border-dark' => $this->util->lighten($colorMainBackground, 50),
-				'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 55),
-				'--color-border-error' => $this->util->lighten($colorError, 30),
-				'--color-border-success' => $this->util->lighten($colorSuccess, 30),
 			]
 		);
 	}
diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php
index 76cd71c4b11..606f3eca065 100644
--- a/apps/theming/lib/Themes/DarkTheme.php
+++ b/apps/theming/lib/Themes/DarkTheme.php
@@ -54,14 +54,16 @@ class DarkTheme extends DefaultTheme implements ITheme {
 
 		$colorError = '#552121';
 		$colorErrorText = '#FFCCCC';
-		$colorErrorElement = '#ff6c69';
+		$colorErrorElement = '#FF5050';
 		$colorWarning = '#3D3010';
 		$colorWarningText = '#FFEEC5';
+		$colorWarningElement = '#FFCC00';
 		$colorSuccess = '#11321A';
 		$colorSuccessText = '#D5F2DC';
-		$colorSuccessElement = '#3B973B';
+		$colorSuccessElement = '#40A330';
 		$colorInfo = '#003553';
 		$colorInfoText = '#00AEFF';
+		$colorInfoElement = '#0099E0';
 
 		return array_merge(
 			$defaultVariables,
@@ -82,8 +84,17 @@ class DarkTheme extends DefaultTheme implements ITheme {
 				'--color-text-maxcontrast' => $colorTextMaxcontrast,
 				'--color-text-maxcontrast-default' => $colorTextMaxcontrast,
 				'--color-text-maxcontrast-background-blur' => $this->util->lighten($colorTextMaxcontrast, 6),
-				'--color-text-error' => $colorErrorElement,
-				'--color-text-success' => $this->util->lighten($colorSuccessElement, 10),
+				'--color-text-error' => $this->util->lighten($colorErrorElement, 6),
+				'--color-text-success' => $this->util->lighten($colorSuccessElement, 6),
+
+				'--color-element-error' => $colorErrorElement,
+				'--color-element-info' => $colorInfoElement,
+				'--color-element-success' => $colorSuccessElement,
+				'--color-element-warning' => $colorWarningElement,
+
+				'--color-border' => $this->util->lighten($colorMainBackground, 7),
+				'--color-border-dark' => $this->util->lighten($colorMainBackground, 14),
+				'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 40),
 
 				'--color-error' => $colorError,
 				'--color-error-hover' => $this->util->lighten($colorError, 10),
@@ -111,12 +122,6 @@ class DarkTheme extends DefaultTheme implements ITheme {
 				'--color-box-shadow' => $colorBoxShadow,
 				'--color-box-shadow-rgb' => $colorBoxShadowRGB,
 
-				'--color-border' => $this->util->lighten($colorMainBackground, 7),
-				'--color-border-dark' => $this->util->lighten($colorMainBackground, 14),
-				'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 40),
-				'--color-border-error' => $colorErrorElement,
-				'--color-border-success' => $colorSuccessElement,
-
 				'--background-invert-if-dark' => 'invert(100%)',
 				'--background-invert-if-bright' => 'no',
 			]
diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 75e3111de62..36d0884727c 100644
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -77,16 +77,23 @@ class DefaultTheme implements ITheme {
 		$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
 		$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
 
+		/*
+		colorX: The background color for e.g. buttons and note-card
+		colorXText: The text color on that background
+		colorXElement: When that color needs to have element contrast like borders
+		*/
 		$colorError = '#FFE7E7';
 		$colorErrorText = '#8A0000';
 		$colorErrorElement = '#c90000';
 		$colorWarning = '#FFEEC5';
 		$colorWarningText = '#664700';
+		$colorWarningElement = '#BF7900';
 		$colorSuccess = '#D8F3DA';
 		$colorSuccessText = '#005416';
 		$colorSuccessElement = '#099f05';
 		$colorInfo = '#D5F1FA';
 		$colorInfoText = '#0066AC';
+		$colorInfoElement = '#0077C7';
 
 		$user = $this->userSession->getUser();
 		// Chromium based browsers currently (2024) have huge performance issues with blur filters
@@ -128,10 +135,21 @@ class DefaultTheme implements ITheme {
 			'--color-text-maxcontrast' => $colorTextMaxcontrast,
 			'--color-text-maxcontrast-default' => $colorTextMaxcontrast,
 			'--color-text-maxcontrast-background-blur' => $this->util->darken($colorTextMaxcontrast, 7),
-			'--color-text-error' => $colorErrorElement,
+			'--color-text-error' => $this->util->darken($colorErrorElement, 2),
 			'--color-text-success' => $this->util->darken($colorSuccessElement, 10),
-			'--color-text-light' => 'var(--color-main-text)', // deprecated
-			'--color-text-lighter' => 'var(--color-text-maxcontrast)', // deprecated
+
+			// special colors for elements (providing corresponding contrast) e.g. icons
+			'--color-element-error' => $colorErrorElement,
+			'--color-element-info' => $colorInfoElement,
+			'--color-element-success' => $colorSuccessElement,
+			'--color-element-warning' => $colorWarningElement,
+
+			// border colors
+			'--color-border' => $this->util->darken($colorMainBackground, 7),
+			'--color-border-dark' => $this->util->darken($colorMainBackground, 14),
+			'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 51),
+			'--color-border-error' => 'var(--color-element-error)',
+			'--color-border-success' => 'var(--color-element-success)',
 
 			'--color-scrollbar' => 'var(--color-border-maxcontrast) transparent',
 
@@ -162,12 +180,6 @@ class DefaultTheme implements ITheme {
 			'--color-box-shadow-rgb' => $colorBoxShadowRGB,
 			'--color-box-shadow' => 'rgba(var(--color-box-shadow-rgb), 0.5)',
 
-			'--color-border' => $this->util->darken($colorMainBackground, 7),
-			'--color-border-dark' => $this->util->darken($colorMainBackground, 14),
-			'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 51),
-			'--color-border-error' => $colorErrorElement,
-			'--color-border-success' => $colorSuccessElement,
-
 			'--font-face' => "system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'",
 			'--default-font-size' => '15px',
 			'--font-size-small' => '13px',
diff --git a/apps/theming/lib/Themes/HighContrastTheme.php b/apps/theming/lib/Themes/HighContrastTheme.php
index d0e3be1c190..6a846c2a3fc 100644
--- a/apps/theming/lib/Themes/HighContrastTheme.php
+++ b/apps/theming/lib/Themes/HighContrastTheme.php
@@ -72,6 +72,11 @@ class HighContrastTheme extends DefaultTheme implements ITheme {
 				'--color-text-error' => $this->util->darken($colorError, 65),
 				'--color-text-success' => $this->util->darken($colorSuccess, 70),
 
+				'--color-element-error' => $this->util->darken($colorError, 50),
+				'--color-element-info' => $this->util->darken($colorInfo, 50),
+				'--color-element-success' => $this->util->darken($colorSuccess, 55),
+				'--color-element-warning' => $this->util->darken($colorWarning, 50),
+
 				'--color-error' => $colorError,
 				'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
 				'--color-error-hover' => $this->util->darken($colorError, 5),
diff --git a/apps/theming/tests/Themes/AccessibleThemeTestCase.php b/apps/theming/tests/Themes/AccessibleThemeTestCase.php
index 1ad8b1bc82d..8e080159106 100644
--- a/apps/theming/tests/Themes/AccessibleThemeTestCase.php
+++ b/apps/theming/tests/Themes/AccessibleThemeTestCase.php
@@ -135,10 +135,14 @@ class AccessibleThemeTestCase extends TestCase {
 				],
 				$textContrast,
 			],
-			'status-border-colors-on-background' => [
+			'status-element-colors-on-background' => [
 				[
 					'--color-border-error',
 					'--color-border-success',
+					'--color-element-error',
+					'--color-element-info',
+					'--color-element-success',
+					'--color-element-warning',
 				],
 				[
 					'--color-main-background',
@@ -147,7 +151,7 @@ class AccessibleThemeTestCase extends TestCase {
 				],
 				$elementContrast,
 			],
-			'error-text-on-background' => [
+			'status-text-on-background' => [
 				[
 					'--color-text-error',
 					'--color-text-success',
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 72acf25c0a7..f82e5e9ab2f 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -25,6 +25,10 @@ html {
 }
 
 body {
+	// Legacy variables deprecated in Nextcloud 20 - to be removed soon
+	--color-text-light: var(--color-main-text);
+	--color-text-lighter: var(--color-text-maxcontrast);
+
 	// color-background-plain should always be defined.
 	background-color: var(--color-background-plain, var(--color-main-background));
 	// user background, or plain color
diff --git a/core/css/variables.scss b/core/css/variables.scss
index f750b844f0f..e3db811f39b 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -57,8 +57,6 @@ $color-yellow: #FC0;
 // min. color contrast for normal text on white background according to WCAG AA
 // (Works as well: color: #000; opacity: 0.57;)
 $color-text-maxcontrast: nc-lighten($color-main-text, 33%) !default;
-$color-text-light: $color-main-text !default;
-$color-text-lighter: $color-text-maxcontrast !default;
 
 $image-logo: url('../img/logo/logo.svg?v=1') !default;
 $image-login-background: url('../img/background.png?v=2') !default;