changed icons and changed to async code