UI improvement & icon management