Refactoring + Updated Launcher Icon