UI: icon set updates Andrzej Ambroz.

This adds and changes various icons, in particular modifier and force field
icons are now included.

5 files changed, 124 insertions, 123 deletions

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index a463cfdb633..5b6d39863f9 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -65,7 +65,7 @@ DEF_ICON(DISCLOSURE_TRI_RIGHT)
 DEF_ICON(DISCLOSURE_TRI_DOWN)
 DEF_ICON(RADIOBUT_OFF)
 DEF_ICON(RADIOBUT_ON)
-DEF_ICON_COLOR(MENU_PANEL)
+DEF_ICON(MENU_PANEL)
 DEF_ICON(BLENDER)
 DEF_ICON(GRIP)
 DEF_ICON(DOT)
@@ -132,7 +132,7 @@ DEF_ICON(RECOVER_LAST)
 DEF_ICON(30)
 DEF_ICON(FULLSCREEN_ENTER)
 DEF_ICON(FULLSCREEN_EXIT)
-DEF_ICON(ONIONSKIN)
+DEF_ICON_BLANK(33)
 
 	/* BUTTONS */
 DEF_ICON_SHADING(LIGHT)
@@ -192,7 +192,7 @@ DEF_ICON_BLANK(61)
 	/* MODES */
 DEF_ICON(OBJECT_DATAMODE)	// XXX fix this up
 DEF_ICON(EDITMODE_HLT)
-DEF_ICON(FACESEL_HLT)
+DEF_ICON(UV)
 DEF_ICON(VPAINT_HLT)
 DEF_ICON(TPAINT_HLT)
 DEF_ICON(WPAINT_HLT)
@@ -263,7 +263,7 @@ DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
 DEF_ICON_SHADING(LINE_DATA)
-DEF_ICON_COLOR(LIBRARY_DATA_OVERRIDE)
+DEF_ICON(LIBRARY_DATA_OVERRIDE)
 DEF_ICON(GROUP_BONE)
 DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
@@ -321,8 +321,8 @@ DEF_ICON_OBJECT(OUTLINER_OB_IMAGE)
 DEF_ICON_BLANK(125)
 DEF_ICON(RESTRICT_COLOR_OFF)
 DEF_ICON(RESTRICT_COLOR_ON)
-DEF_ICON(RESTRICT_VIEW_OFF)
-DEF_ICON(RESTRICT_VIEW_ON)
+DEF_ICON(HIDE_OFF)
+DEF_ICON(HIDE_ON)
 DEF_ICON(RESTRICT_SELECT_OFF)
 DEF_ICON(RESTRICT_SELECT_ON)
 DEF_ICON(RESTRICT_RENDER_OFF)
@@ -344,17 +344,17 @@ DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SPEAKER)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_POSE)
 DEF_ICON_BLANK(130)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GREASEPENCIL)
-DEF_ICON_BLANK(132)
-DEF_ICON_BLANK(133)
-DEF_ICON_BLANK(134)
-DEF_ICON_BLANK(135)
+DEF_ICON(GP_SELECT_POINTS)
+DEF_ICON(GP_SELECT_STROKES)
+DEF_ICON(GP_MULTIFRAME_EDITING)
+DEF_ICON(GP_ONLY_SELECTED)
 DEF_ICON_BLANK(136)
 DEF_ICON_BLANK(137)
 DEF_ICON_BLANK(138)
 DEF_ICON(ONIONSKIN_OFF)
 DEF_ICON(ONIONSKIN_ON)
-DEF_ICON(HIDE_OFF)
-DEF_ICON(HIDE_ON)
+DEF_ICON(RESTRICT_VIEW_OFF)
+DEF_ICON(RESTRICT_VIEW_ON)
 DEF_ICON_BLANK(142b)
 
 	/* PRIMITIVES */
@@ -392,8 +392,8 @@ DEF_ICON(SURFACE_NSURFACE)
 DEF_ICON(SURFACE_NCYLINDER)
 DEF_ICON(SURFACE_NSPHERE)
 DEF_ICON(SURFACE_NTORUS)
-DEF_ICON_BLANK(636)
-DEF_ICON_BLANK(637)
+DEF_ICON(GP_EMPTY)
+DEF_ICON(GP_STROKE)
 DEF_ICON_BLANK(638)
 DEF_ICON(CURVE_BEZCURVE)
 DEF_ICON(CURVE_BEZCIRCLE)
@@ -414,19 +414,19 @@ DEF_ICON(TRIA_LEFT_BAR)
 DEF_ICON(TRIA_UP_BAR)
 
 	/* EMPTY */
