Fix button padding properly this time