3 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0005-icon-theme.patch b/debian/patches/progress-linux/0005-icon-theme.patch
new file mode 100644
index 0000000..c2d848c
--- /dev/null
+++ b/debian/patches/progress-linux/0005-icon-theme.patch
@@ -0,0 +1,27 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Setting icon-theme to "Color".
+
+diff -Naurp gimp.orig/etc/gimprc.in gimp/etc/gimprc.in
+--- gimp.orig/etc/gimprc.in
++++ gimp/etc/gimprc.in
+@@ -807,7 +807,7 @@
+ 
+ # The name of the icon theme to use.  This is a string value.
+ # 
+-# (icon-theme "Symbolic")
++(icon-theme "Color")
+ 
+ # The size of the icons to use.  Possible values are auto, theme, small,
+ # medium, large and huge.
+diff -Naurp gimp.orig/libgimpwidgets/gimpicons.c gimp/libgimpwidgets/gimpicons.c
+--- gimp.orig/libgimpwidgets/gimpicons.c
++++ gimp/libgimpwidgets/gimpicons.c
+@@ -51,7 +51,7 @@
+ 
+ #define LIBGIMP_DOMAIN          GETTEXT_PACKAGE "-libgimp"
+ #define GIMP_TOILET_PAPER       "gimp-toilet-paper"
+-#define GIMP_DEFAULT_ICON_THEME "Symbolic"
++#define GIMP_DEFAULT_ICON_THEME "Color"
+ 
+ 
+ static GtkIconFactory *gimp_stock_factory = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index bc3afb6..2c6e2d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ progress-linux/0001-default-font.patch
 progress-linux/0002-global-font.patch
 progress-linux/0003-toolbox-wilber.patch
 progress-linux/0004-theme.patch
+progress-linux/0005-icon-theme.patch
diff --git a/debian/rules b/debian/rules
index 1286b47..824b6f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,3 +41,7 @@ override_dh_makeshlibs:
 
 execute_before_dh_install:
 	find debian/tmp -name '*.la' -print -delete
+
+execute_after_dh_install:
+	# gimp folder icons override gtk icons in file dialogs (#900170)
+	rm -f debian/gimp-data/usr/share/gimp/2.0/icons/Color/scalable/apps/folder*.svg