File chooser changes, other improvements.

- Unneeded dependences and makedepends removed form PKGBUILD.
- REAMDE.md updated.

- Dropped support of custom stylesheet for HighContrast theme.
- Improved custom stylesheet for Adwaita theme: buttons are smaller, dotted lines in scrolled windows are hidden, file chooser looks better.

- Patch of file chooser typeahead feature improved. Now it is possible to use default GTK recursive search engine by Alt+S shortcut.
- Better patch of print dialog appearance. Now print dialog appearance exactly match to other dialogs.
- Simplification of file chooser icons patch. "-gtk-icon-style: regular" CSS property is used.

9 files changed, 292 insertions, 505 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c42fb76cdc7d..920d1b425be6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
 	pkgver = 3.22.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gtk.org/
 	arch = i686
 	arch = x86_64
@@ -9,9 +9,6 @@ pkgbase = gtk3-mushrooms
 	makedepends = gobject-introspection
 	makedepends = libcanberra
 	makedepends = gtk-doc
-	makedepends = rest
-	makedepends = libcups
-	makedepends = glib2-docs
 	depends = atk
 	depends = cairo
 	depends = libxcursor
@@ -28,13 +25,15 @@ pkgbase = gtk3-mushrooms
 	depends = at-spi2-atk
 	depends = wayland
 	depends = libxkbcommon
-	depends = adwaita-icon-theme
 	depends = json-glib
 	depends = librsvg
 	depends = wayland-protocols
 	depends = desktop-file-utils
 	depends = mesa
-	optdepends = gtk3-print-backends: Printing
+	depends = gtk-update-icon-cache
+	optdepends = gtk3-print-backends: printing
+	optdepends = adwaita-icon-theme: default icon theme
+	optdepends = cantarell-fonts: default font
 	provides = gtk3=3.22.19
 	conflicts = gtk3
 	source = csd__clean-headerbar.patch
@@ -60,8 +59,8 @@ pkgbase = gtk3-mushrooms
 	source = print-dialog__default-previewer.patch
 	source = smaller-adwaita.css
 	source = https://github.com/GNOME/gtk/archive/3.22.19.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
+	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=eb853c7714b8675246344169980ace3f4e18aac3
+	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=eb853c7714b8675246344169980ace3f4e18aac3
 	sha256sums = 7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8
 	sha256sums = 58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb
 	sha256sums = a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494
@@ -69,21 +68,21 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 5f6dded28c77cfbd1c58f8c334c8544fc84093124f385f87dcf05eeb045bbd8b
 	sha256sums = 4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb
 	sha256sums = 9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9
-	sha256sums = 114edc66d1453fc3dbf2314b939d135b10ad3414fd972da77c5a44534bb6c6d6
+	sha256sums = fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f
 	sha256sums = 769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4
-	sha256sums = 6f37fcf05281642a3a41e9f9994be21905264daf64f6e59455586bc82e502473
-	sha256sums = e8e1a4faceff212cb9ab5d29bbf6e9f6f817cba2fcce61e7e5cd51d0f1dd33dd
+	sha256sums = a2af0c7f29e9ae5e2a669f4ad131acab8d5cbd5d47cc3914750db25b8eeefe1e
+	sha256sums = b978504d311fb87505e1787a07c246310e3389840082f326e266193ad908c0f1
 	sha256sums = cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a
 	sha256sums = 103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c
 	sha256sums = 7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac
 	sha256sums = cfacf351122f95cbef5e752f8e1850ee4ff5495d3bf43732405c2a51e02a9f24
 	sha256sums = 64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace
-	sha256sums = 1ef8375ec4c9275e0e143a39347c931b85eaa4e393aea8ab375db759d9b8ae0f
+	sha256sums = e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171
 	sha256sums = ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851
 	sha256sums = a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb
-	sha256sums = 692b49bce7143507b5c7f176ac67266d75251088da19b282129ad11a3fab5a41
+	sha256sums = b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629
 	sha256sums = 23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41
-	sha256sums = 0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824
+	sha256sums = 0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5
 	sha256sums = 4b86fbb917fd6242684e815482b6c495015ae86260f8919c9cb5bcdbd25a3e3f
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
diff --git a/PKGBUILD b/PKGBUILD
index f3251bb082e7..9ba7a142a8f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
-__arch_pkg_commit="1842b0f5f36f64944ea8941928d77468456e432e"
+__arch_pkg_commit="eb853c7714b8675246344169980ace3f4e18aac3"
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.19
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
 conflicts=(gtk3)
