Issue: #20865: Css fixes to prevent wrapping of icon
Issue #20865: Tweaks to css and removal of unnecessary code.