Make role / team icons more consistent, it's only decided in one place now, and used across the HUD