@@ -17,13 +17,15 @@ license=(LGPL)
 depends=(
 	atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
 	libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-	adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+	json-glib librsvg wayland-protocols desktop-file-utils mesa gtk-update-icon-cache
 )
 optdepends=(
-	'gtk3-print-backends: Printing'
+	'gtk3-print-backends: printing'
+	'adwaita-icon-theme: default icon theme'
+	'cantarell-fonts: default font'
 )
 makedepends=(
-	gobject-introspection libcanberra gtk-doc rest libcups glib2-docs
+	gobject-introspection libcanberra gtk-doc
 )
 source=(
 	# Patch files.
@@ -49,7 +51,7 @@ source=(
 	"print-dialog__appearance.patch"
 	"print-dialog__default-previewer.patch"
 
-	# Themes CSS file.
+	# Theme CSS stylesheet.
 	"smaller-adwaita.css"
 
 	# GTK source code from GitHub.
@@ -61,30 +63,30 @@ source=(
 )
 sha256sums=(
 	# Patch files.
-	"7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8"  
-	"58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb"  
-	"a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494"  
-	"831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0"  
-	"5f6dded28c77cfbd1c58f8c334c8544fc84093124f385f87dcf05eeb045bbd8b"  
-	"4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb"  
-	"9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9"  
-	"114edc66d1453fc3dbf2314b939d135b10ad3414fd972da77c5a44534bb6c6d6"  
-	"769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4"  
-	"6f37fcf05281642a3a41e9f9994be21905264daf64f6e59455586bc82e502473"  
-	"e8e1a4faceff212cb9ab5d29bbf6e9f6f817cba2fcce61e7e5cd51d0f1dd33dd"  
-	"cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a"  
-	"103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c"  
-	"7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac"  
-	"cfacf351122f95cbef5e752f8e1850ee4ff5495d3bf43732405c2a51e02a9f24"  
-	"64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace"  
-	"1ef8375ec4c9275e0e143a39347c931b85eaa4e393aea8ab375db759d9b8ae0f"  
-	"ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851"  
-	"a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb"  
-	"692b49bce7143507b5c7f176ac67266d75251088da19b282129ad11a3fab5a41"  
-	"23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41"  
-
-	# Themes CSS file.
-	"0b055f7437d965601fe306631fd29f56bb12018dde005d60729e3f40e85f0824"
+	"7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8"
+	"58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb"
+	"a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494"
+	"831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0"
+	"5f6dded28c77cfbd1c58f8c334c8544fc84093124f385f87dcf05eeb045bbd8b"
+	"4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb"
+	"9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9"
+	"fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f"
+	"769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4"
+	"a2af0c7f29e9ae5e2a669f4ad131acab8d5cbd5d47cc3914750db25b8eeefe1e"
+	"b978504d311fb87505e1787a07c246310e3389840082f326e266193ad908c0f1"
+	"cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a"
+	"103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c"
+	"7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac"
+	"cfacf351122f95cbef5e752f8e1850ee4ff5495d3bf43732405c2a51e02a9f24"
+	"64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace"
+	"e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171"
+	"ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851"
+	"a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb"
+	"b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629"
+	"23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41"
+
+	# Theme CSS stylesheet.
+	"0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5"
 
 	# GTK source code from GitHub.
 	"4b86fbb917fd6242684e815482b6c495015ae86260f8919c9cb5bcdbd25a3e3f"
@@ -131,8 +133,6 @@ __patch_gtk_code()
 
 	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/Adwaita/gtk-contained.css"
 	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/Adwaita/gtk-contained-dark.css"
-	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/HighContrast/gtk-contained.css"
-	cat "$srcdir/smaller-adwaita.css" >> "gtk/theme/HighContrast/gtk-contained-inverse.css"
 }
 
 prepare()
diff --git a/README.md b/README.md
index 3560f85fca41..4facbcecba7d 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,13 @@ Client Side Decorations
 * CSDs are totally disabled by default. All windows are decorated only by window manager. You can enable CSDs by setting `GTK_CSD=0` environment variable (or `GTK_CSD=1` to force CSDs on each GTK3 window).
 * Client side shadows of windows, menus and tooltips are disabled by default. You can enable shadows by setting `GTK_CSD=1` environment variable.
 * Window title and subtitle are removed from headerbar. Subtitle is added to native titlebar.
-* Minimize, maximize and close buttons are removed. Application menu button has changed icon.
+* Minimize, maximize and close buttons are removed from headerbar. Application menu button has changed icon.
 
 File chooser
 ---
 
 * Annoying single-click "feature" in file list is disabled. You always have to double-click to choose file from list. See https://bugzilla.gnome.org/show_bug.cgi?id=758065.
-* Typeahead feature is restored. Recursive file search will not be ran when you start typing. See https://bugzilla.gnome.org/show_bug.cgi?id=784029.
+* Typeahead feature is restored. Recursive file search will not be ran automatically when you start typing. You can still search recursively by Left Alt + S shortcut. See https://bugzilla.gnome.org/show_bug.cgi?id=784029.
 * Current working directory is opened by default instead of section with recently used files.
 * "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly.
 * File system button in places sidebar is labeled as "File System" instead of "Computer".
@@ -32,9 +32,9 @@ Print dialog
 Icons
 ---
 
-* Some of GTK stock icons on buttons are restored. You can see it in GTK internal dialogs and in some applications.
+* Some GTK stock icons on buttons are restored. You can see it in GTK internal dialogs and in some applications.
 * Context menus of text fields, links and labels have restored icons too.
-* Colorized icons instead of symbolic icons are used in file chooser dialog.
+* Regular colorized icons instead of symbolic icons are used in file chooser dialog.
 
 Popovers
 ---
@@ -50,11 +50,12 @@ Others
 * Delay before showing mnemonics is removed. You don't have to wait when you press Left Alt button.
 * Integration with Accessibility Toolkit is disabled by default to avoid errors in console output. See https://unix.stackexchange.com/questions/230238. **Important: if you are using assistive technologies (such as Orca reader) you must restore default GTK behavior by setting `NO_AT_BRIDGE=0` environment variable.**
 
-Themes
+Adwaita theme
 ---
 
-* Default Adwaita theme and its dark variant have smaller controls (buttons, fields, tabs, etc.).
-* HighContrast themes also have reduced controls (testing).
+* Default Adwaita theme have smaller controls (buttons, fields, tabs, etc.).
+* Message dialogs have more natural appearance.
+* Dashed lines on edges of scrolled boxes are removed. See https://wiki.archlinux.org/index.php/GTK+#Disable_overlay_scrollbars.
 
 --------
 
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch
index d61f8f732774..eebf7a00660b 100644
--- a/file-chooser__typeahead.patch
+++ b/file-chooser__typeahead.patch
@@ -1,22 +1,19 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserdialog.c ./mod/gtk/gtkfilechooserdialog.c
---- ./org/gtk/gtkfilechooserdialog.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserdialog.c	2017-07-30 13:23:41.280123562 +0200
-@@ -479,11 +479,11 @@
-     return;
- 
-   dialog->priv->search_setup = TRUE;
- 
-   g_object_get (dialog, "use-header-bar", &use_header, NULL);
--  if (use_header)
-+  if (FALSE && use_header)
-     {
-       GtkWidget *button;
-       GtkWidget *image;
-       GtkWidget *header;
- 
 diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 13:24:45.543460079 +0200
+--- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-25 00:23:59.644034148 +0200
+@@ -1399,11 +1399,11 @@
+         {
+           location_popup_handler (impl, event->string);
+           return TRUE;
+         }
+     }
+-  else if (gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event))
++  else if (FALSE && gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event))
+     {
+       if (priv->operation_mode != OPERATION_MODE_SEARCH)
+         operation_mode_set (impl, OPERATION_MODE_SEARCH);
+       return TRUE;
+     }
 @@ -2476,11 +2476,11 @@
  static void
  file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
