diff --git a/.SRCINFO b/.SRCINFO
index 85ad0bc..9f98627 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
-	pkgver = 3.22.17
-	pkgrel = 2
+	pkgver = 3.22.18
+	pkgrel = 1
 	url = http://www.gtk.org/
 	arch = i686
 	arch = x86_64
@@ -35,7 +35,7 @@ pkgbase = gtk3-mushrooms
 	depends = desktop-file-utils
 	depends = mesa
 	optdepends = gtk3-print-backends: Printing
-	provides = gtk3=3.22.17
+	provides = gtk3=3.22.18
 	conflicts = gtk3
 	source = csd__clean-headerbar.patch
 	source = csd__disabled-by-default.patch
@@ -59,10 +59,10 @@ pkgbase = gtk3-mushrooms
 	source = print-dialog__appearance.patch
 	source = print-dialog__default-previewer.patch
 	source = smaller-adwaita.css
-	source = https://github.com/GNOME/gtk/archive/3.22.17.tar.gz
+	source = https://github.com/GNOME/gtk/archive/3.22.18.tar.gz
 	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=1842b0f5f36f64944ea8941928d77468456e432e
 	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=1842b0f5f36f64944ea8941928d77468456e432e
-	sha256sums = c8255604bb4327279d45abea0b576e09ec0b39ea719587ba5d0eb0dc90ba4219
+	sha256sums = 7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8
 	sha256sums = 58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb
 	sha256sums = a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494
 	sha256sums = 831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0
@@ -84,7 +84,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 692b49bce7143507b5c7f176ac67266d75251088da19b282129ad11a3fab5a41
 	sha256sums = 23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41
 	sha256sums = 0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824
-	sha256sums = cbd384e5d10587f0bbb12efd6677a08906f0c7ab819a1defa573d7f0dbe93b2d
+	sha256sums = 58fba6fd1aea572db7103a56ec777ea84876c9de92c8678d07c601a8d2518c2a
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
 
diff --git a/PKGBUILD b/PKGBUILD
index 45a1a73..7e709e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 __arch_pkg_commit="1842b0f5f36f64944ea8941928d77468456e432e"
 
 pkgname=gtk3-mushrooms
-pkgver=3.22.17
-pkgrel=2
+pkgver=3.22.18
+pkgrel=1
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
 conflicts=(gtk3)
@@ -61,7 +61,7 @@ source=(
 )
 sha256sums=(
 	# Patch files.
-	"c8255604bb4327279d45abea0b576e09ec0b39ea719587ba5d0eb0dc90ba4219"  
+	"7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8"  
 	"58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb"  
 	"a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494"  
 	"831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0"  
@@ -87,7 +87,7 @@ sha256sums=(
 	"0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824"
 
 	# GTK source code from GitHub.
-	"cbd384e5d10587f0bbb12efd6677a08906f0c7ab819a1defa573d7f0dbe93b2d"
+	"58fba6fd1aea572db7103a56ec777ea84876c9de92c8678d07c601a8d2518c2a"
 
 	# ArchLinux package files.
 	"01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch
index 8ebe0f5..d689046 100644
--- a/csd__clean-headerbar.patch
+++ b/csd__clean-headerbar.patch
@@ -1,6 +1,6 @@
 diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
---- ./org/gtk/gtkheaderbar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkheaderbar.c	2017-07-30 01:55:07.781552231 +0200
+--- ./org/gtk/gtkheaderbar.c	2017-08-08 01:36:19.000000000 +0200
++++ ./mod/gtk/gtkheaderbar.c	2017-08-08 21:07:59.106864096 +0200
 @@ -321,10 +321,12 @@
  
    is_sovereign_window = (!gtk_window_get_modal (window) &&
@@ -14,24 +14,25 @@ diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
      {
        for (i = 0; i < 2; i++)
          {
-@@ -382,12 +384,12 @@
-                   gtk_widget_show_all (button);
+@@ -385,13 +387,13 @@
                    accessible = gtk_widget_get_accessible (button);
                    if (GTK_IS_ACCESSIBLE (accessible))
                      atk_object_set_name (accessible, _("Application menu"));
+ 
                    priv->titlebar_icon = image;
 -                  if (!_gtk_header_bar_update_window_icon (bar, window))
--                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "process-stop-symbolic", GTK_ICON_SIZE_MENU);
 +                  if (g_getenv("GTK_CSD") == FALSE || !_gtk_header_bar_update_window_icon (bar, window))
-+                    gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon), "pan-down-symbolic", GTK_ICON_SIZE_MENU);
+                     gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon),
+-                                                  "application-x-executable-symbolic", GTK_ICON_SIZE_MENU);
++                                                  "pan-down-symbolic", GTK_ICON_SIZE_MENU);
                  }
                else if (strcmp (t[j], "minimize") == 0 &&
                         is_sovereign_window)
                  {
                    button = gtk_button_new ();
 diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-30 01:52:45.221545167 +0200
+--- ./org/gtk/gtkwindow.c	2017-08-08 01:36:19.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-08-08 20:48:04.803471587 +0200
 @@ -9092,10 +9092,11 @@
  
  static void