20865 - Css tweaks and bug fixes for picker with icon