Switching themes doesn’t revert the button order, as the button order is only a global setting. This is bad UI design.

I filed a bug about changing this in Gnome:
http://bugzilla.gnome.org/show_bug.cgi?id=613522