Improve icon states