-DEF_ICON_COLOR(FORCE_FORCE)
-DEF_ICON_COLOR(FORCE_WIND)
-DEF_ICON_COLOR(FORCE_VORTEX)
-DEF_ICON_COLOR(FORCE_MAGNETIC)
-DEF_ICON_COLOR(FORCE_HARMONIC)
-DEF_ICON_COLOR(FORCE_CHARGE)
-DEF_ICON_COLOR(FORCE_LENNARDJONES)
-DEF_ICON_COLOR(FORCE_TEXTURE)
-DEF_ICON_COLOR(FORCE_CURVE)
-DEF_ICON_COLOR(FORCE_BOID)
-DEF_ICON_COLOR(FORCE_TURBULENCE)
-DEF_ICON_COLOR(FORCE_DRAG)
-DEF_ICON_COLOR(FORCE_SMOKEFLOW)
+DEF_ICON(FORCE_FORCE)
+DEF_ICON(FORCE_WIND)
+DEF_ICON(FORCE_VORTEX)
+DEF_ICON(FORCE_MAGNETIC)
+DEF_ICON(FORCE_HARMONIC)
+DEF_ICON(FORCE_CHARGE)
+DEF_ICON(FORCE_LENNARDJONES)
+DEF_ICON(FORCE_TEXTURE)
+DEF_ICON(FORCE_CURVE)
+DEF_ICON(FORCE_BOID)
+DEF_ICON(FORCE_TURBULENCE)
+DEF_ICON(FORCE_DRAG)
+DEF_ICON(FORCE_SMOKEFLOW)
 DEF_ICON_BLANK(673)
 DEF_ICON_BLANK(674)
 DEF_ICON_BLANK(675)
@@ -527,50 +527,50 @@ DEF_ICON_BLANK(785)
 
 	/* MODIFIERS */
 DEF_ICON_MODIFIER(MODIFIER)
-DEF_ICON_COLOR(MOD_WAVE)
-DEF_ICON_COLOR(MOD_BUILD)
-DEF_ICON_COLOR(MOD_DECIM)
-DEF_ICON_COLOR(MOD_MIRROR)
-DEF_ICON_COLOR(MOD_SOFT)
-DEF_ICON_COLOR(MOD_SUBSURF)
-DEF_ICON_COLOR(HOOK)
-DEF_ICON_COLOR(MOD_PHYSICS)
-DEF_ICON_COLOR(MOD_PARTICLES)
-DEF_ICON_COLOR(MOD_BOOLEAN)
-DEF_ICON_COLOR(MOD_EDGESPLIT)
-DEF_ICON_COLOR(MOD_ARRAY)
-DEF_ICON_COLOR(MOD_UVPROJECT)
-DEF_ICON_COLOR(MOD_DISPLACE)
-DEF_ICON_COLOR(MOD_CURVE)
-DEF_ICON_COLOR(MOD_LATTICE)
+DEF_ICON_MODIFIER(MOD_WAVE)
+DEF_ICON_MODIFIER(MOD_BUILD)
+DEF_ICON_MODIFIER(MOD_DECIM)
+DEF_ICON_MODIFIER(MOD_MIRROR)
+DEF_ICON_MODIFIER(MOD_SOFT)
+DEF_ICON_MODIFIER(MOD_SUBSURF)
+DEF_ICON_MODIFIER(HOOK)
+DEF_ICON_MODIFIER(MOD_PHYSICS)
+DEF_ICON_MODIFIER(MOD_PARTICLES)
+DEF_ICON_MODIFIER(MOD_BOOLEAN)
+DEF_ICON_MODIFIER(MOD_EDGESPLIT)
+DEF_ICON_MODIFIER(MOD_ARRAY)
+DEF_ICON_MODIFIER(MOD_UVPROJECT)
+DEF_ICON_MODIFIER(MOD_DISPLACE)
+DEF_ICON_MODIFIER(MOD_CURVE)
+DEF_ICON_MODIFIER(MOD_LATTICE)
 DEF_ICON_COLOR(CONSTRAINT_DATA)
