diff -rU 0 a/configure b/configure
--- a/configure	2016-04-11 18:05:01.000000000 -0600
+++ b/configure	2016-04-28 21:22:15.196129300 -0600
@@ -21484 +21484 @@
-LIBS="-lcairo  $LIBS"
+LIBS="$CAIRO_LIBS $LIBS"
@@ -22564 +22564 @@
-if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
+if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui; then
diff -rU 0 a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
--- a/gtk/gtkiconhelper.c	2016-03-25 20:46:38.000000000 -0600
+++ b/gtk/gtkiconhelper.c	2016-04-28 21:21:47.092456500 -0600
@@ -897 +897,8 @@
-      gtk_css_style_render_icon_surface (gtk_css_node_get_style (gtk_css_gadget_get_node (GTK_CSS_GADGET (self))),
+      GtkCssNode *node;
+
+      /* Avoid calling gtk_css_node_get_style() because it can
+       * invalidate the style which we don't want while trying
+       * to render the current style.
+       */
+      node = gtk_css_gadget_get_node (GTK_CSS_GADGET (self));
+      gtk_css_style_render_icon_surface (node->style,
diff -rU 0 a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
--- a/gtk/gtkplacessidebar.c	2016-04-11 12:49:51.000000000 -0600
+++ b/gtk/gtkplacessidebar.c	2016-04-28 21:21:47.092456500 -0600
@@ -544,0 +545 @@
+  return TRUE;  // hack to get "Recent" location working on Windows and OSX
diff -rU 0 a/gtk/gtkwindow.c b/gtk/gtkwindow.c
--- a/gtk/gtkwindow.c	2016-04-11 17:43:49.000000000 -0600
+++ b/gtk/gtkwindow.c	2016-04-28 21:21:47.108082100 -0600
@@ -79,0 +80,4 @@
+#ifdef GDK_WINDOWING_QUARTZ
+#include "quartz/gdkquartz.h"
+#endif
+
@@ -4089,0 +4094,5 @@
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+  if (GDK_IS_QUARTZ_DISPLAY (gtk_widget_get_display (GTK_WIDGET(window))))
+    return FALSE;
diff -rU 0 a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
--- a/gtk/theme/Adwaita/gtk-contained.css	2016-04-11 14:13:15.000000000 -0600
+++ b/gtk/theme/Adwaita/gtk-contained.css	2016-04-28 21:21:47.108082100 -0600
@@ -2,0 +3 @@
+  -GtkButtonBox-child-internal-pad-y: 1;
Only in b: gtk+-3.20.3.patch