Merge "Fix MENU icon weirdness."