Issue: #20865: Css fixes to prevent wrapping of icon
Issue #20865: Tweaks to css and removal of unnecessary code.
Merge pull request #602 from lynnaloo/20865

20865 - Css tweaks and bug fixes for picker with icon