4171 Add units to right padding on tags
Merge pull request #1930 from sarken/issue_4171

4171 Add units to right padding on tags