Improve icon management