Custom border color
Custom font for button
Merge branch 'custom_font'

* custom_font:
  Custom font for button
  Custom border color