Fixed bug on header icons management