Cleanup stuff + new STDT icon