diff --git a/src/framework/theme/styles/themes/_mapping.scss b/src/framework/theme/styles/themes/_mapping.scss
index 4d33bb3426..c7ac509082 100644
--- a/src/framework/theme/styles/themes/_mapping.scss
+++ b/src/framework/theme/styles/themes/_mapping.scss
@@ -877,70 +877,70 @@ $eva-mapping: (
   checkbox-disabled-checkmark-color: background-basic-color-1,
   checkbox-disabled-text-color: text-disabled-color,
 
-  checkbox-primary-background-color: color-primary-200,
+  checkbox-primary-background-color: background-basic-color-2,
   checkbox-primary-border-color: color-primary-default,
   checkbox-primary-checked-background-color: color-primary-default,
   checkbox-primary-checked-border-color: color-primary-default,
-  checkbox-primary-checked-checkmark-color: background-basic-color-1,
+  checkbox-primary-checked-checkmark-color: text-control-color,
   checkbox-primary-indeterminate-background-color: color-primary-default,
   checkbox-primary-indeterminate-border-color: color-primary-default,
-  checkbox-primary-indeterminate-checkmark-color: background-basic-color-1,
+  checkbox-primary-indeterminate-checkmark-color: text-control-color,
   checkbox-primary-focus-border-color: color-primary-700,
   checkbox-primary-hover-background-color: color-primary-400,
   checkbox-primary-hover-border-color: color-primary-400,
   checkbox-primary-active-background-color: color-primary-600,
   checkbox-primary-active-border-color: color-primary-600,
 
-  checkbox-success-background-color: color-success-200,
+  checkbox-success-background-color: background-basic-color-2,
   checkbox-success-border-color: color-success-default,
   checkbox-success-checked-background-color: color-success-default,
   checkbox-success-checked-border-color: color-success-default,
-  checkbox-success-checked-checkmark-color: background-basic-color-1,
+  checkbox-success-checked-checkmark-color: text-control-color,
   checkbox-success-indeterminate-background-color: color-success-default,
   checkbox-success-indeterminate-border-color: color-success-default,
-  checkbox-success-indeterminate-checkmark-color: background-basic-color-1,
+  checkbox-success-indeterminate-checkmark-color: text-control-color,
   checkbox-success-focus-border-color: color-success-700,
   checkbox-success-hover-background-color: color-success-400,
   checkbox-success-hover-border-color: color-success-400,
   checkbox-success-active-background-color: color-success-600,
   checkbox-success-active-border-color: color-success-600,
 
-  checkbox-warning-background-color: color-warning-200,
+  checkbox-warning-background-color: background-basic-color-2,
   checkbox-warning-border-color: color-warning-default,
   checkbox-warning-checked-background-color: color-warning-default,
   checkbox-warning-checked-border-color: color-warning-default,
-  checkbox-warning-checked-checkmark-color: background-basic-color-1,
+  checkbox-warning-checked-checkmark-color: text-control-color,
   checkbox-warning-indeterminate-background-color: color-warning-default,
   checkbox-warning-indeterminate-border-color: color-warning-default,
-  checkbox-warning-indeterminate-checkmark-color: background-basic-color-1,
+  checkbox-warning-indeterminate-checkmark-color: text-control-color,
   checkbox-warning-focus-border-color: color-warning-700,
   checkbox-warning-hover-background-color: color-warning-400,
   checkbox-warning-hover-border-color: color-warning-400,
   checkbox-warning-active-background-color: color-warning-600,
   checkbox-warning-active-border-color: color-warning-600,
 
-  checkbox-danger-background-color: color-danger-200,
+  checkbox-danger-background-color: background-basic-color-2,
   checkbox-danger-border-color: color-danger-default,
   checkbox-danger-checked-background-color: color-danger-default,
   checkbox-danger-checked-border-color: color-danger-default,
-  checkbox-danger-checked-checkmark-color: background-basic-color-1,
+  checkbox-danger-checked-checkmark-color: text-control-color,
   checkbox-danger-indeterminate-background-color: color-danger-default,
   checkbox-danger-indeterminate-border-color: color-danger-default,
-  checkbox-danger-indeterminate-checkmark-color: background-basic-color-1,
+  checkbox-danger-indeterminate-checkmark-color: text-control-color,
   checkbox-danger-focus-border-color: color-danger-700,
   checkbox-danger-hover-background-color: color-danger-400,
   checkbox-danger-hover-border-color: color-danger-400,
   checkbox-danger-active-background-color: color-danger-600,
   checkbox-danger-active-border-color: color-danger-600,
 
-  checkbox-info-background-color: color-info-200,
+  checkbox-info-background-color: background-basic-color-2,
   checkbox-info-border-color: color-info-default,
   checkbox-info-checked-background-color: color-info-default,
   checkbox-info-checked-border-color: color-info-default,
-  checkbox-info-checked-checkmark-color: background-basic-color-1,
+  checkbox-info-checked-checkmark-color: text-control-color,
   checkbox-info-indeterminate-background-color: color-info-default,
   checkbox-info-indeterminate-border-color: color-info-default,
-  checkbox-info-indeterminate-checkmark-color: background-basic-color-1,
+  checkbox-info-indeterminate-checkmark-color: text-control-color,
   checkbox-info-focus-border-color: color-info-700,
   checkbox-info-hover-background-color: color-info-400,
   checkbox-info-hover-border-color: color-info-400,