Proposed change for issue #5455

Add button hover and border variables