Bug 608622 - Desaturate icon causes confusion with Gradients tool

libgimpwidgets/gimpstock.c

@@ -295,6 +295,7 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_TOOL_COLORIZE,            NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_CROP,         N_("Cr_op"),        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_CURVES,              NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_TOOL_DESATURATE,          NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_DODGE,               NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_ERASER,              NULL,        0, 0, LIBGIMP_DOMAIN },
@@ -446,6 +447,7 @@ gimp_stock_button_pixbufs[] =
   { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_22            },
   { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_22                },
   { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_22              },
+  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_22          },
   { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_22               },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_22      },
   { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_22              },
@@ -609,6 +611,7 @@ gimp_stock_menu_pixbufs[] =
   { GIMP_STOCK_TOOL_COLORIZE,            stock_tool_colorize_16            },
   { GIMP_STOCK_TOOL_CROP,                stock_tool_crop_16                },
   { GIMP_STOCK_TOOL_CURVES,              stock_tool_curves_16              },
+  { GIMP_STOCK_TOOL_DESATURATE,          stock_tool_desaturate_16          },
   { GIMP_STOCK_TOOL_DODGE,               stock_tool_dodge_16               },
   { GIMP_STOCK_TOOL_ELLIPSE_SELECT,      stock_tool_ellipse_select_16      },
   { GIMP_STOCK_TOOL_ERASER,              stock_tool_eraser_16              },

libgimpwidgets/gimpstock.h

@@ -110,6 +110,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
 #define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
 #define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
+#define GIMP_STOCK_TOOL_DESATURATE          "gimp-tool-desaturate"
 #define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
 #define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
 #define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
@@ -277,7 +278,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 #define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 #define GIMP_STOCK_TOOL_PRESET              GIMP_STOCK_TOOL_PAINTBRUSH
-#define GIMP_STOCK_TOOL_DESATURATE          GIMP_STOCK_CONVERT_GRAYSCALE
 
 
 void   gimp_stock_init (void);

themes/Default/images/Makefile.am

@@ -285,6 +285,8 @@ STOCK_TOOL_IMAGES = \
 	tools/stock-tool-crop-22.png			\
 	tools/stock-tool-curves-16.png			\
 	tools/stock-tool-curves-22.png			\
+	tools/stock-tool-desaturate-16.png		\
+	tools/stock-tool-desaturate-22.png		\
 	tools/stock-tool-dodge-16.png			\
 	tools/stock-tool-dodge-22.png			\
 	tools/stock-tool-ellipse-select-16.png		\