diff --git a/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue b/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue
index ff0927ace2..d198ea1457 100644
--- a/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue
+++ b/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue
@@ -136,7 +136,7 @@ export default {
 
 	&__title {
 		font-weight: bold;
-		color: var(--color-primary-element);
+		color: var(--color-main-text);
 		font-size: var(--default-font-size);
 		line-height: $clickable-area;
 		white-space: nowrap;
diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
index 7049f51bb4..6104d3cec5 100644
--- a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
+++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
@@ -533,7 +533,7 @@ $spacing: 4px;
 		margin-right: $spacing;
 		// Remove the left margin of material design icons to align text
 		margin-left: -2px;
-		color: var(--color-primary-element);
+		color: var(--color-primary-element-text);
 		width: var(--icon-size);
 		height: var(--icon-size);
 	}
@@ -562,7 +562,7 @@ $spacing: 4px;
 
 	// If switch is checked AND disabled, use the fade primary colour
 	&-switch.checkbox-radio-switch--disabled.checkbox-radio-switch--checked &__icon > * {
-		color: var(--color-primary-element-light);
+		color: var(--color-primary-element-text);
 	}
 
 	$border-radius: calc(var(--default-clickable-area) / 2);