Icon fix, as well as 2 new features.