Lighter state badges
Merge bug25970