Improved icon, a lot