Reordering the button arrangement

https://bugzilla.gnome.org/show_bug.cgi?id=736361