Made menu icons hiding more consistent