Merge "Switch add icons to the default menu add icon"