Temp class icon removal and other fixes