Border above account settings buttons
Merge branch 'account-buttons'