Added back a border to the generic buttons.