Improved button borders

For all layouts and states.