Second batch of gtk3.14 fixes...
Buttons this time :)