Couple bugfixes for scroll, inline grouped label margin fix
Fixes #1023 issue with text icons in dropdown