@@ -30,20 +27,20 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
    gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE);
    gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT);
-@@ -3246,10 +3246,12 @@
-     case OPERATION_MODE_BROWSE:
-       operation_mode_set_browse (impl);
-       break;
+@@ -7152,12 +7152,10 @@
+ {
+   GList *l, *files, *files_with_info, *infos;
+   GFile *file;
+   gboolean select = FALSE;
  
-     case OPERATION_MODE_SEARCH:
-+      priv->operation_mode = old_mode;
-+      return;
-       operation_mode_set_search (impl);
-       break;
+-  if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0)
+-    select = TRUE;
  
-     case OPERATION_MODE_RECENT:
-       operation_mode_set_recent (impl);
-@@ -7496,11 +7498,11 @@
+   files = NULL;
+   files_with_info = NULL;
+   infos = NULL;
+   for (l = hits; l; l = l->next)
+@@ -7496,11 +7494,11 @@
    GtkFileChooserWidget *impl = load_data->impl;
    GtkFileChooserWidgetPrivate *priv = impl->priv;
  
@@ -56,19 +53,30 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
    gtk_tree_view_column_set_sort_column_id (priv->list_size_column, -1);
    gtk_tree_view_column_set_sort_column_id (priv->list_location_column, -1);
-diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:25:38.093462683 +0200
-@@ -160,11 +160,11 @@
-                                 <property name="hscrollbar-policy">never</property>
-                                 <child>
-                                   <object class="GtkTreeView" id="browse_files_tree_view">
-                                     <property name="visible">1</property>
-                                     <property name="has-tooltip">1</property>
--                                    <property name="enable-search">0</property>
-+                                    <property name="enable-search">1</property>
-                                     <child internal-child="accessible">
-                                       <object class="AtkObject" id="browse_files_tree_view-atkobject">
-                                         <property name="AtkObject::accessible-name" translatable="yes">Files</property>
-                                       </object>
-                                     </child>
+@@ -8422,14 +8420,10 @@
+   gtk_binding_entry_add_signal (binding_set,
+                                 GDK_KEY_s, GDK_MOD1_MASK,
+                                 "search-shortcut",
+                                 0);
+   gtk_binding_entry_add_signal (binding_set,
+-                                GDK_KEY_f, GDK_CONTROL_MASK,
+-                                "search-shortcut",
+-                                0);
+-  gtk_binding_entry_add_signal (binding_set,
+                                 GDK_KEY_r, GDK_MOD1_MASK,
+                                 "recent-shortcut",
+                                 0);
+   gtk_binding_entry_add_signal (binding_set,
+                                 GDK_KEY_p, GDK_MOD1_MASK,
+@@ -8543,10 +8537,11 @@
+   /* Some qdata, qdata can't be set with GtkBuilder */
+   g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), "fmq-name", "file_list");
+   g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl);
+ 
+   /* Setup file list treeview */
++  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (impl->priv->browse_files_tree_view), TRUE);
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->priv->browse_files_tree_view));
+   gtk_tree_selection_set_select_function (selection,
+                                           list_select_func,
+                                           impl, NULL);
+   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->priv->browse_files_tree_view),
diff --git a/icons__context-menus.patch b/icons__context-menus.patch
index d8f385a539af..27027d2b8b26 100644
--- a/icons__context-menus.patch
+++ b/icons__context-menus.patch
@@ -1,6 +1,6 @@
 diff -U 5 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/gtkimagemenuitem.c
---- ./org/gtk/deprecated/gtkimagemenuitem.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/deprecated/gtkimagemenuitem.c	2017-07-30 14:50:21.813714571 +0200
+--- ./org/gtk/deprecated/gtkimagemenuitem.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/deprecated/gtkimagemenuitem.c	2017-08-26 18:50:45.994104623 +0200
 @@ -489,10 +489,22 @@
  gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
                                 const gchar      *label)
@@ -25,9 +25,9 @@ diff -U 5 -r -Z -B ./org/gtk/deprecated/gtkimagemenuitem.c ./mod/gtk/deprecated/
        priv->label = g_strdup (label);
  
 diff -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
---- ./org/gtk/gtkentry.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkentry.c	2017-07-30 14:49:33.493712177 +0200
-@@ -9447,11 +9447,11 @@
+--- ./org/gtk/gtkentry.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtkentry.c	2017-08-26 18:50:46.004104623 +0200
+@@ -9480,11 +9480,11 @@
  		      GtkWidget    *menu,
  		      const gchar  *label,
  		      const gchar  *signal,
@@ -40,7 +40,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
    g_signal_connect (menuitem, "activate",
  		    G_CALLBACK (activate_cb), entry);
  
