This was failing because the grid is now respecting border width too. Making the selector more specific so it only applies to the toolbars fixes this.
This is mostly search and replace ala GtkButton => button GtkWindow => window .button => button or removing style properties that aren't used anymore like -GtkButton-default-border: 0