Icon changed + bugs fixes