UI/RNA:

* Added an icon entry to RNA structs, instead of the UI_GetIconRNA
  function, to keep code together a bit more and make the lookup
  faster.

36 files changed, 101 insertions, 3 deletions

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index cb5b213c558..f1b52ae49ed 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -331,6 +331,7 @@ void RNA_blender_rna_pointer_create(PointerRNA *r_ptr);
 const char *RNA_struct_identifier(StructRNA *type);
 const char *RNA_struct_ui_name(StructRNA *type);
 const char *RNA_struct_ui_description(StructRNA *type);
+int RNA_struct_ui_icon(StructRNA *type);
 
 PropertyRNA *RNA_struct_name_property(StructRNA *type);
 PropertyRNA *RNA_struct_iterator_property(StructRNA *type);
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 0754114d7f7..5fcf2a30271 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -59,6 +59,7 @@ void RNA_def_struct_register_funcs(StructRNA *srna, const char *reg, const char
 void RNA_def_struct_path_func(StructRNA *srna, const char *path);
 void RNA_def_struct_identifier(StructRNA *srna, const char *identifier);
 void RNA_def_struct_ui_text(StructRNA *srna, const char *name, const char *description);
+void RNA_def_struct_ui_icon(StructRNA *srna, int icon);
 void RNA_struct_free(BlenderRNA *brna, StructRNA *srna);
 
 /* Compact Property Definitions */
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 438100243e3..1cfba4286c7 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1713,7 +1713,7 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
 	rna_print_c_string(f, srna->name);
 	fprintf(f, ", ");
 	rna_print_c_string(f, srna->description);
-	fprintf(f, ",\n");
+	fprintf(f, ",\n %d,\n", srna->icon);
 
 	prop= srna->nameproperty;
 	if(prop) {
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index ad1c7eae95e..eb57c91a9f7 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -30,6 +30,8 @@
 
 #include "DNA_ID.h"
 
+#include "rna_internal.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_idprop.h"
@@ -221,6 +223,7 @@ static void rna_def_library(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Library", "ID");
 	RNA_def_struct_ui_text(srna, "Library", "External .blend file from which data is linked.");
+	RNA_def_struct_ui_icon(srna, ICON_LIBRARY_DATA_DIRECT);
 
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 41e1f4753f0..cf52c5fb1ec 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -339,6 +339,14 @@ const char *RNA_struct_ui_name(StructRNA *type)
 	return type->name;
 }
 
+int RNA_struct_ui_icon(StructRNA *type)
+{
+	if(type)
+		return type->icon;
+	else
+		return ICON_DOT;
+}
+
 const char *RNA_struct_ui_description(StructRNA *type)
 {
 	return type->description;
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 0a09462988b..3639d6d3fff 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -84,6 +84,7 @@ void rna_def_action(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Action", "ID");
 	RNA_def_struct_sdna(srna, "bAction");
 	RNA_def_struct_ui_text(srna, "Action", "A collection of F-Curves for animation.");
+	RNA_def_struct_ui_icon(srna, ICON_ACTION);
 
 	prop= RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "curves", NULL);
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index c7f7b8cfebc..d49e5d14714 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -110,6 +110,7 @@ static void rna_def_bone(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "Bone", NULL);
 	RNA_def_struct_ui_text(srna, "Bone", "Bone in an Armature datablock.");
+	RNA_def_struct_ui_icon(srna, ICON_BONE_DATA);
 	
 	/* pointers/collections */
 		/* parent (pointer) */
@@ -266,6 +267,7 @@ void rna_def_armature(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "Armature", "ID");
 	RNA_def_struct_ui_text(srna, "Armature", "Armature datablock containing a hierarchy of bones, usually used for rigging characters.");
+	RNA_def_struct_ui_icon(srna, ICON_ARMATURE_DATA);
 	
 	RNA_def_struct_sdna(srna, "bArmature");
 	
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 778485c6e20..3deb38a3a07 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -93,6 +93,7 @@ void rna_def_brush(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "Brush", "ID");
 	RNA_def_struct_ui_text(srna, "Brush", "Brush datablock for storing brush settings for painting and sculpting.");
+	RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA);
 	
 	/* enums */
 	prop= RNA_def_property(srna, "blend", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c
index 1b2bd4b4aab..bee8a21ad7d 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -52,6 +52,7 @@ void RNA_def_camera(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Camera", "ID");
 	RNA_def_struct_ui_text(srna, "Camera", "Camera datablock for storing camera settings.");
+	RNA_def_struct_ui_icon(srna, ICON_CAMERA_DATA);
 
 	/* Enums */
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index bdc33715145..c0b75c3c65f 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -459,6 +459,7 @@ void rna_def_curve(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "Curve", "ID");
 	RNA_def_struct_ui_text(srna, "Curve", "Curve datablock storing curves, splines and NURBS.");
+	RNA_def_struct_ui_icon(srna, ICON_CURVE_DATA);
 	
 	rna_def_animdata_common(srna);
 	rna_def_texmat_common(srna, "rna_Curve_texspace_editable");
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 49c8c69fbcf..12d96965e36 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -572,6 +572,8 @@ StructRNA *RNA_def_struct(BlenderRNA *brna, const char *identifier, const char *
 	srna->identifier= identifier;
 	srna->name= identifier; /* may be overwritten later RNA_def_struct_ui_text */
 	srna->description= "";
+	if(!srnafrom)
+		srna->icon= ICON_DOT;
 
 	rna_addtail(&brna->structs, srna);
 
@@ -777,6 +779,11 @@ void RNA_def_struct_ui_text(StructRNA *srna, const char *name, const char *descr
 	srna->description= description;
 }
 
+void RNA_def_struct_ui_icon(StructRNA *srna, int icon)
+{
+	srna->icon= icon;
+}
+
 /* Property Definition */
 
 PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier, int type, int subtype)
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index d57e302263e..ea26118f267 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -586,6 +586,7 @@ void rna_def_fcurve(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "FCurve", NULL);
 	RNA_def_struct_ui_text(srna, "F-Curve", "F-Curve defining values of a period of time.");
+	RNA_def_struct_ui_icon(srna, ICON_ANIM_DATA);
 
 	/* Enums */
 	prop= RNA_def_property(srna, "extrapolation", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_group.c
index 35dddc122fe..059b2ce78f7 100644
--- a/source/blender/makesrna/intern/rna_group.c
+++ b/source/blender/makesrna/intern/rna_group.c
@@ -50,6 +50,7 @@ void RNA_def_group(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Group", "ID");
 	RNA_def_struct_ui_text(srna, "Group", "Group of Object datablocks.");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP);
 
 	prop= RNA_def_property(srna, "dupli_offset", PROP_FLOAT, PROP_VECTOR);
 	RNA_def_property_float_sdna(prop, NULL, "dupli_ofs");
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index a4a1636d212..8620a933d61 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -113,6 +113,7 @@ static void rna_def_image(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Image", "ID");
 	RNA_def_struct_ui_text(srna, "Image", "Image datablock referencing an external or packed image.");
+	RNA_def_struct_ui_icon(srna, ICON_IMAGE_DATA);
 
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 04779c035d0..9071efe71f7 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -25,6 +25,8 @@
 #ifndef RNA_INTERNAL_H
 #define RNA_INTERNAL_H
 
+#include "UI_resources.h"
+
 #include "rna_internal_types.h"
 
 #define RNA_MAGIC ((int)~0)
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h
index bd1c82fc049..60f057efa63 100644
--- a/source/blender/makesrna/intern/rna_internal_types.h
+++ b/source/blender/makesrna/intern/rna_internal_types.h
@@ -265,6 +265,8 @@ struct StructRNA {
 	const char *name;
 	/* single line description, displayed in the tooltip for example */
 	const char *description;
+	/* icon ID */
+	int icon;
 	
 	/* property that defines the name */
 	PropertyRNA *nameproperty;
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index 0a21ad1d940..d5f28503e4a 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -285,6 +285,7 @@ static void rna_def_keyblock(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ShapeKey", NULL);
 	RNA_def_struct_ui_text(srna, "Shape Key", "Shape key in a shape keys datablock.");
 	RNA_def_struct_sdna(srna, "KeyBlock");
+	RNA_def_struct_ui_icon(srna, ICON_SHAPEKEY_DATA);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "");
@@ -344,6 +345,7 @@ static void rna_def_key(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Key", "ID");
 	RNA_def_struct_ui_text(srna, "Key", "Shape keys datablock containing different shapes of geometric datablocks.");
+	RNA_def_struct_ui_icon(srna, ICON_SHAPEKEY_DATA);
 
 	prop= RNA_def_property(srna, "reference_key", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index d7f9c8728e8..77ac4de814e 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -263,6 +263,7 @@ static void rna_def_lamp(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Lamp", "ID");
 	RNA_def_struct_refine_func(srna, "rna_Lamp_refine");
 	RNA_def_struct_ui_text(srna, "Lamp", "Lamp datablock for lighting a scene.");
+	RNA_def_struct_ui_icon(srna, ICON_LAMP_DATA);
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_type_items);
diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c
index ca77d3b519f..26c4ebb7b23 100644
--- a/source/blender/makesrna/intern/rna_lattice.c
+++ b/source/blender/makesrna/intern/rna_lattice.c
@@ -117,6 +117,7 @@ static void rna_def_lattice(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Lattice", "ID");
 	RNA_def_struct_ui_text(srna, "Lattice", "Lattice datablock defining a grid for deforming other objects.");
+	RNA_def_struct_ui_icon(srna, ICON_LATTICE_DATA);
 
 	prop= RNA_def_property(srna, "points_u", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "pntsu");
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 03ce385be32..fdd0349b25e 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -28,6 +28,8 @@
 #include "RNA_define.h"
 #include "RNA_types.h"
 
+#include "rna_internal.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_main.h"
@@ -248,6 +250,7 @@ void RNA_def_main(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "Main", NULL);
 	RNA_def_struct_ui_text(srna, "Main", "Main data structure representing a .blend file and all its datablocks.");
+	RNA_def_struct_ui_icon(srna, ICON_BLENDER);
 
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_maxlength(prop, 240);
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 15cca0f3dfa..721bf621c22 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -731,6 +731,7 @@ void RNA_def_material(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Material", "ID");
 	RNA_def_struct_ui_text(srna, "Material", "Material datablock to defined the appearance of geometric objects for rendering.");
+	RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA);
 	
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "material_type");
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index c75558dafe4..92e53cf7606 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -597,9 +597,10 @@ static void rna_def_mvert_group(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna= RNA_def_struct(brna, "VertexGroupElement", NULL);
-	RNA_def_struct_ui_text(srna, "Vertex Group Element", "Weight value of a vertex in a vertex group.");
 	RNA_def_struct_sdna(srna, "MDeformWeight");
 	RNA_def_struct_path_func(srna, "rna_VertexGroupElement_path");
+	RNA_def_struct_ui_text(srna, "Vertex Group Element", "Weight value of a vertex in a vertex group.");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP_VERTEX);
 
 	/* we can't point to actual group, it is in the object and so
 	 * there is no unique group to point to, hence the index */
@@ -622,6 +623,7 @@ static void rna_def_mvert(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "MVert");
 	RNA_def_struct_ui_text(srna, "Mesh Vertex", "Vertex in a Mesh datablock.");
 	RNA_def_struct_path_func(srna, "rna_MeshVertex_path");
+	RNA_def_struct_ui_icon(srna, ICON_VERTEXSEL);
 
 	prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_VECTOR);
 	RNA_def_property_ui_text(prop, "Location", "");
@@ -658,6 +660,7 @@ static void rna_def_medge(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "MEdge");
 	RNA_def_struct_ui_text(srna, "Mesh Edge", "Edge in a Mesh datablock.");
 	RNA_def_struct_path_func(srna, "rna_MeshEdge_path");
+	RNA_def_struct_ui_icon(srna, ICON_EDGESEL);
 
 	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "v1");
@@ -699,6 +702,7 @@ static void rna_def_mface(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "MFace");
 	RNA_def_struct_ui_text(srna, "Mesh Face", "Face in a Mesh datablock.");
 	RNA_def_struct_path_func(srna, "rna_MeshFace_path");
+	RNA_def_struct_ui_icon(srna, ICON_FACESEL);
 
 	prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "v1");
@@ -763,6 +767,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "MTFace");
 	RNA_def_struct_ui_text(srna, "Mesh Texture Face", "UV mapping, texturing and game engine data for a face.");
 	RNA_def_struct_path_func(srna, "rna_MeshTextureFace_path");
+	RNA_def_struct_ui_icon(srna, ICON_FACESEL_HLT);
 
 	prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "tpage");
@@ -1042,6 +1047,7 @@ static void rna_def_mesh(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Mesh", "ID");
 	RNA_def_struct_ui_text(srna, "Mesh", "Mesh datablock to define geometric surfaces.");
+	RNA_def_struct_ui_icon(srna, ICON_MESH_DATA);
 
 	prop= RNA_def_property(srna, "verts", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "mvert", "totvert");
diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c
index 737bb52a466..472e776f500 100644
--- a/source/blender/makesrna/intern/rna_meta.c
+++ b/source/blender/makesrna/intern/rna_meta.c
@@ -55,8 +55,9 @@ void rna_def_metaelement(BlenderRNA *brna)
 		{0, NULL, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "MetaElement", NULL);
-	RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a MetaBall datablock.");
 	RNA_def_struct_sdna(srna, "MetaElem");
+	RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a MetaBall datablock.");
+	RNA_def_struct_ui_icon(srna, ICON_OUTLINER_DATA_META);
 	
 	/* enums */
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
@@ -112,6 +113,7 @@ void rna_def_metaball(BlenderRNA *brna)
 	
 	srna= RNA_def_struct(brna, "MetaBall", "ID");
 	RNA_def_struct_ui_text(srna, "MetaBall", "Metaball datablock to defined blobby surfaces.");
+	RNA_def_struct_ui_icon(srna, ICON_META_DATA);
 
 	prop= RNA_def_property(srna, "elements", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "elems", NULL);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 86bea0e7981..8dd6fa1b75b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -372,6 +372,7 @@ static void rna_def_modifier_subsurf(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "SubsurfModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Subsurf Modifier", "Subdivision surface modifier.");
 	RNA_def_struct_sdna(srna, "SubsurfModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SUBSURF);
 
 	rna_def_property_subdivision_common(srna, "subdivType");
 
@@ -407,6 +408,7 @@ static void rna_def_modifier_multires(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "MultiresModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Multires Modifier", "Multiresolution mesh modifier.");
 	RNA_def_struct_sdna(srna, "MultiresModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_MULTIRES);
 
 	rna_def_property_subdivision_common(srna, "simple");
 
@@ -425,6 +427,7 @@ static void rna_def_modifier_lattice(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "LatticeModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Lattice Modifier", "Lattice deformation modifier.");
 	RNA_def_struct_sdna(srna, "LatticeModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_LATTICE);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Lattice object to deform with.");
@@ -456,6 +459,7 @@ static void rna_def_modifier_curve(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "CurveModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Curve Modifier", "Curve deformation modifier.");
 	RNA_def_struct_sdna(srna, "CurveModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_CURVE);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Curve object to deform with.");
@@ -484,6 +488,7 @@ static void rna_def_modifier_build(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "BuildModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Build Modifier", "Build effect modifier.");
 	RNA_def_struct_sdna(srna, "BuildModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_BUILD);
 
 	prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 1, MAXFRAMEF);
@@ -513,6 +518,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "MirrorModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Mirror Modifier", "Mirroring modifier.");
 	RNA_def_struct_sdna(srna, "MirrorModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_MIRROR);
 
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_X);
@@ -571,6 +577,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "DecimateModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Decimate Modifier", "Decimation modifier.");
 	RNA_def_struct_sdna(srna, "DecimateModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_DECIM);
 
 	prop= RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "percent");
@@ -599,6 +606,7 @@ static void rna_def_modifier_wave(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "WaveModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Wave Modifier", "Wave effect modifier.");
 	RNA_def_struct_sdna(srna, "WaveModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE);
 
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_X);
@@ -742,6 +750,7 @@ static void rna_def_modifier_armature(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ArmatureModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Armature Modifier", "Armature deformation modifier.");
 	RNA_def_struct_sdna(srna, "ArmatureModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_ARMATURE);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Armature object to deform with.");
@@ -794,6 +803,7 @@ static void rna_def_modifier_hook(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "HookModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Hook Modifier", "Hook modifier to modify the location of vertices.");
 	RNA_def_struct_sdna(srna, "HookModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_HOOK);
 
 	prop= RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, FLT_MAX);
@@ -825,6 +835,7 @@ static void rna_def_modifier_softbody(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "SoftbodyModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Softbody Modifier", "Softbody simulation modifier.");
 	RNA_def_struct_sdna(srna, "SoftbodyModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SOFT);
 }
 
 static void rna_def_modifier_boolean(BlenderRNA *brna)
@@ -841,6 +852,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "BooleanModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Boolean Modifier", "Boolean operations modifier.");
 	RNA_def_struct_sdna(srna, "BooleanModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_BOOLEAN);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Mesh object to use for boolean operation.");
@@ -868,6 +880,7 @@ static void rna_def_modifier_array(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ArrayModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Array Modifier", "Array duplication modifier.");
 	RNA_def_struct_sdna(srna, "ArrayModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_ARRAY);
 
 	/* Length parameters */
 	prop= RNA_def_property(srna, "fit_type", PROP_ENUM, PROP_NONE);
@@ -967,6 +980,7 @@ static void rna_def_modifier_edgesplit(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "EdgeSplitModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "EdgeSplit Modifier", "Edge splitting modifier to create sharp edges.");
 	RNA_def_struct_sdna(srna, "EdgeSplitModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT);
 
 	prop= RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 180);
@@ -1008,6 +1022,7 @@ static void rna_def_modifier_displace(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "DisplaceModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Displace Modifier", "Displacement modifier.");
 	RNA_def_struct_sdna(srna, "DisplaceModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_DISPLACE);
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
@@ -1064,6 +1079,7 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "UVProjectModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "UVProject Modifier", "UV projection modifier to sets UVs from a projector.");
 	RNA_def_struct_sdna(srna, "UVProjectModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_UVPROJECT);
 
 	prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
@@ -1109,6 +1125,7 @@ static void rna_def_modifier_smooth(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "SmoothModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Smooth Modifier", "Smoothing effect modifier.");
 	RNA_def_struct_sdna(srna, "SmoothModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
 
 	prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_X);
@@ -1158,6 +1175,7 @@ static void rna_def_modifier_cast(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "CastModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Cast Modifier", "Cast modifier to cast to other shapes.");
 	RNA_def_struct_sdna(srna, "CastModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_CAST);
 
 	prop= RNA_def_property(srna, "cast_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "type");
@@ -1214,6 +1232,7 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "MeshDeformModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "MeshDeform Modifier", "Mesh deformation modifier to deform with other meshes.");
 	RNA_def_struct_sdna(srna, "MeshDeformModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Object", "Mesh object to deform with.");
@@ -1252,6 +1271,7 @@ static void rna_def_modifier_particlesystem(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ParticleSystemModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "ParticleSystem Modifier", "Particle system simulation modifier.");
 	RNA_def_struct_sdna(srna, "ParticleSystemModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_PARTICLES);
 }
 
 static void rna_def_modifier_particleinstance(BlenderRNA *brna)
@@ -1262,6 +1282,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ParticleInstanceModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "ParticleInstance Modifier", "Particle system instancing modifier.");
 	RNA_def_struct_sdna(srna, "ParticleInstanceModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_PARTICLES);
 
 	prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "ob");
@@ -1314,6 +1335,7 @@ static void rna_def_modifier_explode(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ExplodeModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Explode Modifier", "Explosion effect modifier based on a particle system.");
 	RNA_def_struct_sdna(srna, "ExplodeModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_EXPLODE);
 
 	prop= RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ExplodeModifier_vgroup_get", "rna_ExplodeModifier_vgroup_length", "rna_ExplodeModifier_vgroup_set");
@@ -1353,6 +1375,7 @@ static void rna_def_modifier_cloth(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ClothModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Cloth Modifier", "Cloth simulation modifier.");
 	RNA_def_struct_sdna(srna, "ClothModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_CLOTH);
 	
 	prop= RNA_def_property(srna, "settings", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "sim_parms");
@@ -1374,6 +1397,7 @@ static void rna_def_modifier_collision(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "CollisionModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Collision Modifier", "Collision modifier defining modifier stack position used for collision.");
 	RNA_def_struct_sdna(srna, "CollisionModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_PHYSICS);
 	
 	prop= RNA_def_property(srna, "absorption", PROP_INT, PROP_PERCENTAGE);
 	RNA_def_property_int_sdna(prop, NULL, "absorption");
@@ -1402,6 +1426,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "BevelModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Bevel Modifier", "Bevel modifier to make edges and vertices more rounded.");
 	RNA_def_struct_sdna(srna, "BevelModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_BEVEL);
 
 	prop= RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "value");
@@ -1448,6 +1473,7 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "ShrinkwrapModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Shrinkwrap Modifier", "Shrink wrapping modifier to shrink wrap and object to a target.");
 	RNA_def_struct_sdna(srna, "ShrinkwrapModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SHRINKWRAP);
 
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "shrinkType");
@@ -1537,6 +1563,7 @@ static void rna_def_modifier_fluidsim(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "FluidSimulationModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Fluid Simulation Modifier", "Fluid simulation modifier.");
 	RNA_def_struct_sdna(srna, "FluidsimModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_FLUIDSIM);
 
 	prop= RNA_def_property(srna, "settings", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_pointer_sdna(prop, NULL, "fss");
@@ -1556,6 +1583,7 @@ static void rna_def_modifier_mask(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "MaskModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Mask Modifier", "Mask modifier to hide parts of the mesh.");
 	RNA_def_struct_sdna(srna, "MaskModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_MASK);
 
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
@@ -1596,6 +1624,7 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "SimpleDeformModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "SimpleDeform Modifier", "Simple deformation modifier to apply effects such as twisting and bending.");
 	RNA_def_struct_sdna(srna, "SimpleDeformModifierData");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_SIMPLEDEFORM);
 
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index ff7984ff1b1..d75d3a5ddf6 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1160,6 +1160,7 @@ static void rna_def_nodetree(BlenderRNA *brna)
 	srna = RNA_def_struct(brna, "NodeTree", "ID");
 	RNA_def_struct_ui_text(srna, "Node Tree", "Node tree consisting of linked nodes used for materials, textures and compositing.");
 	RNA_def_struct_sdna(srna, "bNodeTree");
+	RNA_def_struct_ui_icon(srna, ICON_NODE);
 
 	prop = RNA_def_property(srna, "nodes", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "nodes", NULL);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 6baf5083d31..bfd3864bddd 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -263,6 +263,7 @@ static void rna_def_vertex_group(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "VertexGroup", NULL);
 	RNA_def_struct_sdna(srna, "bDeformGroup");
 	RNA_def_struct_ui_text(srna, "Vertex Group", "Group of vertices, used for armature deform and other purposes.");
+	RNA_def_struct_ui_icon(srna, ICON_GROUP_VERTEX);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "Vertex group name.");
@@ -301,6 +302,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "Object");
 	RNA_def_struct_nested(brna, srna, "Object");
 	RNA_def_struct_ui_text(srna, "Game Object Settings", "Game engine related settings for the object.");
+	RNA_def_struct_ui_icon(srna, ICON_GAME);
 
 	/* logic */
 
@@ -522,6 +524,7 @@ static StructRNA *rna_def_object(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Object", "ID");
 	RNA_def_struct_ui_text(srna, "Object", "Object datablock defining an object in a scene..");
 	RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
+	RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA);
 
 	prop= RNA_def_property(srna, "data", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ID");
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 36a1992670a..40069a995ea 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -435,6 +435,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "ParticleSettings", "ID");
 	RNA_def_struct_ui_text(srna, "Particle Settings", "Particle settings, reusable by multiple particle systems.");
+	RNA_def_struct_ui_icon(srna, ICON_PARTICLE_DATA);
 
 	/* flag */
 	prop= RNA_def_property(srna, "react_start_end", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 05aa10ec2eb..75bdbebb474 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -30,6 +30,8 @@
 #include "RNA_define.h"
 #include "RNA_types.h"
 
+#include "rna_internal.h"
+
 #ifdef RNA_RUNTIME
 
 /* Struct */
@@ -570,6 +572,7 @@ static void rna_def_struct(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Struct", NULL);
 	RNA_def_struct_ui_text(srna, "Struct Definition", "RNA structure definition");
+	RNA_def_struct_ui_icon(srna, ICON_RNA);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -647,6 +650,7 @@ static void rna_def_property(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Property", NULL);
 	RNA_def_struct_ui_text(srna, "Property Definition", "RNA property definition.");
 	RNA_def_struct_refine_func(srna, "rna_Property_refine");
+	RNA_def_struct_ui_icon(srna, ICON_RNA);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -699,6 +703,7 @@ static void rna_def_function(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Function", NULL);
 	RNA_def_struct_ui_text(srna, "Function Definition", "RNA function definition");
+	RNA_def_struct_ui_icon(srna, ICON_RNA);
 
 	prop= RNA_def_property(srna, "identifier", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -800,6 +805,7 @@ static void rna_def_enum_property(BlenderRNA *brna, StructRNA *srna)
 
 	srna= RNA_def_struct(brna, "EnumPropertyItem", NULL);
 	RNA_def_struct_ui_text(srna, "Enum Item Definition", "Definition of a choice in an RNA enum property.");
+	RNA_def_struct_ui_icon(srna, ICON_RNA);
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -884,6 +890,7 @@ void RNA_def_rna(BlenderRNA *brna)
 	/* Blender RNA */
 	srna= RNA_def_struct(brna, "BlenderRNA", NULL);
 	RNA_def_struct_ui_text(srna, "Blender RNA", "Blender RNA structure definitions.");
+	RNA_def_struct_ui_icon(srna, ICON_RNA);
 
 	prop= RNA_def_property(srna, "structs", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index caa6e73903a..226e6b17b47 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -607,6 +607,7 @@ void RNA_def_scene(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "Scene", "ID");
 	RNA_def_struct_ui_text(srna, "Scene", "Scene consisting objects and defining time and render related settings.");
+	RNA_def_struct_ui_icon(srna, ICON_SCENE_DATA);
 	RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
 
 	prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index e8b766ff2ea..e153994e7a6 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -90,6 +90,7 @@ static void rna_def_bscreen(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Screen", "ID");
 	RNA_def_struct_sdna(srna, "Screen"); /* it is actually bScreen but for 2.5 the dna is patched! */
 	RNA_def_struct_ui_text(srna, "Screen", "Screen datablock, defining the layout of areas in a window.");
+	RNA_def_struct_ui_icon(srna, ICON_SPLITSCREEN);
 	
 	prop= RNA_def_property(srna, "scene", PROP_POINTER, PROP_NEVER_NULL);
 	RNA_def_property_ui_text(prop, "Scene", "Active scene to be edited in the screen.");
diff --git a/source/blender/makesrna/intern/rna_scriptlink.c b/source/blender/makesrna/intern/rna_scriptlink.c
index f073065f6bc..b486cd4a874 100644
--- a/source/blender/makesrna/intern/rna_scriptlink.c
+++ b/source/blender/makesrna/intern/rna_scriptlink.c
@@ -41,6 +41,7 @@ void RNA_def_scriptlink(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "ScriptLink", NULL);
 	RNA_def_struct_ui_text(srna, "Script Link", "Scripts linked to a datablock, to be executed on changes to the datablock.");
+	RNA_def_struct_ui_icon(srna, ICON_PYTHON);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c
index c6515385757..118c39655e8 100644
--- a/source/blender/makesrna/intern/rna_sound.c
+++ b/source/blender/makesrna/intern/rna_sound.c
@@ -134,6 +134,7 @@ static void rna_def_sound(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Sound", "ID");
 	RNA_def_struct_sdna(srna, "bSound");
 	RNA_def_struct_ui_text(srna, "Sound", "Sound datablock referencing an external or packed sound file.");
+	RNA_def_struct_ui_icon(srna, ICON_SOUND);
 
 	//rna_def_ipo_common(srna);
 
diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c
index d3e4a34b9a7..cd39c317bc5 100644
--- a/source/blender/makesrna/intern/rna_text.c
+++ b/source/blender/makesrna/intern/rna_text.c
@@ -172,6 +172,7 @@ static void rna_def_text(BlenderRNA *brna)
 	
 	srna = RNA_def_struct(brna, "Text", "ID");
 	RNA_def_struct_ui_text(srna, "Text", "Text datablock referencing an external or packed text file.");
+	RNA_def_struct_ui_icon(srna, ICON_TEXT);
 	RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
 	
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index b0fa4458f22..be97fd863f5 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -990,6 +990,7 @@ static void rna_def_texture(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "Texture", "ID");
 	RNA_def_struct_sdna(srna, "Tex");
 	RNA_def_struct_ui_text(srna, "Texture", "Texture datablock used by materials, lamps, worlds and brushes.");
+	RNA_def_struct_ui_icon(srna, ICON_TEXTURE_DATA);
 	RNA_def_struct_refine_func(srna, "rna_Texture_refine");
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_vfont.c b/source/blender/makesrna/intern/rna_vfont.c
index d18b87e73ee..aa2aaaf6342 100644
--- a/source/blender/makesrna/intern/rna_vfont.c
+++ b/source/blender/makesrna/intern/rna_vfont.c
@@ -43,6 +43,7 @@ void RNA_def_vfont(BlenderRNA *brna)
 	srna= RNA_def_struct(brna, "VectorFont", "ID");
 	RNA_def_struct_ui_text(srna, "Vector Font", "Vector font for Text objects.");
 	RNA_def_struct_sdna(srna, "VFont");
+	RNA_def_struct_ui_icon(srna, ICON_FONT_DATA);
 
 	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index 7fb7fe656f5..81fad658a7e 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -338,6 +338,7 @@ void RNA_def_world(BlenderRNA *brna)
 
 	srna= RNA_def_struct(brna, "World", "ID");
 	RNA_def_struct_ui_text(srna, "World", "World datablock describing the environment and ambient lighting of a scene.");
+	RNA_def_struct_ui_icon(srna, ICON_WORLD_DATA);
 
 	rna_def_animdata_common(srna);
 	rna_def_mtex_common(srna, "rna_World_mtex_begin", "rna_World_active_texture_get", "WorldTextureSlot");