This fixes a code readability regression caused by 2ed274da where margin sizing is hard to determine by reading the code as well as a visual regression where the margins of buttons don't exist.
BUG: 425255