diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Inputs.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Inputs.kt
index 43600137d..28a40953f 100644
--- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Inputs.kt
+++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Inputs.kt
@@ -72,6 +72,8 @@ fun Inputs() {
         TextAreaInputSample()
         Title("Check Box input")
         CheckBoxInputSample()
+        DisableCheckBoxInputSample(isChecked = true)
+        DisableCheckBoxInputSample(isChecked = false)
         Title("Dropdown")
         DropDownSample()
         Title("Disable Dropdown")
@@ -385,6 +387,22 @@ fun CheckBoxInputSample() {
     )
 }
 
+@Composable
+fun DisableCheckBoxInputSample(
+    isChecked: Boolean,
+) {
+    CheckBoxInput(
+        checked = isChecked,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = 8.dp, start = 16.dp, end = 16.dp),
+        text = "This is a disabled checkbox",
+        enabled = false,
+        errorText = null,
+        onCheckedChange = { },
+    )
+}
+
 @Composable
 private fun DropDownSample(enabled: Boolean = true) {
     val items = remember {
diff --git a/catalog/src/main/res/layout/screen_inputs_catalog.xml b/catalog/src/main/res/layout/screen_inputs_catalog.xml
index 43f095f2a..1874c49a9 100644
--- a/catalog/src/main/res/layout/screen_inputs_catalog.xml
+++ b/catalog/src/main/res/layout/screen_inputs_catalog.xml
@@ -311,6 +311,14 @@
                     app:inputCheckText="This is a disabled CheckBox"
                     app:inputEnabled="false"/>
 
+            <com.telefonica.mistica.input.CheckBoxInput
+                    android:id="@+id/disabled_checkboxInput_unchecked"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:inputCheckText="This is a disabled CheckBox"
+                    app:inputChecked="false"
+                    app:inputEnabled="false"/>
+
         </LinearLayout>
 
         <com.telefonica.mistica.title.TitleView
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__checked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__checked.png
new file mode 100644
index 000000000..ac178a5c9
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__checked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__checked_dark.png
new file mode 100644
index 000000000..8dc135500
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked.png
new file mode 100644
index 000000000..fca44a34d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..a565d988c
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked.png
new file mode 100644
index 000000000..b60b4a690
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..cf743f069
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked.png
new file mode 100644
index 000000000..47571729d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..157c91b6f
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..1147c7a6d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..4cfca33ce
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..84f03b5e0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..944d5d12d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked.png
new file mode 100644
index 000000000..a45ea58c8
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..5ed351be3
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked.png b/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked.png
new file mode 100644
index 000000000..e3092038b
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked_dark.png
new file mode 100644
index 000000000..492b35089
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_BlauBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__checked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__checked.png
new file mode 100644
index 000000000..7a536e8aa
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__checked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__checked_dark.png
new file mode 100644
index 000000000..69868cc1d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked.png
new file mode 100644
index 000000000..926c094f5
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..808373b0e
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked.png
new file mode 100644
index 000000000..9ea86825b
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..f7ee4d630
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked.png
new file mode 100644
index 000000000..a3fe0f947
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..dcdbb2077
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..83f6f46f1
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..2a24e0b02
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..f5be937bc
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..c8b3a1fd1
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked.png
new file mode 100644
index 000000000..3619278e6
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..e6263758a
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked.png
new file mode 100644
index 000000000..8bd6ed7c1
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked_dark.png
new file mode 100644
index 000000000..ddeb936e8
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_MovistarBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__checked.png b/library/screenshots/CheckBoxInputXML_O2Brand__checked.png
new file mode 100644
index 000000000..ed1280bd7
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__checked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__checked_dark.png
new file mode 100644
index 000000000..3d83a2b39
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked.png
new file mode 100644
index 000000000..1663abbed
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked_dark.png
new file mode 100644
index 000000000..447aa58eb
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked.png
new file mode 100644
index 000000000..55432bf5b
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..6551b4b5f
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked.png
new file mode 100644
index 000000000..276f715b7
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked_dark.png
new file mode 100644
index 000000000..e1a732694
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked.png
new file mode 100644
index 000000000..929521098
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..eda415490
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..e6ec45566
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..ecdaaa6ff
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked.png
new file mode 100644
index 000000000..e7af33d31
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..91a1ed3ac
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__unchecked.png b/library/screenshots/CheckBoxInputXML_O2Brand__unchecked.png
new file mode 100644
index 000000000..eb0b3289f
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_O2Brand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_O2Brand__unchecked_dark.png
new file mode 100644
index 000000000..63e6fa15f
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_O2Brand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked.png
new file mode 100644
index 000000000..da587d6f9
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked_dark.png
new file mode 100644
index 000000000..1eb0d9abb
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked.png
new file mode 100644
index 000000000..0246d0bd1
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..1f6d4dd9a
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked.png
new file mode 100644
index 000000000..2f0062494
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..7a2413eda
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked.png
new file mode 100644
index 000000000..4a7829bef
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..944a5ea6d
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..6ceb0258e
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..5c5e97d27
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..de800f07f
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..7738252c9
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked.png
new file mode 100644
index 000000000..72e6ad3c6
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..44a105042
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked.png
new file mode 100644
index 000000000..91c8dca8a
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked_dark.png
new file mode 100644
index 000000000..bef50f384
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TelefonicaBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__checked.png b/library/screenshots/CheckBoxInputXML_TuBrand__checked.png
new file mode 100644
index 000000000..5ce88706b
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__checked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__checked_dark.png
new file mode 100644
index 000000000..7322c924c
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked.png
new file mode 100644
index 000000000..2f42199d6
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..3b62bc6a0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked.png
new file mode 100644
index 000000000..766921bf9
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..84c1975d0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked.png
new file mode 100644
index 000000000..b94f87d13
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..032bee5dc
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..00f788fd6
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..f264bb011
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..b64c2d8f0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..5d033e9b6
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked.png
new file mode 100644
index 000000000..3b3a3b912
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..eecc11782
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__unchecked.png b/library/screenshots/CheckBoxInputXML_TuBrand__unchecked.png
new file mode 100644
index 000000000..9b6ed8ed8
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_TuBrand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_TuBrand__unchecked_dark.png
new file mode 100644
index 000000000..d7072f537
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_TuBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__checked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__checked.png
new file mode 100644
index 000000000..132d819af
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__checked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__checked_dark.png
new file mode 100644
index 000000000..a5d98f002
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked.png
new file mode 100644
index 000000000..60ce284f1
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..2f079c00e
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked.png
new file mode 100644
index 000000000..dcd18901e
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..2e4ed4013
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked.png
new file mode 100644
index 000000000..9b7baed29
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..a760d6e4a
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..546c3daf0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..2ba265cfe
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..c8b53e1db
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..7193e1b25
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked.png
new file mode 100644
index 000000000..12e730135
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..03a9059d0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked.png b/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked.png
new file mode 100644
index 000000000..8d40b232b
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked_dark.png b/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked_dark.png
new file mode 100644
index 000000000..e9ead0ec0
Binary files /dev/null and b/library/screenshots/CheckBoxInputXML_VivoBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__checked.png b/library/screenshots/CheckBoxInput_BlauBrand__checked.png
new file mode 100644
index 000000000..a7e727adb
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__checked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__checked_dark.png
new file mode 100644
index 000000000..84ed5ac70
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked.png b/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked.png
new file mode 100644
index 000000000..4a5427eb2
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..f5f51e301
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked.png
new file mode 100644
index 000000000..dc947e3ba
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..49c204750
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked.png
new file mode 100644
index 000000000..b24e8bf0c
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..f18ac64e9
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..2062e1aee
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..735519d0b
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..8dba737f8
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..f034a1f72
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked.png
new file mode 100644
index 000000000..f67ee463e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..19834f9b1
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__unchecked.png b/library/screenshots/CheckBoxInput_BlauBrand__unchecked.png
new file mode 100644
index 000000000..62a741fe2
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_BlauBrand__unchecked_dark.png b/library/screenshots/CheckBoxInput_BlauBrand__unchecked_dark.png
new file mode 100644
index 000000000..f36d58082
Binary files /dev/null and b/library/screenshots/CheckBoxInput_BlauBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__checked.png b/library/screenshots/CheckBoxInput_MovistarBrand__checked.png
new file mode 100644
index 000000000..6a6d9c771
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__checked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__checked_dark.png
new file mode 100644
index 000000000..d580a193f
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked.png b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked.png
new file mode 100644
index 000000000..aba39c44b
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..5b55bc2d1
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked.png
new file mode 100644
index 000000000..942ecc550
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..fca991bed
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked.png
new file mode 100644
index 000000000..a566ade1b
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..13c6673f0
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..c46cb1c34
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..75c15f205
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..54f45c4a3
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..6d7c04e5f
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked.png
new file mode 100644
index 000000000..b3db46288
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..bb9108664
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__unchecked.png b/library/screenshots/CheckBoxInput_MovistarBrand__unchecked.png
new file mode 100644
index 000000000..debf183d7
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_MovistarBrand__unchecked_dark.png b/library/screenshots/CheckBoxInput_MovistarBrand__unchecked_dark.png
new file mode 100644
index 000000000..92049d7c7
Binary files /dev/null and b/library/screenshots/CheckBoxInput_MovistarBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__checked.png b/library/screenshots/CheckBoxInput_O2Brand__checked.png
new file mode 100644
index 000000000..005867d11
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__checked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__checked_dark.png
new file mode 100644
index 000000000..b76f6ef55
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__disabled_checked.png b/library/screenshots/CheckBoxInput_O2Brand__disabled_checked.png
new file mode 100644
index 000000000..22666ac35
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__disabled_checked_dark.png
new file mode 100644
index 000000000..c61ab94d6
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked.png
new file mode 100644
index 000000000..c949d328e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..ef3e39dc1
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_checked.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_checked.png
new file mode 100644
index 000000000..8afc99c56
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_checked_dark.png
new file mode 100644
index 000000000..fec39a604
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked.png
new file mode 100644
index 000000000..7111e9f38
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..92439ce46
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..9a9696dea
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..07a48f0bd
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked.png
new file mode 100644
index 000000000..b848edc54
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..936fcccd4
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__unchecked.png b/library/screenshots/CheckBoxInput_O2Brand__unchecked.png
new file mode 100644
index 000000000..02ad4a4ee
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_O2Brand__unchecked_dark.png b/library/screenshots/CheckBoxInput_O2Brand__unchecked_dark.png
new file mode 100644
index 000000000..ee6936c44
Binary files /dev/null and b/library/screenshots/CheckBoxInput_O2Brand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__checked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__checked.png
new file mode 100644
index 000000000..365111082
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__checked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__checked_dark.png
new file mode 100644
index 000000000..4ecc8474a
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked.png
new file mode 100644
index 000000000..ab595012d
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..41b822b18
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked.png
new file mode 100644
index 000000000..91348a70c
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..7fb8f68f4
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked.png
new file mode 100644
index 000000000..5b0fdf58f
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..26fff3ef4
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..0d479a330
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..7d6057d28
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..0ca1d7aad
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..528170bf7
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked.png
new file mode 100644
index 000000000..d6f8c8806
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..1fc9045d8
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked.png
new file mode 100644
index 000000000..ffc376b42
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked_dark.png b/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked_dark.png
new file mode 100644
index 000000000..fc55a4280
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TelefonicaBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__checked.png b/library/screenshots/CheckBoxInput_TuBrand__checked.png
new file mode 100644
index 000000000..e861e1f53
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__checked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__checked_dark.png
new file mode 100644
index 000000000..3780e2c32
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__disabled_checked.png b/library/screenshots/CheckBoxInput_TuBrand__disabled_checked.png
new file mode 100644
index 000000000..74bf896f9
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..13de9a87e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked.png
new file mode 100644
index 000000000..e9fa2a61f
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..2b6b54edb
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_checked.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_checked.png
new file mode 100644
index 000000000..e3d64a406
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..955b1e27e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..214a23716
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..898d80b8d
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..4c02d3ab8
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..c72e8aa41
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked.png
new file mode 100644
index 000000000..171778906
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..62b6bce4e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__unchecked.png b/library/screenshots/CheckBoxInput_TuBrand__unchecked.png
new file mode 100644
index 000000000..e6a2992b9
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_TuBrand__unchecked_dark.png b/library/screenshots/CheckBoxInput_TuBrand__unchecked_dark.png
new file mode 100644
index 000000000..8b77e8173
Binary files /dev/null and b/library/screenshots/CheckBoxInput_TuBrand__unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__checked.png b/library/screenshots/CheckBoxInput_VivoBrand__checked.png
new file mode 100644
index 000000000..31aca75b5
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__checked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__checked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__checked_dark.png
new file mode 100644
index 000000000..9f1945b69
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked.png b/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked.png
new file mode 100644
index 000000000..889ef1fcf
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked_dark.png
new file mode 100644
index 000000000..7feffda34
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked.png b/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked.png
new file mode 100644
index 000000000..8f86e8f1a
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked_dark.png
new file mode 100644
index 000000000..ae62041da
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked.png
new file mode 100644
index 000000000..fc6f8f73e
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked_dark.png
new file mode 100644
index 000000000..d12f2c603
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked.png
new file mode 100644
index 000000000..0c80e1441
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked_dark.png
new file mode 100644
index 000000000..e2f47e627
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_checked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked.png
new file mode 100644
index 000000000..ea8af4a40
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked_dark.png
new file mode 100644
index 000000000..79211b1b4
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_disabled_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked.png
new file mode 100644
index 000000000..dbbbbae25
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked_dark.png
new file mode 100644
index 000000000..d2ffe80a6
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__errorText_unchecked_dark.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__unchecked.png b/library/screenshots/CheckBoxInput_VivoBrand__unchecked.png
new file mode 100644
index 000000000..dfd4dd35a
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__unchecked.png differ
diff --git a/library/screenshots/CheckBoxInput_VivoBrand__unchecked_dark.png b/library/screenshots/CheckBoxInput_VivoBrand__unchecked_dark.png
new file mode 100644
index 000000000..c09f03ae9
Binary files /dev/null and b/library/screenshots/CheckBoxInput_VivoBrand__unchecked_dark.png differ
diff --git a/library/src/main/java/com/telefonica/mistica/compose/input/CheckBoxInput.kt b/library/src/main/java/com/telefonica/mistica/compose/input/CheckBoxInput.kt
index 53e856605..7a3e61f59 100644
--- a/library/src/main/java/com/telefonica/mistica/compose/input/CheckBoxInput.kt
+++ b/library/src/main/java/com/telefonica/mistica/compose/input/CheckBoxInput.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Checkbox
+import androidx.compose.material.CheckboxDefaults
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.LocalMinimumTouchTargetEnforcement
 import androidx.compose.runtime.Composable
@@ -12,6 +13,8 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.telefonica.mistica.compose.theme.MisticaTheme
+import com.telefonica.mistica.compose.ui.alpha
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -25,13 +28,24 @@ fun CheckBoxInput(
     enabled: Boolean = true,
     onCheckedChange: (Boolean) -> Unit = {},
 ) {
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier.alpha(enabled)
+    ) {
         Row {
             CompositionLocalProvider(LocalMinimumTouchTargetEnforcement provides false) {
                 Checkbox(
                     checked = checked,
                     onCheckedChange = onCheckedChange,
                     enabled = enabled,
+                    colors = CheckboxDefaults.colors(
+                        checkedColor = MisticaTheme.colors.controlActivated,
+                        uncheckedColor = MisticaTheme.colors.control,
+                        disabledColor = if (checked) {
+                            MisticaTheme.colors.controlActivated
+                        } else {
+                            MisticaTheme.colors.control
+                        }
+                    )
                 )
             }
             Spacer(modifier = Modifier.width(8.dp))
diff --git a/library/src/main/java/com/telefonica/mistica/input/CheckBoxInput.kt b/library/src/main/java/com/telefonica/mistica/input/CheckBoxInput.kt
index d78e51ff9..12a70ae55 100644
--- a/library/src/main/java/com/telefonica/mistica/input/CheckBoxInput.kt
+++ b/library/src/main/java/com/telefonica/mistica/input/CheckBoxInput.kt
@@ -1,6 +1,7 @@
 package com.telefonica.mistica.input
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.text.method.MovementMethod
@@ -12,6 +13,7 @@ import androidx.appcompat.widget.AppCompatCheckBox
 import androidx.databinding.*
 import com.google.android.material.textfield.TextInputLayout
 import com.telefonica.mistica.R
+import com.telefonica.mistica.util.getThemeColor
 
 @BindingMethods(
     BindingMethod(
@@ -74,6 +76,7 @@ class CheckBoxInput @JvmOverloads constructor(
         setChecked(initialInputChecked)
         setText(initialInputText)
         configureErrorResetOnCheckChange()
+        setButtonTint()
 
         return findViewById(R.id.text_input_layout)
     }
@@ -85,6 +88,18 @@ class CheckBoxInput @JvmOverloads constructor(
         }
     }
 
+    private fun setButtonTint() {
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_checked),
+        )
+        val colors = intArrayOf(
+            context.getThemeColor(R.attr.colorControlActive),
+            context.getThemeColor(R.attr.colorControl),
+        )
+        checkBox.buttonTintList = ColorStateList(states, colors)
+    }
+
     fun setChecked(checked: Boolean) {
         checkBox.isChecked = checked
     }
diff --git a/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt b/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt
index e02ae44ef..7545424c5 100644
--- a/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt
+++ b/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt
@@ -20,6 +20,7 @@ import com.telefonica.mistica.compose.theme.brand.TelefonicaBrand
 import com.telefonica.mistica.compose.theme.brand.TuBrand
 import com.telefonica.mistica.compose.theme.brand.VivoBrand
 import com.telefonica.mistica.testutils.ScreenshotsTest
+import com.telefonica.mistica.testutils.TestUtils
 import com.telefonica.mistica.testutils.TestUtils.getAllBrands
 import com.telefonica.mistica.testutils.TestUtils.isInverse
 import com.telefonica.mistica.util.getThemeColor
@@ -37,7 +38,7 @@ internal class ButtonTest(
 ) : ScreenshotsTest() {
 
     private val intent = Intent(ApplicationProvider.getApplicationContext(), DummyActivity::class.java).apply {
-        this.putExtra(EXTRA_THEME, brand.getBaseThemeForBrand())
+        this.putExtra(EXTRA_THEME, TestUtils.getBaseThemeForBrand(brand))
     }
 
     @get:Rule
@@ -105,17 +106,6 @@ internal class ButtonTest(
     }
 }
 
-@StyleRes
-private fun Brand.getBaseThemeForBrand(): Int = when (this) {
-    MovistarBrand -> R.style.MisticaTheme_Movistar
-    VivoBrand -> R.style.MisticaTheme_Vivo
-    O2Brand -> R.style.MisticaTheme_O2
-    BlauBrand -> R.style.MisticaTheme_Blau
-    TuBrand -> R.style.MisticaTheme_Tu
-    TelefonicaBrand -> R.style.MisticaTheme_Telefonica
-    else -> error("No tests defined for brand $this")
-}
-
 @LayoutRes
 private fun ButtonStyle.getButtonLayout(): Int = when (this) {
     ButtonStyle.PRIMARY -> R.layout.primary_button
diff --git a/library/src/test/java/com/telefonica/mistica/compose/input/CheckBoxInputTest.kt b/library/src/test/java/com/telefonica/mistica/compose/input/CheckBoxInputTest.kt
new file mode 100644
index 000000000..52d261458
--- /dev/null
+++ b/library/src/test/java/com/telefonica/mistica/compose/input/CheckBoxInputTest.kt
@@ -0,0 +1,100 @@
+package com.telefonica.mistica.compose.input
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Surface
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.unit.dp
+import com.telefonica.mistica.compose.theme.MisticaTheme
+import com.telefonica.mistica.compose.theme.brand.Brand
+import com.telefonica.mistica.testutils.ScreenshotsTest
+import com.telefonica.mistica.testutils.TestUtils
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.ParameterizedRobolectricTestRunner.Parameters
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class CheckBoxInputTest(
+    private val brand: Brand,
+    private val checked: Boolean,
+    private val isEnabled: Boolean,
+    private val errorText: String?,
+    private val darkTheme: Boolean,
+) : ScreenshotsTest() {
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun `CheckBoxInput compose screenshot`() {
+        composeTestRule.setContent {
+            MisticaTheme(brand = brand, darkTheme = darkTheme) {
+                Surface(
+                    color = MisticaTheme.colors.background
+                ) {
+                    CheckBoxInput(
+                        modifier = Modifier.padding(16.dp),
+                        text = "Some text with terms and conditions",
+                        links = listOf(
+                            TextLink(link = "terms and conditions", onLinkTapped = {}),
+                        ),
+                        checked = checked,
+                        onCheckedChange = {},
+                        errorText = errorText,
+                        enabled = isEnabled,
+                    )
+                }
+            }
+        }
+
+        val screenshotSuffix = StringBuilder()
+        if (errorText != null) {
+            screenshotSuffix.append("_errorText")
+        }
+        if (!isEnabled) {
+            screenshotSuffix.append("_disabled")
+        }
+
+        if (checked) {
+            screenshotSuffix.append("_checked")
+        } else {
+            screenshotSuffix.append("_unchecked")
+        }
+
+        compareScreenshot(
+            node = composeTestRule.onRoot(),
+            component = "CheckBoxInput",
+            style = null,
+            brand = brand,
+            darkTheme = darkTheme,
+            extra = screenshotSuffix.toString()
+        )
+    }
+
+    companion object {
+        @Suppress("UNUSED")
+        @JvmStatic
+        @Parameters
+        fun brands(): List<Array<Any?>> {
+            val brands = TestUtils.getAllBrands()
+            val enabled = arrayOf(false, true)
+            val checked = arrayOf(false, true)
+            val errorTexts = arrayOf(null, "Some error text")
+            val darkTheme = arrayOf(false, true)
+
+            return brands.flatMap { brand ->
+                enabled.flatMap { isEnabled ->
+                    checked.flatMap { isChecked ->
+                        errorTexts.flatMap { errorText ->
+                            darkTheme.map { darkTheme ->
+                                arrayOf(brand, isEnabled, isChecked, errorText, darkTheme)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/telefonica/mistica/input/CheckBoxInputTest.kt b/library/src/test/java/com/telefonica/mistica/input/CheckBoxInputTest.kt
new file mode 100644
index 000000000..783780b0b
--- /dev/null
+++ b/library/src/test/java/com/telefonica/mistica/input/CheckBoxInputTest.kt
@@ -0,0 +1,121 @@
+package com.telefonica.mistica.input
+
+import android.content.Intent
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.view.View
+import android.widget.FrameLayout
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.telefonica.mistica.DummyActivity
+import com.telefonica.mistica.R
+import com.telefonica.mistica.compose.theme.brand.Brand
+import com.telefonica.mistica.testutils.ScreenshotsTest
+import com.telefonica.mistica.testutils.TestUtils
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class CheckBoxInputTest(
+    private val brand: Brand,
+    private val checked: Boolean,
+    private val isEnabled: Boolean,
+    private val errorText: String?,
+) : ScreenshotsTest() {
+    private val intent = Intent(ApplicationProvider.getApplicationContext(), DummyActivity::class.java).apply {
+        this.putExtra(DummyActivity.EXTRA_THEME, TestUtils.getBaseThemeForBrand(brand))
+    }
+
+    @get:Rule
+    val rule = activityScenarioRule<DummyActivity>(intent)
+
+    @Test
+    fun `CheckBoxInput XML screenshot light`() {
+        `compare CheckBoxInput XML screenshot`(darkTheme = false)
+    }
+
+    @Config(qualifiers = "+night")
+    @Test
+    fun `CheckBoxInput XML screenshot dark`() {
+        `compare CheckBoxInput XML screenshot`(darkTheme = true)
+    }
+
+    private fun `compare CheckBoxInput XML screenshot`(darkTheme: Boolean) {
+        rule.scenario.onActivity { activity ->
+            val wrapper: FrameLayout = activity.findViewById(R.id.dummy_activity_wrapper)
+            val checkbox = CheckBoxInput(activity).apply {
+                setChecked(checked)
+                error = errorText
+                setText(createSpannableText())
+                setMovementMethod(LinkMovementMethod.getInstance())
+                isEnabled = this@CheckBoxInputTest.isEnabled
+            }
+
+            wrapper.removeAllViews()
+            wrapper.addView(checkbox)
+
+            val screenshotSuffix = StringBuilder()
+            if (errorText != null) {
+                screenshotSuffix.append("_errorText")
+            }
+            if (!isEnabled) {
+                screenshotSuffix.append("_disabled")
+            }
+
+            if (checked) {
+                screenshotSuffix.append("_checked")
+            } else {
+                screenshotSuffix.append("_unchecked")
+            }
+
+            compareScreenshot(
+                node = Espresso.onView(ViewMatchers.withId(R.id.dummy_activity_wrapper)),
+                component = "CheckBoxInputXML",
+                style = null,
+                brand = brand,
+                darkTheme = darkTheme,
+                extra = screenshotSuffix.toString()
+            )
+        }
+    }
+
+    private fun createSpannableText(): Spannable {
+        val termsAndConditions = "terms and conditions"
+        val message = "Some text with $termsAndConditions"
+        return SpannableString(message).apply {
+            setSpan(dummyClickableSpan, message.indexOf(termsAndConditions), message.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+    }
+
+    companion object {
+        @Suppress("UNUSED")
+        @JvmStatic
+        @ParameterizedRobolectricTestRunner.Parameters
+        fun brands(): List<Array<Any?>> {
+            val brands = TestUtils.getAllBrands()
+            val enabled = arrayOf(false, true)
+            val checked = arrayOf(false, true)
+            val errorTexts = arrayOf(null, "Some error text")
+
+            return brands.flatMap { brand ->
+                enabled.flatMap { isEnabled ->
+                    checked.flatMap { isChecked ->
+                        errorTexts.map { errorText ->
+                            arrayOf(brand, isEnabled, isChecked, errorText)
+                        }
+                    }
+                }
+            }
+        }
+
+        private val dummyClickableSpan = object : ClickableSpan() { override fun onClick(widget: View) {} }
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/telefonica/mistica/testutils/ScreenshotUtils.kt b/library/src/test/java/com/telefonica/mistica/testutils/ScreenshotUtils.kt
index 194906093..97024a7ea 100644
--- a/library/src/test/java/com/telefonica/mistica/testutils/ScreenshotUtils.kt
+++ b/library/src/test/java/com/telefonica/mistica/testutils/ScreenshotUtils.kt
@@ -8,7 +8,11 @@ object ScreenshotUtils {
         val componentOrTestName = if(component == null) {
             TestUtils.findRunningTestMethodName()
         } else {
-            "${component}_${style}"
+            var componentName = component
+            if (style != null) {
+                componentName += "_$style"
+            }
+            componentName
         }
         val brandValue = if (brand != null) {
             brand::class.java.simpleName
diff --git a/library/src/test/java/com/telefonica/mistica/testutils/TestUtils.kt b/library/src/test/java/com/telefonica/mistica/testutils/TestUtils.kt
index 2b6617432..08ebf66ea 100644
--- a/library/src/test/java/com/telefonica/mistica/testutils/TestUtils.kt
+++ b/library/src/test/java/com/telefonica/mistica/testutils/TestUtils.kt
@@ -1,7 +1,10 @@
 package com.telefonica.mistica.testutils
 
+import androidx.annotation.StyleRes
+import com.telefonica.mistica.R
 import com.telefonica.mistica.compose.button.ButtonStyle
 import com.telefonica.mistica.compose.theme.brand.BlauBrand
+import com.telefonica.mistica.compose.theme.brand.Brand
 import com.telefonica.mistica.compose.theme.brand.MovistarBrand
 import com.telefonica.mistica.compose.theme.brand.O2Brand
 import com.telefonica.mistica.compose.theme.brand.TelefonicaBrand
@@ -45,4 +48,15 @@ object TestUtils {
         ButtonStyle.LINK_INVERSE -> true
         else -> false
     }
+
+    @StyleRes
+    fun getBaseThemeForBrand(brand: Brand): Int = when (brand) {
+        MovistarBrand -> R.style.MisticaTheme_Movistar
+        VivoBrand -> R.style.MisticaTheme_Vivo
+        O2Brand -> R.style.MisticaTheme_O2
+        BlauBrand -> R.style.MisticaTheme_Blau
+        TuBrand -> R.style.MisticaTheme_Tu
+        TelefonicaBrand -> R.style.MisticaTheme_Telefonica
+        else -> error("No tests defined for brand $this")
+    }
 }
\ No newline at end of file