Improved badges
Merge pull request #4334 from GrahamCampbell/4.1-badges

[4.1] Improved Badges