Removed unused stuff and replaced chart icon