Merge "Update the margin for the right icon."