Adjust borders to match their usage elsewhere