Improved icon selector