2 files changed, 6 insertions, 1 deletions
diff --git a/data/caja.css b/data/caja.css
index 1d3f629d..2aedab75 100644
--- a/data/caja.css
+++ b/data/caja.css
@@ -62,3 +62,8 @@
 border-width: 0px;
 border-style: none;
 }
+
+/* Padding in slider buttons causes GTK errors in GTK 3.20 or later */
+.caja-navigation-window .slider-button {
+ padding: 0px;
+}
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index 1a55ab47..38e49798 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -469,7 +469,7 @@ caja_icon_info_lookup (GIcon *icon,
 gtk_icon_info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
 icon,
 size,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+ GTK_ICON_LOOKUP_FORCE_SIZE);
 if (gtk_icon_info != NULL)
 {
 pixbuf = gtk_icon_info_load_icon (gtk_icon_info, NULL);