diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png
index e09d7062780..b0d5e825738 100644
Binary files a/release/datafiles/blender_icons.png and b/release/datafiles/blender_icons.png differ
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index ebfbe94802a..9af0d96884a 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -30,9 +30,7 @@
 
 /** \file BKE_icons.h
  *  \ingroup bke
- */
-
-/*
+ *
  * Resizable Icons for Blender
  */
 
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 10c585aa802..99f7f0856b3 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -97,7 +97,7 @@ DEF_ICON(PLUGIN)
 	/* various ui */
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
-DEF_ICON(COLOR)
+DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
 DEF_ICON(LINKED)
 DEF_ICON(UNLINKED)
 DEF_ICON(HAND)
@@ -428,9 +428,11 @@ DEF_ICON(CURVE_PATH)
 	DEF_ICON(BLANK646)
 	DEF_ICON(BLANK647)
 	DEF_ICON(BLANK648)
-	DEF_ICON(BLANK649)
-	DEF_ICON(BLANK650)
-	DEF_ICON(BLANK651)
+#endif
+DEF_ICON(COLOR_RED)
+DEF_ICON(COLOR_GREEN)
+DEF_ICON(COLOR_BLUE)
+#ifndef DEF_ICON_BLANK_SKIP
 	DEF_ICON(BLANK652)
 	DEF_ICON(BLANK653)
 	DEF_ICON(BLANK654)
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index caa81dafa0e..2b2e8d97499 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2976,10 +2976,9 @@ static void rna_def_space_node(BlenderRNA *brna)
 		{SNODE_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha",
 		                  "Draw image with RGB colors and alpha transparency"},
 		{SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"},
-		                        /* XXX, we could use better icons here  */
-		{SNODE_SHOW_R, "RED",   ICON_COLOR, "Red", ""},
-		{SNODE_SHOW_G, "GREEN", ICON_COLOR, "Green", ""},
-		{SNODE_SHOW_B, "BLUE",  ICON_COLOR, "Blue", ""},
+		{SNODE_SHOW_R, "RED",   ICON_COLOR_RED, "Red", ""},
+		{SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""},
+		{SNODE_SHOW_B, "BLUE",  ICON_COLOR_BLUE, "Blue", ""},
 		{0, NULL, 0, NULL, NULL}
 	};