diff --git a/apps/federatedfilesharing/src/components/PersonalSettings.vue b/apps/federatedfilesharing/src/components/PersonalSettings.vue
index e58031d5653..f68b755425d 100644
--- a/apps/federatedfilesharing/src/components/PersonalSettings.vue
+++ b/apps/federatedfilesharing/src/components/PersonalSettings.vue
@@ -16,7 +16,7 @@
 			:trailing-button-label="copyLinkTooltip"
 			@trailing-button-click="copyCloudId">
 			<template #trailing-button-icon>
-				<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-success)" />
+				<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-border-success)" />
 				<IconClipboard v-else :size="20" />
 			</template>
 		</NcInputField>
diff --git a/apps/files/src/components/FileEntry/FileEntryActions.vue b/apps/files/src/components/FileEntry/FileEntryActions.vue
index 5c537d878fe..9ed8de1dec5 100644
--- a/apps/files/src/components/FileEntry/FileEntryActions.vue
+++ b/apps/files/src/components/FileEntry/FileEntryActions.vue
@@ -391,7 +391,7 @@ main.app-content[style*="mouse-pos-x"] .v-popper__popper {
 
 	&.files-list__row-action--destructive {
 		::deep(button) {
-			color: var(--color-error) !important;
+			color: var(--color-text-error) !important;
 		}
 	}
 }
diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue
index 47b8ef19b19..bf2a159e767 100644
--- a/apps/files/src/components/FilesListVirtual.vue
+++ b/apps/files/src/components/FilesListVirtual.vue
@@ -853,8 +853,8 @@ export default defineComponent({
 
 				&:invalid {
 					// Show red border on invalid input
-					border-color: var(--color-error);
-					color: red;
+					border-color: var(--color-border-error);
+					color: var(--color-text-error);
 				}
 			}
 		}
diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue
index 027d2a3d5c3..8716987fbe3 100644
--- a/apps/files_sharing/src/components/SharingEntryInternal.vue
+++ b/apps/files_sharing/src/components/SharingEntryInternal.vue
@@ -127,7 +127,7 @@ export default {
 	}
 	.icon-checkmark-color {
 		opacity: 1;
-		color: var(--color-success);
+		color: var(--color-border-success);
 	}
 }
 </style>
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index 782733a76a8..c17f54d980d 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -819,11 +819,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	}
 
 	.errors, .errors a {
-		color: var(--color-error);
+		color: var(--color-text-error);
 	}
 
 	.warnings, .warnings a {
-		color: var(--color-warning);
+		color: var(--color-warning-text);
 	}
 
 	.hint {
diff --git a/apps/settings/src/components/AppList/AppLevelBadge.vue b/apps/settings/src/components/AppList/AppLevelBadge.vue
index 8461f5eb6b9..26eacf6f17d 100644
--- a/apps/settings/src/components/AppList/AppLevelBadge.vue
+++ b/apps/settings/src/components/AppList/AppLevelBadge.vue
@@ -49,8 +49,9 @@ const badgeTitle = computed(() => isSupported.value
 	width: fit-content;
 
 	&--supported {
-		border-color: var(--color-success);
-		color: var(--color-success);
+		background-color: var(--color-success);
+		border-color: var(--color-border-success);
+		color: var(--color-success-text);
 	}
 }
 </style>
diff --git a/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue b/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
index eb66d8f3e3a..79a97397e5b 100644
--- a/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
+++ b/apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
@@ -475,15 +475,15 @@ export default {
 }
 
 .force {
-	color: var(--color-error);
-	border-color: var(--color-error);
+	color: var(--color-text-error);
+	border-color: var(--color-border-error);
 	background: var(--color-main-background);
 }
 
 .force:hover,
 .force:active {
 	color: var(--color-main-background);
-	border-color: var(--color-error) !important;
+	border-color: var(--color-border-error) !important;
 	background: var(--color-error);
 }
 
diff --git a/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue b/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
index d039641ec72..34f4f3c1b20 100644
--- a/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
+++ b/apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue
@@ -223,7 +223,7 @@ section {
 		}
 
 		&--error {
-			color: var(--color-error);
+			color: var(--color-text-error);
 		}
 	}
 
