Bug 46804: Make button padding consistent

Change-Id: I64c8d625b8332588316fc30eecd26b40ada13d46
Merge "Bug 46804: Make button padding consistent"