The `$button-border-color` was never used within the mixin

Even though the $button-border-color is defined, it is nevery actually used in the mixin creating the buttons. This makes it impossible to change the border-color using the settings.

This is a replacement for #2773 because it was using the `master` branch.