-DEF_ICON_COLOR(MOD_ARMATURE)
-DEF_ICON_COLOR(MOD_SHRINKWRAP)
-DEF_ICON_COLOR(MOD_CAST)
-DEF_ICON_COLOR(MOD_MESHDEFORM)
-DEF_ICON_COLOR(MOD_BEVEL)
-DEF_ICON_COLOR(MOD_SMOOTH)
-DEF_ICON_COLOR(MOD_SIMPLEDEFORM)
-DEF_ICON_COLOR(MOD_MASK)
+DEF_ICON_MODIFIER(MOD_ARMATURE)
+DEF_ICON_MODIFIER(MOD_SHRINKWRAP)
+DEF_ICON_MODIFIER(MOD_CAST)
+DEF_ICON_MODIFIER(MOD_MESHDEFORM)
+DEF_ICON_MODIFIER(MOD_BEVEL)
+DEF_ICON_MODIFIER(MOD_SMOOTH)
+DEF_ICON_MODIFIER(MOD_SIMPLEDEFORM)
+DEF_ICON_MODIFIER(MOD_MASK)
 
 	/* MODIFIERS */
-DEF_ICON_COLOR(MOD_CLOTH)
-DEF_ICON_COLOR(MOD_EXPLODE)
-DEF_ICON_COLOR(MOD_FLUIDSIM)
-DEF_ICON_COLOR(MOD_MULTIRES)
-DEF_ICON_COLOR(MOD_SMOKE)
-DEF_ICON_COLOR(MOD_SOLIDIFY)
-DEF_ICON_COLOR(MOD_SCREW)
-DEF_ICON_COLOR(MOD_VERTEX_WEIGHT)
-DEF_ICON_COLOR(MOD_DYNAMICPAINT)
-DEF_ICON_COLOR(MOD_REMESH)
-DEF_ICON_COLOR(MOD_OCEAN)
-DEF_ICON_COLOR(MOD_WARP)
-DEF_ICON_COLOR(MOD_SKIN)
-DEF_ICON_COLOR(MOD_TRIANGULATE)
-DEF_ICON_COLOR(MOD_WIREFRAME)
-DEF_ICON_COLOR(MOD_DATA_TRANSFER)
-DEF_ICON_COLOR(MOD_NORMALEDIT)
+DEF_ICON_MODIFIER(MOD_CLOTH)
+DEF_ICON_MODIFIER(MOD_EXPLODE)
+DEF_ICON_MODIFIER(MOD_FLUIDSIM)
+DEF_ICON_MODIFIER(MOD_MULTIRES)
+DEF_ICON_MODIFIER(MOD_SMOKE)
+DEF_ICON_MODIFIER(MOD_SOLIDIFY)
+DEF_ICON_MODIFIER(MOD_SCREW)
+DEF_ICON_MODIFIER(MOD_VERTEX_WEIGHT)
+DEF_ICON_MODIFIER(MOD_DYNAMICPAINT)
+DEF_ICON_MODIFIER(MOD_REMESH)
+DEF_ICON_MODIFIER(MOD_OCEAN)
+DEF_ICON_MODIFIER(MOD_WARP)
+DEF_ICON_MODIFIER(MOD_SKIN)
+DEF_ICON_MODIFIER(MOD_TRIANGULATE)
+DEF_ICON_MODIFIER(MOD_WIREFRAME)
+DEF_ICON_MODIFIER(MOD_DATA_TRANSFER)
+DEF_ICON_MODIFIER(MOD_NORMALEDIT)
 DEF_ICON_BLANK(169)
 DEF_ICON_BLANK(170)
 DEF_ICON_BLANK(171)
@@ -1058,6 +1058,7 @@ DEF_ICON_COLOR(EVENT_RETURN)
 /* Undefine all types. */
 
 #undef DEF_ICON
+#undef DEF_ICON_ERROR
 #undef DEF_ICON_COLLECTION
 #undef DEF_ICON_OBJECT
 #undef DEF_ICON_OBJECT_DATA
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index a5bae7115f9..40690731b76 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -2820,7 +2820,7 @@ static void rna_def_mesh(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "use_paint_mask", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_PAINT_FACE_SEL);
 	RNA_def_property_ui_text(prop, "Paint Mask", "Face selection masking for painting");
