outcommented to get running, and changed icons