Better management of highlighted icon visibility