Added a new Icon and optimized Graph