Move margin to button (bug 867965)