-	RNA_def_property_ui_icon(prop, ICON_FACESEL_HLT, 0);
+	RNA_def_property_ui_icon(prop, ICON_FACESEL, 0);
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_Mesh_update_facemask");
 
 	prop = RNA_def_property(srna, "use_paint_mask_vertex", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 200fa9335de..5eef1614730 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -64,61 +64,61 @@
 
 const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
 	{0, "", 0, N_("Modify"), ""},
-	{eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MODIFIER, "Data Transfer", ""},
-	{eModifierType_MeshCache, "MESH_CACHE", ICON_MODIFIER, "Mesh Cache", ""},
-	{eModifierType_MeshSequenceCache, "MESH_SEQUENCE_CACHE", ICON_MODIFIER, "Mesh Sequence Cache", ""},
-	{eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MODIFIER, "Normal Edit", ""},
-	{eModifierType_WeightedNormal, "WEIGHTED_NORMAL", ICON_MODIFIER, "Weighted Normal", ""},
-	{eModifierType_UVProject, "UV_PROJECT", ICON_MODIFIER, "UV Project", ""},
-	{eModifierType_UVWarp, "UV_WARP", ICON_MODIFIER, "UV Warp", ""},
-	{eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT", ICON_MODIFIER, "Vertex Weight Edit", ""},
-	{eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX", ICON_MODIFIER, "Vertex Weight Mix", ""},
-	{eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY", ICON_MODIFIER,
+    {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER, "Data Transfer", ""},
+	{eModifierType_MeshCache, "MESH_CACHE", ICON_MOD_MESHDEFORM, "Mesh Cache", ""},
+	{eModifierType_MeshSequenceCache, "MESH_SEQUENCE_CACHE", ICON_MOD_MESHDEFORM, "Mesh Sequence Cache", ""},
+	{eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MOD_NORMALEDIT, "Normal Edit", ""},
+	{eModifierType_WeightedNormal, "WEIGHTED_NORMAL", ICON_MOD_NORMALEDIT, "Weighted Normal", ""},
+	{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
+	{eModifierType_UVWarp, "UV_WARP", ICON_MOD_UVPROJECT, "UV Warp", ""},
+	{eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Edit", ""},
+	{eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Mix", ""},
+	{eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY", ICON_MOD_VERTEX_WEIGHT,
 	                                  "Vertex Weight Proximity", ""},
 	{0, "", 0, N_("Generate"), ""},
-	{eModifierType_Array, "ARRAY", ICON_MODIFIER, "Array", ""},
-	{eModifierType_Bevel, "BEVEL", ICON_MODIFIER, "Bevel", ""},
-	{eModifierType_Boolean, "BOOLEAN", ICON_MODIFIER, "Boolean", ""},
-	{eModifierType_Build, "BUILD", ICON_MODIFIER, "Build", ""},
-	{eModifierType_Decimate, "DECIMATE", ICON_MODIFIER, "Decimate", ""},
-	{eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MODIFIER, "Edge Split", ""},
-	{eModifierType_Mask, "MASK", ICON_MODIFIER, "Mask", ""},
-	{eModifierType_Mirror, "MIRROR", ICON_MODIFIER, "Mirror", ""},
-	{eModifierType_Multires, "MULTIRES", ICON_MODIFIER, "Multiresolution", ""},
-	{eModifierType_Remesh, "REMESH", ICON_MODIFIER, "Remesh", ""},
-	{eModifierType_Screw, "SCREW", ICON_MODIFIER, "Screw", ""},
-	{eModifierType_Skin, "SKIN", ICON_MODIFIER, "Skin", ""},
-	{eModifierType_Solidify, "SOLIDIFY", ICON_MODIFIER, "Solidify", ""},
-	{eModifierType_Subsurf, "SUBSURF", ICON_MODIFIER, "Subdivision Surface", ""},
-	{eModifierType_Triangulate, "TRIANGULATE", ICON_MODIFIER, "Triangulate", ""},
-	{eModifierType_Wireframe, "WIREFRAME", ICON_MODIFIER, "Wireframe", "Generate a wireframe on the edges of a mesh"},
+	{eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, "Array", ""},
+	{eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, "Bevel", ""},
+	{eModifierType_Boolean, "BOOLEAN", ICON_MOD_BOOLEAN, "Boolean", ""},
+	{eModifierType_Build, "BUILD", ICON_MOD_BUILD, "Build", ""},
+	{eModifierType_Decimate, "DECIMATE", ICON_MOD_DECIM, "Decimate", ""},
+	{eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MOD_EDGESPLIT, "Edge Split", ""},
+	{eModifierType_Mask, "MASK", ICON_MOD_MASK, "Mask", ""},
+	{eModifierType_Mirror, "MIRROR", ICON_MOD_MIRROR, "Mirror", ""},
+	{eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""},
+	{eModifierType_Remesh, "REMESH", ICON_MOD_REMESH, "Remesh", ""},
+	{eModifierType_Screw, "SCREW", ICON_MOD_SCREW, "Screw", ""},
+	{eModifierType_Skin, "SKIN", ICON_MOD_SKIN, "Skin", ""},
+	{eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""},
+	{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
+	{eModifierType_Triangulate, "TRIANGULATE", ICON_MOD_TRIANGULATE, "Triangulate", ""},
+	{eModifierType_Wireframe, "WIREFRAME", ICON_MOD_WIREFRAME, "Wireframe", "Generate a wireframe on the edges of a mesh"},
 	{0, "", 0, N_("Deform"), ""},
-	{eModifierType_Armature, "ARMATURE", ICON_MODIFIER, "Armature", ""},
-	{eModifierType_Cast, "CAST", ICON_MODIFIER, "Cast", ""},
-	{eModifierType_Curve, "CURVE", ICON_MODIFIER, "Curve", ""},
-	{eModifierType_Displace, "DISPLACE", ICON_MODIFIER, "Displace", ""},
-	{eModifierType_Hook, "HOOK", ICON_MODIFIER, "Hook", ""},
-	{eModifierType_LaplacianDeform, "LAPLACIANDEFORM", ICON_MODIFIER, "Laplacian Deform", ""},
-	{eModifierType_Lattice, "LATTICE", ICON_MODIFIER, "Lattice", ""},
-	{eModifierType_MeshDeform, "MESH_DEFORM", ICON_MODIFIER, "Mesh Deform", ""},
-	{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MODIFIER, "Shrinkwrap", ""},
-	{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MODIFIER, "Simple Deform", ""},
-	{eModifierType_Smooth, "SMOOTH", ICON_MODIFIER, "Smooth", ""},
-	{eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MODIFIER, "Smooth Corrective", ""},
-	{eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MODIFIER, "Smooth Laplacian", ""},
-	{eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MODIFIER, "Surface Deform", ""},
-	{eModifierType_Warp, "WARP", ICON_MODIFIER, "Warp", ""},
-	{eModifierType_Wave, "WAVE", ICON_MODIFIER, "Wave", ""},
+	{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
+	{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
+	{eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},
+	{eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""},
+	{eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""},
+	{eModifierType_LaplacianDeform, "LAPLACIANDEFORM", ICON_MOD_MESHDEFORM, "Laplacian Deform", ""},
+	{eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, "Lattice", ""},
+	{eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, "Mesh Deform", ""},
+	{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
+	{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
+	{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
+	{eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MOD_SMOOTH, "Smooth Corrective", ""},
+	{eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MOD_SMOOTH, "Smooth Laplacian", ""},
+	{eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MOD_MESHDEFORM, "Surface Deform", ""},
+	{eModifierType_Warp, "WARP", ICON_MOD_WARP, "Warp", ""},
+	{eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
 	{0, "", 0, N_("Simulate"), ""},
-	{eModifierType_Cloth, "CLOTH", ICON_MODIFIER, "Cloth", ""},
-	{eModifierType_Collision, "COLLISION", ICON_MODIFIER, "Collision", ""},
-	{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MODIFIER, "Dynamic Paint", ""},
-	{eModifierType_Explode, "EXPLODE", ICON_MODIFIER, "Explode", ""},
-	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MODIFIER, "Fluid Simulation", ""},
-	{eModifierType_Ocean, "OCEAN", ICON_MODIFIER, "Ocean", ""},
-	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MODIFIER, "Particle Instance", ""},
-	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MODIFIER, "Particle System", ""},
-	{eModifierType_Smoke, "SMOKE", ICON_MODIFIER, "Smoke", ""},
+	{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
+	{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
+	{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
+	{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
+	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
+	{eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", ""},
+	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
+	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
+	{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
 	{eModifierType_Softbody, "SOFT_BODY", ICON_MODIFIER, "Soft Body", ""},
 	{eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
 	{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e0d13354445..e845b31ca9c 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2228,8 +2228,8 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	};
 
 	static const EnumPropertyItem gpencil_selectmode_items[] = {
-		{GP_SELECTMODE_POINT, "POINT", ICON_VERTEXSEL, "Point", "Select only points"},
-		{GP_SELECTMODE_STROKE, "STROKE", ICON_EDGESEL, "Stroke", "Select all stroke points" },
+		{GP_SELECTMODE_POINT, "POINT", ICON_GP_SELECT_POINTS, "Point", "Select only points"},
+		{GP_SELECTMODE_STROKE, "STROKE", ICON_GP_SELECT_STROKES, "Stroke", "Select all stroke points" },
 		{0, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index e6e9ff6664d..e1a6021c2fe 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -1139,7 +1139,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "use_select_mask", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_BRUSHEDIT_FLAG_SELECT_MASK);
 	RNA_def_property_ui_text(prop, "Selection Mask", "Only sculpt selected stroke points");
-	RNA_def_property_ui_icon(prop, ICON_VERTEXSEL, 0); // FIXME: this needs a custom icon
+	RNA_def_property_ui_icon(prop, ICON_GP_ONLY_SELECTED, 0);
 	RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
 	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);