Better header menu icon handling.