Icon + Refactoring + Threads