Improved badges
Merge pull request #2885 from GrahamCampbell/badges

[4.1] Improved Badges