-@@ -9514,22 +9514,22 @@
+@@ -9549,22 +9549,22 @@
                              info_entry_priv->current_pos != info_entry_priv->selection_bound);
  
        append_action_signal (entry, menu, _("_Paste"), "paste-clipboard",
@@ -65,10 +65,11 @@ diff -U 5 -r -Z -B ./org/gtk/gtkentry.c ./mod/gtk/gtkentry.c
                                  G_CALLBACK (gtk_entry_select_all), entry);
        gtk_widget_show (menuitem);
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+Tylko w ./mod/gtk: gtkentry.c.orig
 diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
---- ./org/gtk/gtklabel.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtklabel.c	2017-07-30 14:49:33.497045511 +0200
-@@ -6547,11 +6547,11 @@
+--- ./org/gtk/gtklabel.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtklabel.c	2017-08-26 18:50:46.007437956 +0200
+@@ -6562,11 +6562,11 @@
  		      GtkWidget    *menu,
  		      const gchar  *text,
  		      const gchar  *signal,
@@ -81,7 +82,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
    g_signal_connect (menuitem, "activate",
  		    G_CALLBACK (activate_cb), label);
  
-@@ -6638,20 +6638,20 @@
+@@ -6653,20 +6653,20 @@
      link = gtk_label_get_focus_link (label);
  
    if (!have_selection && link)
@@ -104,7 +105,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
  
        g_signal_connect (G_OBJECT (menuitem), "activate",
-@@ -6661,20 +6661,20 @@
+@@ -6676,20 +6676,20 @@
      {
        append_action_signal (label, menu, _("Cu_t"), "cut-clipboard", FALSE);
        append_action_signal (label, menu, _("_Copy"), "copy-clipboard", have_selection);
@@ -127,9 +128,10 @@ diff -U 5 -r -Z -B ./org/gtk/gtklabel.c ./mod/gtk/gtklabel.c
        gtk_widget_show (menuitem);
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
      }
+Tylko w ./mod/gtk: gtklabel.c.orig
 diff -U 5 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
---- ./org/gtk/gtklinkbutton.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtklinkbutton.c	2017-07-30 14:49:33.497045511 +0200
+--- ./org/gtk/gtklinkbutton.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtklinkbutton.c	2017-08-26 18:50:46.010771290 +0200
 @@ -365,11 +365,11 @@
  
        gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu),
@@ -143,3 +145,45 @@ diff -U 5 -r -Z -B ./org/gtk/gtklinkbutton.c ./mod/gtk/gtklinkbutton.c
        gtk_widget_show (menu_item);
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menu_item);
  
+diff -U 5 -r -Z -B ./org/gtk/gtktextview.c ./mod/gtk/gtktextview.c
+--- ./org/gtk/gtktextview.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtktextview.c	2017-08-26 18:56:24.100788042 +0200
+@@ -9315,11 +9315,11 @@
+ 		      GtkWidget    *menu,
+ 		      const gchar  *label,
+ 		      const gchar  *signal,
+                       gboolean      sensitive)
+ {
+-  GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (label);
++  GtkWidget *menuitem = gtk_image_menu_item_new_with_mnemonic (label);
+ 
+   g_object_set_qdata (G_OBJECT (menuitem), quark_gtk_signal, (char *)signal);
+   g_signal_connect (menuitem, "activate",
+ 		    G_CALLBACK (activate_cb), text_view);
+ 
+@@ -9452,11 +9452,11 @@
+       append_action_signal (text_view, priv->popup_menu, _("_Copy"), "copy-clipboard",
+ 			    have_selection);
+       append_action_signal (text_view, priv->popup_menu, _("_Paste"), "paste-clipboard",
+ 			    can_insert && clipboard_contains_text);
+ 
+-      menuitem = gtk_menu_item_new_with_mnemonic (_("_Delete"));
++      menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Delete"));
+       gtk_widget_set_sensitive (menuitem,
+ 				have_selection &&
+ 				range_contains_editable_text (&sel_start, &sel_end,
+ 							      priv->editable));
+       g_signal_connect_swapped (menuitem, "activate",
+@@ -9466,11 +9466,11 @@
+ 
+       menuitem = gtk_separator_menu_item_new ();
+       gtk_widget_show (menuitem);
+       gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
+ 
+-      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
++      menuitem = gtk_image_menu_item_new_with_mnemonic (_("Select _All"));
+       gtk_widget_set_sensitive (menuitem,
+                                 gtk_text_buffer_get_char_count (priv->buffer) > 0);
+       g_signal_connect (menuitem, "activate",
+ 			G_CALLBACK (select_all_cb), text_view);
+       gtk_widget_show (menuitem);
diff --git a/icons__file-chooser.patch b/icons__file-chooser.patch
index ac07c34f1015..9d4eaa3a98a3 100644
--- a/icons__file-chooser.patch
+++ b/icons__file-chooser.patch
@@ -1,364 +1,35 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilesystem.c ./mod/gtk/gtkfilesystem.c
---- ./org/gtk/gtkfilesystem.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkfilesystem.c	2017-07-30 13:48:51.953531745 +0200
-@@ -775,17 +775,17 @@
- 
- GIcon *
- _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume)
- {
-   if (IS_ROOT_VOLUME (volume))
--    return g_themed_icon_new ("drive-harddisk-symbolic");
-+    return g_themed_icon_new ("drive-harddisk");
-   else if (G_IS_DRIVE (volume))
--    return g_drive_get_symbolic_icon (G_DRIVE (volume));
-+    return g_drive_get_icon (G_DRIVE (volume));
-   else if (G_IS_VOLUME (volume))
--    return g_volume_get_symbolic_icon (G_VOLUME (volume));
-+    return g_volume_get_icon (G_VOLUME (volume));
-   else if (G_IS_MOUNT (volume))
--    return g_mount_get_symbolic_icon (G_MOUNT (volume));
-+    return g_mount_get_icon (G_MOUNT (volume));
-   else
-     return NULL;
+diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-27 00:45:37.555159578 +0200
+@@ -77,10 +77,11 @@
+ #include "gtkspinner.h"
+ #include "gtkseparator.h"
+ #include "gtkmodelbutton.h"
+ #include "gtkgesturelongpress.h"
+ #include "gtkdebug.h"
++#include "gtkcssprovider.h"
+ 
+ #include <cairo-gobject.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+@@ -8596,10 +8597,19 @@
+   gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button);
+   gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button);
+   gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view);
+ 
+   add_actions (impl);
++  static gboolean style_added = FALSE;
++  if (!style_added) {
++    style_added = TRUE;
++    GtkCssProvider *provider = gtk_css_provider_new();
++    gtk_css_provider_load_from_data(provider,
++      "filechooser .sidebar-icon, filechooser .path-bar, filechooser .path-bar + button { opacity: 1; -gtk-icon-style: regular; }\0", -1, NULL);
++    gtk_style_context_add_provider_for_screen (gtk_widget_get_screen(GTK_WIDGET(impl)),
++      GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++  }
  }
  
