diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index c43e45eb8e111..b839593a38f47 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -219,6 +219,7 @@
             <xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
             <xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
             <xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
+            <xs:element name="colorPicker" type="formElementColorPicker" maxOccurs="unbounded"/>
             <xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
             <xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
             <xs:element name="text" type="formElementText" maxOccurs="unbounded"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
index 509ef2aad2dee..dea1f7ce059e9 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
@@ -22,6 +22,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementColorPicker">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentColorPickerSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentColorPickerSettings">
         <xs:choice>
             <xs:group ref="abstractSettings"/>
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
index 4e4fbefd7871d..60f6f9b105ee2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
@@ -1,2 +1,2 @@
-theme * /
-library * /
\ No newline at end of file
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
+* * /