add margin around user buttons (closes #3495)
Merge pull request #6 from CircleCode/3.2-I3495

3.2 i3495