More badge tweaks [ci skip]