MDL-36631 usability: Core edit for new messaging icons