Update for class icon & team display

Big thanks to trog!