diff --git a/package.json b/package.json
index 6f6d60263..e9dc304ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@unicef/material-ui",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "UNICEF theme and components of material-ui for react",
   "main": "index.js",
   "files": [
diff --git a/src/components/ActiveKeyboardDatePicker/ActiveKeyboardDatePicker.js b/src/components/ActiveKeyboardDatePicker/ActiveKeyboardDatePicker.js
index 78c96f0ee..65d4d1445 100644
--- a/src/components/ActiveKeyboardDatePicker/ActiveKeyboardDatePicker.js
+++ b/src/components/ActiveKeyboardDatePicker/ActiveKeyboardDatePicker.js
@@ -70,6 +70,7 @@ export default function ActiveKeyboardDatePicker(props) {
     showLabelHelp,
     InputLabelHelpProps,
     label,
+    KeyboardButtonProps,
     ...others
   } = props
 
@@ -113,6 +114,7 @@ export default function ActiveKeyboardDatePicker(props) {
         }}
         readOnly={readOnly}
         KeyboardButtonProps={{
+          ...KeyboardButtonProps,
           classes: {
             root: `${!interactiveMode && !readOnly ? '' : hideIcon}`,
           },
@@ -170,6 +172,8 @@ ActiveKeyboardDatePicker.propTypes = {
   showLabelHelp: PropTypes.bool,
   /** Props applied to the input label help element. E.g InputLabelHelpProps={{type:'link', label:'Help', link:'unicef.github.io', icon, tooltipTitle: 'Tooltip title', tooltipPlacement: 'bottom}} */
   InputLabelHelpProps: PropTypes.object,
+  /** Keyboard button props */
+  KeyboardButtonProps: PropTypes.object,
 }
 
 ActiveKeyboardDatePicker.defaultProps = {
@@ -177,4 +181,5 @@ ActiveKeyboardDatePicker.defaultProps = {
   autoOk: true,
   variant: 'inline',
   format: 'dd/MM/yyyy',
+  KeyboardButtonProps: {},
 }
diff --git a/src/components/ActiveKeyboardDateTimePicker/ActiveKeyboardDateTimePicker.js b/src/components/ActiveKeyboardDateTimePicker/ActiveKeyboardDateTimePicker.js
index 95cc8ed05..52f8f2c3d 100644
--- a/src/components/ActiveKeyboardDateTimePicker/ActiveKeyboardDateTimePicker.js
+++ b/src/components/ActiveKeyboardDateTimePicker/ActiveKeyboardDateTimePicker.js
@@ -69,6 +69,7 @@ export default function ActiveKeyboardDateTimePicker(props) {
     showLabelHelp,
     InputLabelHelpProps,
     label,
+    KeyboardButtonProps,
     ...others
   } = props
 
@@ -112,6 +113,7 @@ export default function ActiveKeyboardDateTimePicker(props) {
         }}
         readOnly={readOnly}
         KeyboardButtonProps={{
+          ...KeyboardButtonProps,
           classes: {
             root: `${!interactiveMode && !readOnly ? '' : hideIcon}`,
           },
@@ -169,6 +171,8 @@ ActiveKeyboardDateTimePicker.propTypes = {
   showLabelHelp: PropTypes.bool,
   /** Props applied to the input label help element. E.g InputLabelHelpProps={{type:'link', label:'Help', link:'unicef.github.io', icon, tooltipTitle: 'Tooltip title', tooltipPlacement: 'bottom}} */
   InputLabelHelpProps: PropTypes.object,
+  /** Keyboard button props */
+  KeyboardButtonProps: PropTypes.object,
 }
 
 ActiveKeyboardDateTimePicker.defaultProps = {
@@ -176,4 +180,5 @@ ActiveKeyboardDateTimePicker.defaultProps = {
   autoOk: true,
   variant: 'inline',
   format: 'dd/MM/yyyy hh:mm a',
+  KeyboardButtonProps: {},
 }
diff --git a/src/components/ActiveKeyboardTimePicker/ActiveKeyboardTimePicker.js b/src/components/ActiveKeyboardTimePicker/ActiveKeyboardTimePicker.js
index 51292f8b9..dac8e719a 100644
--- a/src/components/ActiveKeyboardTimePicker/ActiveKeyboardTimePicker.js
+++ b/src/components/ActiveKeyboardTimePicker/ActiveKeyboardTimePicker.js
@@ -68,6 +68,7 @@ export default function ActiveKeyboardTimePicker(props) {
     showLabelHelp,
     InputLabelHelpProps,
     label,
+    KeyboardButtonProps,
     ...others
   } = props
 
@@ -109,6 +110,7 @@ export default function ActiveKeyboardTimePicker(props) {
         }}
         readOnly={readOnly}
         KeyboardButtonProps={{
+          ...KeyboardButtonProps,
           classes: {
             root: `${!interactiveMode && !readOnly ? '' : hideIcon}`,
           },
@@ -162,10 +164,13 @@ ActiveKeyboardTimePicker.propTypes = {
   showLabelHelp: PropTypes.bool,
   /** Props applied to the input label help element. E.g InputLabelHelpProps={{type:'link', label:'Help', link:'unicef.github.io', icon, tooltipTitle: 'Tooltip title', tooltipPlacement: 'bottom}} */
   InputLabelHelpProps: PropTypes.object,
+  /** Keyboard button props */
+  KeyboardButtonProps: PropTypes.object,
 }
 
 ActiveKeyboardTimePicker.defaultProps = {
   inputVariant: 'outlined',
   autoOk: true,
   variant: 'inline',
+  KeyboardButtonProps: {},
 }
diff --git a/src/components/USelectPicker/Input.js b/src/components/USelectPicker/Input.js
index d2022004e..ad099b153 100644
--- a/src/components/USelectPicker/Input.js
+++ b/src/components/USelectPicker/Input.js
@@ -14,7 +14,15 @@ export default function Input(props) {
         : undefined
   }
 
-  return <components.Input {...props} aria-describedby={describedBy} />
+  return (
+    <components.Input
+      {...props}
+      aria-describedby={describedBy}
+      required={
+        (props && props.selectProps && props.selectProps.required) || undefined
+      }
+    />
+  )
 }
 
 Input.propTypes = {
diff --git a/src/components/USelectPicker/InputComponent.js b/src/components/USelectPicker/InputComponent.js
index 398d70cd8..b670031a2 100644
--- a/src/components/USelectPicker/InputComponent.js
+++ b/src/components/USelectPicker/InputComponent.js
@@ -2,7 +2,14 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 export default function InputComponent({ inputRef, ...props }) {
-  return <div ref={inputRef} {...props} />
+  return (
+    <div
+      ref={inputRef}
+      {...props}
+      required={undefined} // Remove required from div element
+      aria-invalid={undefined} // Remove aria-invalid from div element
+    />
+  )
 }
 
 InputComponent.propTypes = {