2.1 css fixes for button in header

Issue
-
button is header does not match theme

Test Case
-
Add a button-grouped and button with icon on custom header

Fix
-
CSS fixes to match themes

![img](https://dl.dropboxusercontent.com/u/3964110/22.png)