Add badge border color & width
Merge branch 'refs/heads/Feature/AddBorder'