Merge "Fixed a padding issue if there is no right icon but a reply icon"