Merge "Create attr for padding between icon and text in cells" into tm-qpr-dev