Toggle picker - better condition to check click on the icon #279