Changed Launcher icons and cleaned up code