- GtkFileSystemVolume *
-diff -U 5 -r -Z -B ./org/gtk/gtkpathbar.c ./mod/gtk/gtkpathbar.c
---- ./org/gtk/gtkpathbar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkpathbar.c	2017-07-30 13:48:51.956865078 +0200
-@@ -1271,11 +1271,11 @@
-     }
- 
-   if (cancelled || error)
-     goto out;
- 
--  icon = g_file_info_get_symbolic_icon (info);
-+  icon = g_file_info_get_icon (info);
-   gtk_image_set_from_gicon (GTK_IMAGE (data->button_data->image), icon, GTK_ICON_SIZE_BUTTON);
- 
-   switch (data->button_data->type)
-     {
-       case HOME_BUTTON:
-@@ -1337,11 +1337,11 @@
- 	g_cancellable_cancel (button_data->cancellable);
- 
-       button_data->cancellable =
-         _gtk_file_system_get_info (path_bar->priv->file_system,
- 				   path_bar->priv->home_file,
--				   "standard::symbolic-icon",
-+				   "standard::icon",
- 				   set_button_image_get_info_cb,
- 				   data);
-       break;
- 
-     case DESKTOP_BUTTON:
-@@ -1359,11 +1359,11 @@
- 	g_cancellable_cancel (button_data->cancellable);
- 
-       button_data->cancellable =
-         _gtk_file_system_get_info (path_bar->priv->file_system,
- 				   path_bar->priv->desktop_file,
--				   "standard::symbolic-icon",
-+				   "standard::icon",
- 				   set_button_image_get_info_cb,
- 				   data);
-       break;
-     default:
-       break;
-diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 13:48:51.956865078 +0200
-@@ -245,29 +245,29 @@
-   PROP_POPULATE_ALL,
-   NUM_PROPERTIES
- };
- 
- /* Names for themed icons */
--#define ICON_NAME_HOME     "user-home-symbolic"
--#define ICON_NAME_DESKTOP  "user-desktop-symbolic"
--#define ICON_NAME_FILESYSTEM     "drive-harddisk-symbolic"
--#define ICON_NAME_EJECT    "media-eject-symbolic"
--#define ICON_NAME_NETWORK  "network-workgroup-symbolic"
--#define ICON_NAME_NETWORK_SERVER "network-server-symbolic"
--#define ICON_NAME_FOLDER_NETWORK "folder-remote-symbolic"
--#define ICON_NAME_OTHER_LOCATIONS "list-add-symbolic"
--
--#define ICON_NAME_FOLDER                "folder-symbolic"
--#define ICON_NAME_FOLDER_DESKTOP  "user-desktop-symbolic"
--#define ICON_NAME_FOLDER_DOCUMENTS      "folder-documents-symbolic"
--#define ICON_NAME_FOLDER_DOWNLOAD       "folder-download-symbolic"
--#define ICON_NAME_FOLDER_MUSIC    "folder-music-symbolic"
--#define ICON_NAME_FOLDER_PICTURES       "folder-pictures-symbolic"
--#define ICON_NAME_FOLDER_PUBLIC_SHARE   "folder-publicshare-symbolic"
--#define ICON_NAME_FOLDER_TEMPLATES      "folder-templates-symbolic"
--#define ICON_NAME_FOLDER_VIDEOS   "folder-videos-symbolic"
--#define ICON_NAME_FOLDER_SAVED_SEARCH   "folder-saved-search-symbolic"
-+#define ICON_NAME_HOME     "user-home"
-+#define ICON_NAME_DESKTOP  "user-desktop"
-+#define ICON_NAME_FILESYSTEM     "drive-harddisk"
-+#define ICON_NAME_EJECT    "media-eject"
-+#define ICON_NAME_NETWORK  "network-workgroup"
-+#define ICON_NAME_NETWORK_SERVER "network-server"
-+#define ICON_NAME_FOLDER_NETWORK "folder-remote"
-+#define ICON_NAME_OTHER_LOCATIONS "list-add"
-+
-+#define ICON_NAME_FOLDER                "folder"
-+#define ICON_NAME_FOLDER_DESKTOP  "user-desktop"
-+#define ICON_NAME_FOLDER_DOCUMENTS      "folder-documents"
-+#define ICON_NAME_FOLDER_DOWNLOAD       "folder-download"
-+#define ICON_NAME_FOLDER_MUSIC    "folder-music"
-+#define ICON_NAME_FOLDER_PICTURES       "folder-pictures"
-+#define ICON_NAME_FOLDER_PUBLIC_SHARE   "folder-publicshare"
-+#define ICON_NAME_FOLDER_TEMPLATES      "folder-templates"
-+#define ICON_NAME_FOLDER_VIDEOS   "folder-videos"
-+#define ICON_NAME_FOLDER_SAVED_SEARCH   "folder-saved-search"
- 
- static guint places_sidebar_signals [LAST_SIGNAL] = { 0 };
- static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
- 
- static gboolean eject_or_unmount_bookmark  (GtkSidebarRow *row);
-@@ -745,11 +745,11 @@
-       const gchar *name;
-       GIcon *icon;
-       int pos = 0;
- 
-       name = g_file_info_get_display_name (info);
--      icon = g_file_info_get_symbolic_icon (info);
-+      icon = g_file_info_get_icon (info);
-       uri = g_file_get_uri (file);
-       tooltip = g_file_get_parse_name (file);
- 
-       /* XXX: we could avoid this by using an ancillary closure
-        * with the index coming from add_application_shortcuts(),
-@@ -786,11 +786,11 @@
- 
-       if (file_is_shown (sidebar, file))
-         continue;
- 
-       g_file_query_info_async (file,
--                               "standard::display-name,standard::symbolic-icon",
-+                               "standard::display-name,standard::icon",
-                                G_FILE_QUERY_INFO_NONE,
-                                G_PRIORITY_DEFAULT,
-                                sidebar->cancellable,
-                                on_app_shortcuts_query_complete,
-                                sidebar);
-@@ -835,11 +835,11 @@
-           goto out;
-         }
-     }
- 
-   if (info)
--    icon = g_object_ref (g_file_info_get_symbolic_icon (info));
-+    icon = g_object_ref (g_file_info_get_icon (info));
-   else
-     icon = g_themed_icon_new_with_default_fallbacks (clos->is_native ? ICON_NAME_FOLDER : ICON_NAME_FOLDER_NETWORK);
- 
-   mount_uri = g_file_get_uri (root);
-   tooltip = g_file_get_parse_name (root);
-@@ -942,11 +942,11 @@
- 
-   /* add built-in places */
-   if (should_show_recent (sidebar))
-     {
-       mount_uri = "recent:///";
--      icon = g_themed_icon_new_with_default_fallbacks ("document-open-recent-symbolic");
-+      icon = g_themed_icon_new_with_default_fallbacks ("document-open-recent");
-       add_place (sidebar, PLACES_BUILT_IN,
-                  SECTION_COMPUTER,
-                  _("Recent"), icon, mount_uri,
-                  NULL, NULL, NULL, 0,
-                  _("Recent files"));
-@@ -1044,11 +1044,11 @@
- 
-               mount = g_volume_get_mount (volume);
-               if (mount != NULL)
-                 {
-                   /* Show mounted volume in the sidebar */
--                  icon = g_mount_get_symbolic_icon (mount);
-+                  icon = g_mount_get_icon (mount);
-                   root = g_mount_get_default_location (mount);
-                   mount_uri = g_file_get_uri (root);
-                   name = g_mount_get_name (mount);
-                   tooltip = g_file_get_parse_name (root);
- 
-@@ -1071,11 +1071,11 @@
-                    *
-                    * Also, even if automounting is enabled, this gives a visual
-                    * cue that the user should remember to yank out the media if
-                    * he just unmounted it.
-                    */
--                  icon = g_volume_get_symbolic_icon (volume);
-+                  icon = g_volume_get_icon (volume);
-                   name = g_volume_get_name (volume);
-                   tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
- 
-                   add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                              SECTION_MOUNTS,
-@@ -1099,11 +1099,11 @@
-                *
-                * This is mainly for drives like floppies where media detection doesn't
-                * work.. but it's also for human beings who like to turn off media detection
-                * in the OS to save battery juice.
-                */
--              icon = g_drive_get_symbolic_icon (drive);
-+              icon = g_drive_get_icon (drive);
-               name = g_drive_get_name (drive);
-               tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
- 
-               add_place (sidebar, PLACES_BUILT_IN,
-                          SECTION_MOUNTS,
-@@ -1147,11 +1147,11 @@
-         }
- 
-       mount = g_volume_get_mount (volume);
-       if (mount != NULL)
-         {
--          icon = g_mount_get_symbolic_icon (mount);
-+          icon = g_mount_get_icon (mount);
-           root = g_mount_get_default_location (mount);
-           mount_uri = g_file_get_uri (root);
-           tooltip = g_file_get_parse_name (root);
-           name = g_mount_get_name (mount);
-           add_place (sidebar, PLACES_MOUNTED_VOLUME,
-@@ -1166,11 +1166,11 @@
-           g_free (mount_uri);
-         }
-       else
-         {
-           /* see comment above in why we add an icon for an unmounted mountable volume */
--          icon = g_volume_get_symbolic_icon (volume);
-+          icon = g_volume_get_icon (volume);
-           name = g_volume_get_name (volume);
-           add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                      SECTION_MOUNTS,
-                      name, icon, NULL,
-                      NULL, volume, NULL, 0, name);
-@@ -1219,11 +1219,11 @@
-           network_mounts = g_list_prepend (network_mounts, mount);
-           g_object_unref (root);
-           continue;
-         }
- 
--      icon = g_mount_get_symbolic_icon (mount);
-+      icon = g_mount_get_icon (mount);
-       mount_uri = g_file_get_uri (root);
-       name = g_mount_get_name (mount);
-       tooltip = g_file_get_parse_name (root);
-       add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                  SECTION_COMPUTER,
-@@ -1258,22 +1258,22 @@
-       clos = g_slice_new (BookmarkQueryClosure);
-       clos->sidebar = sidebar;
-       clos->index = index;
-       clos->is_native = is_native;
-       g_file_query_info_async (root,
--                               "standard::display-name,standard::symbolic-icon",
-+                               "standard::display-name,standard::icon",
-                                G_FILE_QUERY_INFO_NONE,
-                                G_PRIORITY_DEFAULT,
-                                sidebar->cancellable,
-                                on_bookmark_query_info_complete,
-                                clos);
-     }
- 
-   g_slist_free_full (bookmarks, g_object_unref);
- 
-   /* Add new bookmark row */
--  new_bookmark_icon = g_themed_icon_new ("bookmark-new-symbolic");
-+  new_bookmark_icon = g_themed_icon_new ("bookmark-new");
-   sidebar->new_bookmark_row = add_place (sidebar, PLACES_DROP_FEEDBACK,
-                                          SECTION_BOOKMARKS,
-                                          _("New bookmark"), new_bookmark_icon, NULL,
-                                          NULL, NULL, NULL, 0,
-                                          _("Add a new bookmark"));
-@@ -1306,11 +1306,11 @@
-               network_mounts = g_list_prepend (network_mounts, mount);
-               continue;
-             }
-           else
-             {
--              icon = g_volume_get_symbolic_icon (volume);
-+              icon = g_volume_get_icon (volume);
-               name = g_volume_get_name (volume);
-               tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
- 
-               add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                          SECTION_MOUNTS,
-@@ -1325,11 +1325,11 @@
-       network_mounts = g_list_reverse (network_mounts);
-       for (l = network_mounts; l != NULL; l = l->next)
-         {
-           mount = l->data;
-           root = g_mount_get_default_location (mount);
--          icon = g_mount_get_symbolic_icon (mount);
-+          icon = g_mount_get_icon (mount);
-           mount_uri = g_file_get_uri (root);
-           name = g_mount_get_name (mount);
-           tooltip = g_file_get_parse_name (root);
-           add_place (sidebar, PLACES_MOUNTED_VOLUME,
-                      SECTION_MOUNTS,
-diff -U 5 -r -Z -B ./org/gtk/gtktrashmonitor.c ./mod/gtk/gtktrashmonitor.c
---- ./org/gtk/gtktrashmonitor.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtktrashmonitor.c	2017-07-30 13:48:51.960198412 +0200
-@@ -50,12 +50,12 @@
- 
- G_DEFINE_TYPE (GtkTrashMonitor, _gtk_trash_monitor, G_TYPE_OBJECT)
- 
- static GtkTrashMonitor *the_trash_monitor;
- 
--#define ICON_NAME_TRASH_EMPTY "user-trash-symbolic"
--#define ICON_NAME_TRASH_FULL  "user-trash-full-symbolic"
-+#define ICON_NAME_TRASH_EMPTY "user-trash"
-+#define ICON_NAME_TRASH_FULL  "user-trash-full"
- 
- static void
- gtk_trash_monitor_dispose (GObject *object)
- {
-   GtkTrashMonitor *monitor;
-diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:48:51.960198412 +0200
-@@ -71,11 +71,11 @@
-                                     <property name="popover">new_folder_popover</property>
-                                     <signal name="notify::active" handler="new_folder_popover_active"/>
-                                     <child>
-                                       <object class="GtkImage">
-                                         <property name="visible">1</property>
--                                        <property name="icon-name">folder-new-symbolic</property>
-+                                        <property name="icon-name">folder-new</property>
-                                         <property name="icon-size">1</property>
-                                       </object>
-                                     </child>
-                                   </object>
-                                   <packing>
-@@ -291,11 +291,11 @@
-                               <class name="dim-label"/>
-                             </style>
-                             <child>
-                               <object class="GtkImage">
-                                 <property name="visible">1</property>
--                                <property name="icon-name">edit-find-symbolic</property>
-+                                <property name="icon-name">edit-find</property>
-                                 <property name="pixel-size">72</property>
-                                 <style>
-                                   <class name="dim-label"/>
-                                 </style>
-                               </object>
-diff -U 5 -r -Z -B ./org/gtk/ui/gtksidebarrow.ui ./mod/gtk/ui/gtksidebarrow.ui
---- ./org/gtk/ui/gtksidebarrow.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtksidebarrow.ui	2017-07-30 13:48:51.960198412 +0200
-@@ -22,12 +22,12 @@
-               <object class="GtkBox">
-                 <property name="visible">1</property>
-                 <child>
-                   <object class="GtkImage" id="icon_widget">
-                     <property name="visible">1</property>
-+                    <property name="margin-right">8</property>
-                     <style>
--                      <class name="sidebar-icon"/>
-                     </style>
-                   </object>
-                 </child>
-                 <child>
-                   <object class="GtkLabel" id="label_widget">
+ void
+ gtk_file_chooser_widget_set_save_entry (GtkFileChooserWidget *impl,
+                                         GtkWidget            *entry)
diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch
index eb574116c706..b86a99df1719 100644
--- a/popovers__file-chooser-list.patch
+++ b/popovers__file-chooser-list.patch
@@ -1,18 +1,18 @@
 diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 15:26:07.513375549 +0200
-@@ -77,10 +77,11 @@
- #include "gtkspinner.h"
- #include "gtkseparator.h"
- #include "gtkmodelbutton.h"
- #include "gtkgesturelongpress.h"
- #include "gtkdebug.h"
+--- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-27 00:53:14.541848888 +0200
+@@ -26,10 +26,11 @@
+ #include "gtkbutton.h"
+ #include "gtkcelllayout.h"
+ #include "gtkcellrendererpixbuf.h"
+ #include "gtkcellrenderertext.h"
+ #include "gtkcheckmenuitem.h"
 +#include "deprecated/gtkimagemenuitem.h"
- 
- #include <cairo-gobject.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
+ #include "gtkclipboard.h"
+ #include "gtkcomboboxtext.h"
+ #include "gtkdragsource.h"
+ #include "gtkdragdest.h"
+ #include "gtkentry.h"
 @@ -2222,10 +2223,14 @@
  static GtkWidget *
  append_separator (GtkWidget *box)
diff --git a/print-dialog__appearance.patch b/print-dialog__appearance.patch
index e613d187733d..ef98c9592415 100644
--- a/print-dialog__appearance.patch
+++ b/print-dialog__appearance.patch
@@ -1,16 +1,48 @@
+diff -U 5 -r -Z -B ./org/gtk/gtkprintunixdialog.c ./mod/gtk/gtkprintunixdialog.c
+--- ./org/gtk/gtkprintunixdialog.c	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/gtkprintunixdialog.c	2017-08-26 02:10:56.967546663 +0200
+@@ -747,10 +747,15 @@
+                           _("_Print"), GTK_RESPONSE_OK,
+                           NULL);
+   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+   widget = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+   gtk_widget_set_sensitive (widget, FALSE);
++  GtkCssProvider *provider = gtk_css_provider_new();
++  gtk_css_provider_load_from_data(provider, ".dialog-action-box { margin: 0; }\0", -1, NULL);
++  GtkStyleContext *context = gtk_widget_get_style_context(gtk_widget_get_parent(gtk_dialog_get_action_area(GTK_DIALOG(dialog))));
++  gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++  gtk_style_context_save (context);
+
+   /* Treeview auxiliary functions need to be setup here */
+   gtk_tree_model_filter_set_visible_func (priv->printer_list_filter,
+                                           (GtkTreeModelFilterVisibleFunc) is_printer_active,
+                                           dialog,
 diff -U 5 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixdialog.ui
---- ./org/gtk/ui/gtkprintunixdialog.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-07-30 13:31:55.500148048 +0200
-@@ -56,21 +56,23 @@
+--- ./org/gtk/ui/gtkprintunixdialog.ui	2017-08-22 14:33:11.000000000 +0200
++++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-08-26 02:09:14.667541594 +0200
+@@ -46,31 +46,32 @@
+     <property name="upper">1000</property>
+     <property name="value">100</property>
+     <property name="step-increment">1</property>
+   </object>
+   <template class="GtkPrintUnixDialog" parent="GtkDialog">
++    <property name="border-width">5</property>
+     <property name="can-focus">False</property>
+     <property name="type-hint">dialog</property>
+     <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
+     <signal name="response" handler="error_dialogs" swapped="no"/>
+     <child internal-child="vbox">
        <object class="GtkBox" id="dialog-vbox1">
          <property name="orientation">vertical</property>
          <property name="spacing">2</property>
-         <property name="border-width">0</property>
+-        <property name="border-width">0</property>
++        <property name="border-width">2</property>
          <style>
 -          <class name="view"/>
          </style>
          <child>
            <object class="GtkBox" id="box1">
++            <property name="border-width">5</property>
              <property name="visible">1</property>
              <property name="orientation">vertical</property>
              <child>
@@ -19,9 +51,6 @@ diff -U 5 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixd
                  <property name="can-focus">1</property>
 -                <property name="show-border">0</property>
 +                <property name="show-border">1</property>
-+                <property name="margin-left">12</property>
-+                <property name="margin-right">12</property>
-+                <property name="margin-top">12</property>
                  <child>
                    <object class="GtkBox" id="general_main_box">
                      <property name="visible">1</property>
diff --git a/smaller-adwaita.css b/smaller-adwaita.css
index ae34e4a6797a..3f866b06f079 100644
--- a/smaller-adwaita.css
+++ b/smaller-adwaita.css
@@ -1,10 +1,20 @@
 
 /* GTK3-mushrooms */
 button,
-button.titlebutton {
-	padding: 3px 7px;
+button.titlebutton,
+button.image-button,
+button.text-button,
+button.image-button.text-button,
+.stack-switcher > button.text-button {
+	padding: 3px 6px;
 	min-height: 20px;
-	min-width: 15px;
+	min-width: 0;
+}
+.stack-switcher > button.text-button {
+	min-width: 80px;
+}
+button.text-button.image-button label {
+	padding: 0 2px;
 }
 notebook > header.top tab,
 notebook > header.bottom tab {
@@ -40,18 +50,12 @@ scale {
 headerbar, switch slider {
 	min-height: 0;
 }
-popover > * {
-	margin: -4px;
+popover:not(.emoji-picker) > *:not(grid) {
+	margin: -3px;
 }
 tooltip * {
 	padding: 0px;
 }
-.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop,
-.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar,
-.titlebar:not(headerbar),
-headerbar {
-	background-image: none;
-}
 placessidebar row {
 	min-height: 29px;
 }
@@ -60,3 +64,34 @@ placessidebar row button.sidebar-button {
 	min-width: 20px;
 	padding: 0;
 }
+filechooser > box.search-bar, filechooser > box:last-child {
+	border-bottom: 1px solid alpha(#000, 0.15);
+}
+filechooser > actionbar > revealer > box {
+	border-top: 1px solid alpha(#000, 0.15);
+}
+* {
+	-GtkDialog-action-area-border: 5;
+}
+messagedialog > box {
+	padding: 7px;
+}
+messagedialog buttonbox {
+	margin-top: -17px;
+}
+.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop,
+.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar,
+.titlebar:not(headerbar),
+headerbar {
+	background-image: none;
+}
+entry undershoot.left,
+entry undershoot.right,
+spinbutton:not(.vertical) undershoot.left,
+spinbutton:not(.vertical) undershoot.right,
+scrolledwindow undershoot.left,
+scrolledwindow undershoot.right,
+scrolledwindow undershoot.top,
+scrolledwindow undershoot.bottom {
+	background-image: none;
+}
\ No newline at end of file