better icon management