CLC-4242 - Badges - extra padding in popover title & align link icon

https://jira.ets.berkeley.edu/jira/browse/CLC-4242
Merge pull request #2929 from christianv/CLC-4242

CLC-4242 - Badges - extra padding in popover title & align link icon