Cleanup some stuff + new STDT icon?