Bug Fix and new Icon