Merge "Fix a find and replace bug in Theme.IconMenu"