diff --git a/src/components/AdminSettings/BotsSettings.vue b/src/components/AdminSettings/BotsSettings.vue
index 75744c748c1..93fbc313fe9 100644
--- a/src/components/AdminSettings/BotsSettings.vue
+++ b/src/components/AdminSettings/BotsSettings.vue
@@ -142,12 +142,12 @@ export default {
 		getStateIcon(state) {
 			switch (state) {
 				case BOT.STATE.NO_SETUP:
-					return { state_icon_component: IconLockOutline, state_icon_label: t('spreed', 'Locked for moderators'), state_icon_color: 'var(--color-warning-text)' }
+					return { state_icon_component: IconLockOutline, state_icon_label: t('spreed', 'Locked for moderators'), state_icon_color: 'var(--color-favorite)' }
 				case BOT.STATE.ENABLED:
-					return { state_icon_component: IconCheck, state_icon_label: t('spreed', 'Enabled'), state_icon_color: 'var(--color-success-text)' }
+					return { state_icon_component: IconCheck, state_icon_label: t('spreed', 'Enabled'), state_icon_color: 'var(--color-border-success)' }
 				case BOT.STATE.DISABLED:
 				default:
-					return { state_icon_component: IconCancel, state_icon_label: t('spreed', 'Disabled'), state_icon_color: 'var(--color-error-text)' }
+					return { state_icon_component: IconCancel, state_icon_label: t('spreed', 'Disabled'), state_icon_color: 'var(--color-border-error)' }
 			}
 		},
 	},
diff --git a/src/components/AdminSettings/RecordingServer.vue b/src/components/AdminSettings/RecordingServer.vue
index 3a206e897dd..f7708ccb05a 100644
--- a/src/components/AdminSettings/RecordingServer.vue
+++ b/src/components/AdminSettings/RecordingServer.vue
@@ -32,8 +32,8 @@
 
 		<span v-if="server" class="test-connection">
 			<NcLoadingIcon v-if="!checked" :size="20" />
-			<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error-text)" />
-			<IconCheck v-else :size="20" fill-color="var(--color-success-text)" />
+			<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-border-error)" />
+			<IconCheck v-else :size="20" fill-color="var(--color-border-success)" />
 			{{ connectionState }}
 		</span>
 
diff --git a/src/components/AdminSettings/SignalingServer.vue b/src/components/AdminSettings/SignalingServer.vue
index c7953a430dc..78b43cc3aee 100644
--- a/src/components/AdminSettings/SignalingServer.vue
+++ b/src/components/AdminSettings/SignalingServer.vue
@@ -31,9 +31,9 @@
 
 		<span v-if="server" class="test-connection">
 			<NcLoadingIcon v-if="!checked" :size="20" />
-			<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-error-text)" />
-			<IconAlertCircleOutline v-else-if="warningMessage" :size="20" fill-color="var(--color-warning-text)" />
-			<IconCheck v-else :size="20" fill-color="var(--color-success-text)" />
+			<IconAlertCircleOutline v-else-if="errorMessage" :size="20" fill-color="var(--color-border-error)" />
+			<IconAlertCircleOutline v-else-if="warningMessage" :size="20" fill-color="var(--color-favorite)" />
+			<IconCheck v-else :size="20" fill-color="var(--color-border-success)" />
 			{{ connectionState }}
 
 			<NcButton v-if="server && checked"
diff --git a/src/components/AdminSettings/StunServer.vue b/src/components/AdminSettings/StunServer.vue
index 69e31d85c99..709ec41179c 100644
--- a/src/components/AdminSettings/StunServer.vue
+++ b/src/components/AdminSettings/StunServer.vue
@@ -23,7 +23,7 @@
 		<IconAlertCircleOutline v-show="!isValidServer"
 			class="stun-server__alert"
 			:title="t('spreed', 'The server address is invalid')"
-			fill-color="#E9322D" />
+			fill-color="var(--color-border-error)" />
 
 		<NcButton v-show="!loading"
 			variant="tertiary"
diff --git a/src/components/AdminSettings/TurnServer.vue b/src/components/AdminSettings/TurnServer.vue
index baf454c4e07..3b70fbd1061 100644
--- a/src/components/AdminSettings/TurnServer.vue
+++ b/src/components/AdminSettings/TurnServer.vue
@@ -55,8 +55,8 @@
 			@click="testServer">
 			<template #icon>
 				<NcLoadingIcon v-if="testing" :size="20" />
-				<IconAlertCircleOutline v-else-if="testingError" fill-color="#E9322D" />
-				<IconCheck v-else-if="testingSuccess" fill-color="#46BA61" />
+				<IconAlertCircleOutline v-else-if="testingError" fill-color="var(--color-border-error)" />
+				<IconCheck v-else-if="testingSuccess" fill-color="var(--color-border-success)" />
 				<IconPulse v-else />
 			</template>
 		</NcButton>
diff --git a/src/components/AdminSettings/WebServerSetupChecks.vue b/src/components/AdminSettings/WebServerSetupChecks.vue
index 389197a0e52..362ba60ec09 100644
--- a/src/components/AdminSettings/WebServerSetupChecks.vue
+++ b/src/components/AdminSettings/WebServerSetupChecks.vue
@@ -16,13 +16,12 @@
 				{{ t('spreed', 'Files required for virtual background can be loaded') }}
 				<NcButton variant="tertiary"
 					class="vue-button-inline"
-					:class="{ 'success-button': virtualBackgroundAvailable === true, 'error-button': virtualBackgroundAvailable === false }"
 					:title="virtualBackgroundAvailableTitle"
 					:aria-label="virtualBackgroundAvailableAriaLabel"
 					@click="checkVirtualBackground">
 					<template #icon>
-						<IconAlertCircleOutline v-if="virtualBackgroundAvailable === false" :size="20" />
-						<IconCheck v-else-if="virtualBackgroundAvailable === true" :size="20" />
+						<IconAlertCircleOutline v-if="virtualBackgroundAvailable === false" :size="20" fill-color="var(--color-border-error)" />
+						<IconCheck v-else-if="virtualBackgroundAvailable === true" :size="20" fill-color="var(--color-border-success)" />
 						<NcLoadingIcon v-else :size="20" />
 					</template>
 				</NcButton>
@@ -174,13 +173,5 @@ export default {
 <style lang="scss" scoped>
 .vue-button-inline {
 	display: inline-block !important;
-
-	&.success-button {
-		color: var(--color-success-text);
-	}
-
-	&.error-button {
-		color: var(--color-error-text);
-	}
 }
 </style>
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index b24ef48acbb..1a85a3a3b1a 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -612,7 +612,7 @@ export default {
 
 <style lang="scss" scoped>
 .critical > :deep(.action-button) {
-	color: var(--color-error-text);
+	color: var(--color-text-error);
 }
 
 .conversation {
diff --git a/src/components/PollViewer/PollViewer.vue b/src/components/PollViewer/PollViewer.vue
index de8418f33ed..e5cf3a2f2c4 100644
--- a/src/components/PollViewer/PollViewer.vue
+++ b/src/components/PollViewer/PollViewer.vue
@@ -490,6 +490,6 @@ export default {
 }
 
 .critical :deep(.action-button) {
-	color: var(--color-error-text) !important;
+	color: var(--color-text-error) !important;
 }
 </style>
diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
index 39a482df20b..362ab680630 100644
--- a/src/components/RightSidebar/Participants/Participant.vue
+++ b/src/components/RightSidebar/Participants/Participant.vue
@@ -1046,7 +1046,7 @@ export default {
 	}
 
 	:deep(.list-item-content__actions > .critical) {
-		color: var(--color-error-text);
+		color: var(--color-text-error);
 	}
 }
 
@@ -1057,7 +1057,7 @@ export default {
 }
 
 .critical > :deep(.action-button) {
-	color: var(--color-error-text);
+	color: var(--color-text-error);
 }
 
 </style>