[4.1] Improved Badges

Minor badge fixes.