Polish buttons
Tweak header buttons