Improved icon use.