diff --git a/apps/systemtags/src/components/SystemTagPicker.vue b/apps/systemtags/src/components/SystemTagPicker.vue
index 83294701c75..eff870a2083 100644
--- a/apps/systemtags/src/components/SystemTagPicker.vue
+++ b/apps/systemtags/src/components/SystemTagPicker.vue
@@ -17,7 +17,7 @@
 			:name="t('systemtags', 'Applying tags changes…')">
 			<template #icon>
 				<NcLoadingIcon v-if="status === Status.LOADING" />
-				<CheckIcon v-else fill-color="var(--color-success)" />
+				<CheckIcon v-else fill-color="var(--color-border-success)" />
 			</template>
 		</NcEmptyContent>
 
diff --git a/apps/theming/src/components/ItemPreview.vue b/apps/theming/src/components/ItemPreview.vue
index e4a1acd3e2a..d94c0986870 100644
--- a/apps/theming/src/components/ItemPreview.vue
+++ b/apps/theming/src/components/ItemPreview.vue
@@ -157,7 +157,8 @@ export default {
 	}
 
 	&-warning {
-		color: var(--color-warning);
+		background-color: var(--color-warning);
+		color: var(--color-warning-text);
 	}
 }
 
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue
index 136f6d21280..5e303f58894 100644
--- a/apps/workflowengine/src/components/Check.vue
+++ b/apps/workflowengine/src/components/Check.vue
@@ -224,6 +224,6 @@ export default {
 	}
 
 	.invalid {
-		border-color: var(--color-error) !important;
+		border-color: var(--color-border-error) !important;
 	}
 </style>
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 979b1ef02e8..087413eb685 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -330,7 +330,7 @@ input[type='reset'] {
 
 	&.error {
 		background-color: var(--color-error) !important;
-		border-color: var(--color-error) !important;
+		border-color: var(--color-norder-error) !important;
 		color: var(--color-error-text) !important;
 		&:hover{
 			background-color: var(--color-error-hover) !important;
@@ -384,7 +384,7 @@ input[type='email'] {
 	&:not(:active):not(:hover):not(:focus){
 		&:invalid {
 			+ .icon-confirm {
-				border-color: var(--color-error-text);
+				border-color: var(--color-border-error);
 			}
 		}
 		+ .icon-confirm {
diff --git a/core/css/toast.scss b/core/css/toast.scss
index c419c8287e3..5c879cc80cd 100644
--- a/core/css/toast.scss
+++ b/core/css/toast.scss
@@ -44,7 +44,7 @@
 }
 
 .toast-error {
-	border-inline-start: 3px solid var(--color-error-text);
+	border-inline-start: 3px solid var(--color-border-error);
 }
 
 .toast-info {
@@ -52,9 +52,9 @@
 }
 
 .toast-warning {
-	border-inline-start: 3px solid var(--color-warning);
+	border-inline-start: 3px solid var(--color-warning-hover);
 }
 
 .toast-success {
-	border-inline-start: 3px solid var(--color-success);
+	border-inline-start: 3px solid var(--color-border-success);
 }
diff --git a/core/src/components/AppMenuIcon.vue b/core/src/components/AppMenuIcon.vue
index 1b0d48daf8c..7168a149c2e 100644
--- a/core/src/components/AppMenuIcon.vue
+++ b/core/src/components/AppMenuIcon.vue
@@ -56,7 +56,7 @@ $unread-indicator-size: 10px;
 	}
 
 	&__unread {
-		color: var(--color-error);
+		color: var(--color-text-error);
 		position: absolute;
 		// Align the dot to the top right corner of the icon
 		inset-block-end: calc($icon-size + ($unread-indicator-size / -2));