Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom