UI: new icon set by Andrzej Ambroz.

This is a monochrome icon set, with a more modern look and icons for
various features that did not have a proper icon before.

13 files changed, 547 insertions, 478 deletions

diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 3e7f7063235..4e898d5654b 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -42,8 +42,8 @@ set(ICON_NAMES
 	tria_up
 	arrow_leftright
 	plus
-	disclosure_tri_down
 	disclosure_tri_right
+	disclosure_tri_down
 	radiobut_off
 	radiobut_on
 	menu_panel
@@ -58,12 +58,12 @@ set(ICON_NAMES
 	node
 	node_sel
 	fullscreen
-	splitscreen
+	workspace
 	rightarrow_thin
 	bordermove
 	viewzoom
-	zoomin
-	zoomout
+	add
+	remove
 	panel_close
 	copy_id
 	eyedropper
@@ -100,14 +100,16 @@ set(ICON_NAMES
 	freeze
 	stylus_pressure
 	ghost_disabled
-	new
+	file_new
 	file_tick
 	quit
 	url
 	recover_last
+	30
 	fullscreen_enter
 	fullscreen_exit
-	lamp
+	#onionskin
+	light
 	material
 	texture
 	anim
@@ -121,27 +123,31 @@ set(ICON_NAMES
 	physics
 	speaker
 	texture_shaded
+	tool_settings
+	shaderfx
+	#blank1
 	view3d
-	ipo
-	oops
-	buts
-	filesel
-	image_col
+	graph
+	outliner
+	properties
+	filebrowser
+	image
 	info
 	sequence
 	text
-	imasel
 	sound
 	action
 	nla
-	scriptwin
+	preferences
 	time
 	nodetree
 	logic
 	console
-	preferences
 	clip
 	asset_manager
+	node_compositing
+	node_texture
+	node_material
 	object_datamode
 	editmode_hlt
 	facesel_hlt
@@ -153,6 +159,15 @@ set(ICON_NAMES
 	particlemode
 	lightpaint
 	greasepencil_stroke_paint
+	tracking
+	tracking_backwards
+	tracking_forwards
+	tracking_backwards_single
+	tracking_forwards_single
+	tracking_clear_backwards
+	tracking_clear_forwards
+	tracking_refine_backwards
+	tracking_refine_forwards
 	scene_data
 	renderlayers
 	world_data
@@ -161,7 +176,7 @@ set(ICON_NAMES
 	curve_data
 	meta_data
 	lattice_data
-	lamp_data
+	light_data
 	material_data
 	texture_data
 	anim_data
@@ -186,7 +201,6 @@ set(ICON_NAMES
 	render_result
 	surface_data
 	empty_data
-	settings
 	render_animation
 	render_still
 	library_data_broken
@@ -200,18 +214,36 @@ set(ICON_NAMES
 	group_vertex
 	group_vcol
 	group_uvs
+	face_maps
 	rna
 	rna_add
 	mouse_lmb
 	mouse_mmb
 	mouse_rmb
-	mouse_drag
+	mouse_move
+	mouse_lmb_drag
+	mouse_mmb_drag
+	mouse_rmb_drag
+	preset
+	decorate
+	decorate_keyframe
+	decorate_animate
+	decorate_driver
+	decorate_linked
+	decorate_override
+	decorate_unlocked
+	decorate_locked
+	fake_user
+	orphan_data
+	user
+	system
+	settings
 	outliner_ob_empty
 	outliner_ob_mesh
 	outliner_ob_curve
 	outliner_ob_lattice
 	outliner_ob_meta
-	outliner_ob_lamp
+	outliner_ob_light
 	outliner_ob_camera
 	outliner_ob_armature
 	outliner_ob_font
@@ -220,6 +252,8 @@ set(ICON_NAMES
 	outliner_ob_force_field
 	outliner_ob_group_instance
 	outliner_ob_greasepencil
+	outliner_ob_lightprobe
+	outliner_ob_image
 	restrict_color_off
 	restrict_color_on
 	restrict_view_off
@@ -228,12 +262,11 @@ set(ICON_NAMES
 	restrict_select_on
 	restrict_render_off
 	restrict_render_on
-	outliner_data_empty
 	outliner_data_mesh
 	outliner_data_curve
 	outliner_data_lattice
 	outliner_data_meta
-	outliner_data_lamp
+	outliner_data_light
 	outliner_data_camera
 	outliner_data_armature
 	outliner_data_font
@@ -241,6 +274,10 @@ set(ICON_NAMES
 	outliner_data_speaker
 	outliner_data_pose
 	outliner_data_greasepencil
+	onionskin_off
+	onionskin_on
+	hide_off
+	hide_on
 	mesh_plane
 	mesh_cube
 	mesh_circle
@@ -252,11 +289,11 @@ set(ICON_NAMES
 	mesh_torus
 	mesh_cone
 	mesh_capsule
-	lamp_point
-	lamp_sun
-	lamp_spot
-	lamp_hemi
-	lamp_area
+	light_point
+	light_sun
+	light_spot
+	light_hemi
+	light_area
 	meta_empty
 	meta_plane
 	meta_cube
@@ -274,6 +311,9 @@ set(ICON_NAMES
 	curve_ncurve
 	curve_ncircle
 	curve_path
+	lightprobe_cubemap
+	lightprobe_planar
+	lightprobe_grid
 	color_red
 	color_green
 	color_blue
@@ -294,8 +334,25 @@ set(ICON_NAMES
 	force_turbulence
 	force_drag
 	force_smokeflow
+	temperature
+	gear
 	node_insert_on
 	node_insert_off
+	node_top
+	node_side
+	node_corner
+	align_left
+	align_center
+	align_right
+	align_justify
+	align_flush
+	align_top
+	align_middle
+	align_bottom
+	bold
+	italic
+	underline
+	small_caps
 	modifier
 	mod_wave
 	mod_build
@@ -346,7 +403,6 @@ set(ICON_NAMES
 	pause
 	prev_keyframe
 	next_keyframe
-	play_audio
 	play_reverse
 	preview_range
 	action_tweak
@@ -355,8 +411,8 @@ set(ICON_NAMES
 	pmarker
 	marker_hlt
 	marker
-	space2
-	space3
+	keyframe_hlt
+	keyframe
 	keyingset
 	key_dehlt
 	key_hlt
@@ -390,13 +446,12 @@ set(ICON_NAMES
 	vertexsel
 	edgesel
 	facesel
-	loopsel
-	rotate
-	cursor
-	rotatecollection
-	rotatecenter
-	rotactive
-	align
+	pivot_boundbox
+	pivot_cursor
+	pivot_individual
+	pivot_median
+	pivot_active
+	center_only
 	smoothcurve
 	spherecurve
 	rootcurve
@@ -407,6 +462,7 @@ set(ICON_NAMES
 	prop_off
 	prop_on
 	prop_con
+	sculpt_dyntopo
 	particle_point
 	particle_tip
 	particle_path
@@ -431,15 +487,19 @@ set(ICON_NAMES
 	snap_peel_object
 	grid
 	object_origin
+	orientation_global
+	orientation_gimbal
+	orientation_local
+	orientation_normal
+	orientation_view
 	pastedown
 	copydown
 	pasteflipup
 	pasteflipdown
 	vis_sel_11
 	vis_sel_10
-	vis_sel_10
+	vis_sel_01
 	vis_sel_00
-	snap_surface
 	automerge_on
 	automerge_off
 	retopo
@@ -448,12 +508,16 @@ set(ICON_NAMES
 	uv_facesel
 	uv_islandsel
 	uv_sync_select
-	bbox
-	wire
-	solid
-	smooth
-	potato
-	ortho
+	normals_vertex
+	normals_vertex_face
+	normals_face
+	shading_bbox
+	shading_wire
+	shading_solid
+	shading_rendered
+	shading_texture
+	overlay
+	xray
 	lockview_off
 	lockview_on
 	axis_side
@@ -473,8 +537,6 @@ set(ICON_NAMES
 	shortdisplay
 	ghost
 	imgdisplay
-	save_as
-	save_copy
 	bookmarks
 	fontpreview
 	filter
@@ -483,6 +545,7 @@ set(ICON_NAMES
 	file_parent
 	file_refresh
 	file_folder
+	file_blank
 	file_blend
 	file_image
 	file_movie
@@ -490,18 +553,19 @@ set(ICON_NAMES
 	file_sound
 	file_font
 	file_text
-	recover_auto
-	save_prefs
+	sort_desc
+	sort_asc
 	link_blend
 	append_blend
 	import
 	export
 	external_data
-	load_factory
 	loop_back
 	loop_forwards
 	back
 	forward
+	alembic
+	volume
 	file_hidden
 	file_backup
 	disk_drive
@@ -531,6 +595,11 @@ set(ICON_NAMES
 	image_alpha
 	image_zdepth
 	imagefile
+	view_perspective
+	view_ortho
+	view_camera
+	view_pan
+	view_zoom
 )
 
 # This section is maintained by the updating script, keep BEGIN/END comments.
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index eb4307b9f86..5eb1c07c253 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -393,7 +393,7 @@ const EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf(
 		item_tmp.identifier = "__CREATE__";
 		item_tmp.name = "New Layer";
 		item_tmp.value = -1;
-		item_tmp.icon = ICON_ZOOMIN;
+		item_tmp.icon = ICON_ADD;
 		RNA_enum_item_add(&item, &totitem, &item_tmp);
 
 		/* separator */
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 45cc1046932..68c2044f95c 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -28,93 +28,91 @@
  *  \ingroup editorui
  */
 
-/* Note: this is included twice with different #defines for DEF_ICON
- * once from UI_resources.h for the internal icon enum and
- * once for interface_api.c for the definition of the RNA enum for the icons */
+/* Note: this is included multiple times with different #defines for DEF_ICON. */
 
 /* ICON_ prefix added */
-DEF_ICON(NONE)
+DEF_ICON_COLOR(NONE)
 DEF_ICON(QUESTION)
 DEF_ICON(ERROR)
 DEF_ICON(CANCEL)
-DEF_ICON_MONO(TRIA_RIGHT)
-DEF_ICON_MONO(TRIA_DOWN)
-DEF_ICON_MONO(TRIA_LEFT)
-DEF_ICON_MONO(TRIA_UP)
-DEF_ICON_MONO(ARROW_LEFTRIGHT)
-DEF_ICON_MONO(PLUS)
-DEF_ICON_MONO(DISCLOSURE_TRI_RIGHT)
-DEF_ICON_MONO(DISCLOSURE_TRI_DOWN)
-DEF_ICON_MONO(RADIOBUT_OFF)
-DEF_ICON_MONO(RADIOBUT_ON)
-DEF_ICON(MENU_PANEL)
+DEF_ICON(TRIA_RIGHT)
+DEF_ICON(TRIA_DOWN)
+DEF_ICON(TRIA_LEFT)
+DEF_ICON(TRIA_UP)
+DEF_ICON(ARROW_LEFTRIGHT)
+DEF_ICON(PLUS)
+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(BLENDER)
-DEF_ICON_MONO(GRIP)
-DEF_ICON_MONO(DOT)
-DEF_ICON_MONO(COLLAPSEMENU)
-DEF_ICON_MONO(X)
+DEF_ICON(GRIP)
+DEF_ICON(DOT)
+DEF_ICON(COLLAPSEMENU)
+DEF_ICON(X)
 DEF_ICON_BLANK(5)  /* XXX 'DOWNARROW' icon! */
-DEF_ICON(GO_LEFT)
-DEF_ICON(PLUG)
-DEF_ICON(UI)
+DEF_ICON_COLOR(GO_LEFT)
+DEF_ICON_COLOR(PLUG)
+DEF_ICON_COLOR(UI)
 DEF_ICON(NODE)
 DEF_ICON(NODE_SEL)
 
 	/* ui */
-DEF_ICON(FULLSCREEN)
-DEF_ICON(SPLITSCREEN)
-DEF_ICON_MONO(RIGHTARROW_THIN)
-DEF_ICON_MONO(BORDERMOVE)
-DEF_ICON_MONO(VIEWZOOM)
-DEF_ICON_MONO(ZOOMIN)
-DEF_ICON_MONO(ZOOMOUT)
-DEF_ICON_MONO(PANEL_CLOSE)
-DEF_ICON(COPY_ID)
+DEF_ICON_COLOR(FULLSCREEN)
+DEF_ICON(WORKSPACE)
+DEF_ICON(RIGHTARROW_THIN)
+DEF_ICON(BORDERMOVE)
+DEF_ICON(VIEWZOOM)
+DEF_ICON(ADD)
+DEF_ICON(REMOVE)
+DEF_ICON(PANEL_CLOSE)
+DEF_ICON_COLOR(COPY_ID)
 DEF_ICON(EYEDROPPER)
-DEF_ICON(LINK_AREA)
+DEF_ICON_COLOR(LINK_AREA)
 DEF_ICON(AUTO)
-DEF_ICON_MONO(CHECKBOX_DEHLT)
-DEF_ICON_MONO(CHECKBOX_HLT)
-DEF_ICON_MONO(UNLOCKED)
-DEF_ICON_MONO(LOCKED)
-DEF_ICON_MONO(UNPINNED)
-DEF_ICON_MONO(PINNED)
-DEF_ICON_MONO(SCREEN_BACK)
-DEF_ICON_MONO(RIGHTARROW)
-DEF_ICON_MONO(DOWNARROW_HLT)
-DEF_ICON(DOTSUP)
-DEF_ICON(DOTSDOWN)
+DEF_ICON(CHECKBOX_DEHLT)
+DEF_ICON(CHECKBOX_HLT)
+DEF_ICON(UNLOCKED)
+DEF_ICON(LOCKED)
+DEF_ICON(UNPINNED)
+DEF_ICON(PINNED)
+DEF_ICON(SCREEN_BACK)
+DEF_ICON(RIGHTARROW)
+DEF_ICON(DOWNARROW_HLT)
+DEF_ICON_COLOR(DOTSUP)
+DEF_ICON_COLOR(DOTSDOWN)
 DEF_ICON(LINK)
 DEF_ICON(INLINK)
-DEF_ICON(PLUGIN)
+DEF_ICON_COLOR(PLUGIN)
 
 	/* various ui */
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
 DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
-DEF_ICON_MONO(LINKED)
-DEF_ICON_MONO(UNLINKED)
-DEF_ICON_MONO(HAND)
-DEF_ICON_MONO(ZOOM_ALL)
-DEF_ICON_MONO(ZOOM_SELECTED)
-DEF_ICON_MONO(ZOOM_PREVIOUS)
-DEF_ICON_MONO(ZOOM_IN)
-DEF_ICON_MONO(ZOOM_OUT)
-DEF_ICON(RENDER_REGION)
-DEF_ICON(BORDER_RECT)
-DEF_ICON(BORDER_LASSO)
+DEF_ICON(LINKED)
+DEF_ICON(UNLINKED)
+DEF_ICON(HAND)
+DEF_ICON(ZOOM_ALL)
+DEF_ICON(ZOOM_SELECTED)
+DEF_ICON(ZOOM_PREVIOUS)
+DEF_ICON(ZOOM_IN)
+DEF_ICON(ZOOM_OUT)
+DEF_ICON_COLOR(RENDER_REGION)
+DEF_ICON_COLOR(BORDER_RECT)
+DEF_ICON_COLOR(BORDER_LASSO)
 DEF_ICON(FREEZE)
 DEF_ICON(STYLUS_PRESSURE)
 DEF_ICON(GHOST_DISABLED)
-DEF_ICON(NEW)
+DEF_ICON(FILE_NEW)
 DEF_ICON(FILE_TICK)
 DEF_ICON(QUIT)
 DEF_ICON(URL)
 DEF_ICON(RECOVER_LAST)
-DEF_ICON_BLANK(30)
-DEF_ICON_MONO(FULLSCREEN_ENTER)
-DEF_ICON_MONO(FULLSCREEN_EXIT)
-DEF_ICON(BLANK1)	// Not actually blank - this is used all over the place
+DEF_ICON(30)
+DEF_ICON(FULLSCREEN_ENTER)
+DEF_ICON(FULLSCREEN_EXIT)
+DEF_ICON(ONIONSKIN)
 
 	/* BUTTONS */
 DEF_ICON(LIGHT)
@@ -126,7 +124,7 @@ DEF_ICON(SCENE)
 DEF_ICON(EDIT)
 DEF_ICON(GAME)
 DEF_ICON(RADIO)
-DEF_ICON(SCRIPT)
+DEF_ICON_COLOR(SCRIPT)
 DEF_ICON(PARTICLES)
 DEF_ICON(PHYSICS)
 DEF_ICON(SPEAKER)
@@ -142,32 +140,32 @@ DEF_ICON_BLANK(49)
 DEF_ICON_BLANK(50)
 DEF_ICON_BLANK(51)
 DEF_ICON_BLANK(52)
-DEF_ICON_BLANK(52b)
+DEF_ICON_COLOR(BLANK1)    // Not actually blank - this is used all over the place
 	/* EDITORS */
 DEF_ICON(VIEW3D)
-DEF_ICON(IPO)
-DEF_ICON(OOPS)
-DEF_ICON(BUTS)
-DEF_ICON(FILESEL)
-DEF_ICON(IMAGE_COL)
+DEF_ICON(GRAPH)
+DEF_ICON(OUTLINER)
+DEF_ICON(PROPERTIES)
+DEF_ICON(FILEBROWSER)
+DEF_ICON(IMAGE)
 DEF_ICON(INFO)
 DEF_ICON(SEQUENCE)
 DEF_ICON(TEXT)
-DEF_ICON(IMASEL)
+DEF_ICON_BLANK(62)
 DEF_ICON(SOUND)
 DEF_ICON(ACTION)
 DEF_ICON(NLA)
-DEF_ICON(SCRIPTWIN)
+DEF_ICON(PREFERENCES)
 DEF_ICON(TIME)
 DEF_ICON(NODETREE)
 DEF_ICON(LOGIC)
 DEF_ICON(CONSOLE)
-DEF_ICON(PREFERENCES)
+DEF_ICON_BLANK(54)
 DEF_ICON(CLIP)
 DEF_ICON(ASSET_MANAGER)
-DEF_ICON_BLANK(57)
-DEF_ICON_BLANK(58)
-DEF_ICON_BLANK(59)
+DEF_ICON(NODE_COMPOSITING)
+DEF_ICON(NODE_TEXTURE)
+DEF_ICON(NODE_MATERIAL)
 DEF_ICON_BLANK(60)
 DEF_ICON_BLANK(61)
 
@@ -181,22 +179,22 @@ DEF_ICON(WPAINT_HLT)
 DEF_ICON(SCULPTMODE_HLT)
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
-DEF_ICON(LIGHTPAINT)
-DEF_ICON(GREASEPENCIL_STROKE_PAINT)
+DEF_ICON_COLOR(LIGHTPAINT)
+DEF_ICON_COLOR(GREASEPENCIL_STROKE_PAINT)
 DEF_ICON_BLANK(64)
 DEF_ICON_BLANK(65)
 DEF_ICON_BLANK(66)
 DEF_ICON_BLANK(67)
 DEF_ICON_BLANK(68)
-DEF_ICON_BLANK(69)
-DEF_ICON_BLANK(70)
-DEF_ICON_BLANK(71)
-DEF_ICON_BLANK(72)
-DEF_ICON_BLANK(73)
-DEF_ICON_BLANK(74)
-DEF_ICON_BLANK(75)
-DEF_ICON_BLANK(76)
-DEF_ICON_BLANK(77)
+DEF_ICON(TRACKING)
+DEF_ICON(TRACKING_BACKWARDS)
+DEF_ICON(TRACKING_FORWARDS)
+DEF_ICON(TRACKING_BACKWARDS_SINGLE)
+DEF_ICON(TRACKING_FORWARDS_SINGLE)
+DEF_ICON(TRACKING_CLEAR_BACKWARDS)
+DEF_ICON(TRACKING_CLEAR_FORWARDS)
+DEF_ICON(TRACKING_REFINE_BACKWARDS)
+DEF_ICON(TRACKING_REFINE_FORWARDS)
 DEF_ICON_BLANK(77b)
 
 	/* DATA */
@@ -220,7 +218,7 @@ DEF_ICON(ARMATURE_DATA)
 DEF_ICON(POSE_DATA)
 DEF_ICON(BONE_DATA)
 DEF_ICON(CONSTRAINT)
-DEF_ICON(SHAPEKEY_DATA)
+DEF_ICON_COLOR(SHAPEKEY_DATA)
 DEF_ICON(CONSTRAINT_BONE)
 DEF_ICON(CAMERA_STEREO)
 DEF_ICON(PACKAGE)
@@ -236,52 +234,52 @@ DEF_ICON(FONT_DATA)
 DEF_ICON(RENDER_RESULT)
 DEF_ICON(SURFACE_DATA)
 DEF_ICON(EMPTY_DATA)
-DEF_ICON(SETTINGS)
+DEF_ICON_BLANK(88)
 DEF_ICON(RENDER_ANIMATION)
 DEF_ICON(RENDER_STILL)
 DEF_ICON(LIBRARY_DATA_BROKEN)
-DEF_ICON(BOIDS)
+DEF_ICON_COLOR(BOIDS)
 DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
 DEF_ICON(LINE_DATA)
-DEF_ICON(LIBRARY_DATA_OVERRIDE)
+DEF_ICON_COLOR(LIBRARY_DATA_OVERRIDE)
 DEF_ICON(GROUP_BONE)
 DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
 DEF_ICON(GROUP_UVS)
-DEF_ICON_BLANK(89)
+DEF_ICON(FACE_MAPS)
 DEF_ICON_BLANK(90)
 DEF_ICON(RNA)
 DEF_ICON(RNA_ADD)
 
 	/* INPUT + DECORATOR */
-DEF_ICON_MONO(MOUSE_LMB)
-DEF_ICON_MONO(MOUSE_MMB)
-DEF_ICON_MONO(MOUSE_RMB)
-DEF_ICON_MONO(MOUSE_MOVE)
-DEF_ICON_MONO(MOUSE_LMB_DRAG)
-DEF_ICON_MONO(MOUSE_MMB_DRAG)
-DEF_ICON_MONO(MOUSE_RMB_DRAG)
+DEF_ICON(MOUSE_LMB)
+DEF_ICON(MOUSE_MMB)
+DEF_ICON(MOUSE_RMB)
+DEF_ICON(MOUSE_MOVE)
+DEF_ICON(MOUSE_LMB_DRAG)
+DEF_ICON(MOUSE_MMB_DRAG)
+DEF_ICON(MOUSE_RMB_DRAG)
 DEF_ICON_BLANK(99)
-DEF_ICON_MONO(PRESET)
+DEF_ICON(PRESET)
 DEF_ICON_BLANK(101)
-DEF_ICON_MONO(DECORATE)
-DEF_ICON_MONO(DECORATE_KEYFRAME)
-DEF_ICON_MONO(DECORATE_ANIMATE)
-DEF_ICON_MONO(DECORATE_DRIVER)
-DEF_ICON_MONO(DECORATE_LINKED)
-DEF_ICON_MONO(DECORATE_OVERRIDE)
-DEF_ICON_MONO(DECORATE_UNLOCKED)
-DEF_ICON_MONO(DECORATE_LOCKED)
+DEF_ICON(DECORATE)
+DEF_ICON(DECORATE_KEYFRAME)
+DEF_ICON(DECORATE_ANIMATE)
+DEF_ICON(DECORATE_DRIVER)
+DEF_ICON(DECORATE_LINKED)
+DEF_ICON(DECORATE_OVERRIDE)
+DEF_ICON(DECORATE_UNLOCKED)
+DEF_ICON(DECORATE_LOCKED)
 DEF_ICON_BLANK(110)
 DEF_ICON_BLANK(111)
 DEF_ICON_BLANK(112)
-DEF_ICON_BLANK(113)
-DEF_ICON_BLANK(114)
-DEF_ICON_MONO(USER)
-DEF_ICON_BLANK(116)
-DEF_ICON_BLANK(116b)
+DEF_ICON(FAKE_USER)
+DEF_ICON(ORPHAN_DATA)
+DEF_ICON(USER)
+DEF_ICON(SYSTEM)
+DEF_ICON(SETTINGS)
 
 	/* OUTLINER */
 DEF_ICON(OUTLINER_OB_EMPTY)
@@ -303,16 +301,16 @@ DEF_ICON(OUTLINER_OB_IMAGE)
 DEF_ICON_BLANK(125)
 DEF_ICON(RESTRICT_COLOR_OFF)
 DEF_ICON(RESTRICT_COLOR_ON)
-DEF_ICON_MONO(HIDE_OFF)
-DEF_ICON_MONO(HIDE_ON)
-DEF_ICON_MONO(RESTRICT_SELECT_OFF)
-DEF_ICON_MONO(RESTRICT_SELECT_ON)
-DEF_ICON_MONO(RESTRICT_RENDER_OFF)
-DEF_ICON_MONO(RESTRICT_RENDER_ON)
+DEF_ICON(RESTRICT_VIEW_OFF)
+DEF_ICON(RESTRICT_VIEW_ON)
+DEF_ICON(RESTRICT_SELECT_OFF)
+DEF_ICON(RESTRICT_SELECT_ON)
+DEF_ICON(RESTRICT_RENDER_OFF)
+DEF_ICON(RESTRICT_RENDER_ON)
 DEF_ICON_BLANK(127b)
 
 	/* OUTLINER */
-DEF_ICON(OUTLINER_DATA_EMPTY)
+DEF_ICON_BLANK(128)
 DEF_ICON(OUTLINER_DATA_MESH)
 DEF_ICON(OUTLINER_DATA_CURVE)
 DEF_ICON(OUTLINER_DATA_LATTICE)
@@ -324,8 +322,8 @@ DEF_ICON(OUTLINER_DATA_FONT)
 DEF_ICON(OUTLINER_DATA_SURFACE)
 DEF_ICON(OUTLINER_DATA_SPEAKER)
 DEF_ICON(OUTLINER_DATA_POSE)
+DEF_ICON_BLANK(130)
 DEF_ICON(OUTLINER_DATA_GREASEPENCIL)
-DEF_ICON_BLANK(131)
 DEF_ICON_BLANK(132)
 DEF_ICON_BLANK(133)
 DEF_ICON_BLANK(134)
@@ -333,10 +331,10 @@ DEF_ICON_BLANK(135)
 DEF_ICON_BLANK(136)
 DEF_ICON_BLANK(137)
 DEF_ICON_BLANK(138)
-DEF_ICON_BLANK(139)
-DEF_ICON_BLANK(140)
-DEF_ICON_MONO(RESTRICT_VIEW_OFF)
-DEF_ICON_MONO(RESTRICT_VIEW_ON)
+DEF_ICON(ONIONSKIN_OFF)
+DEF_ICON(ONIONSKIN_ON)
+DEF_ICON(HIDE_OFF)
+DEF_ICON(HIDE_ON)
 DEF_ICON_BLANK(142b)
 
 	/* PRIMITIVES */
@@ -359,7 +357,7 @@ DEF_ICON(LIGHT_HEMI)
 DEF_ICON(LIGHT_AREA)
 DEF_ICON_BLANK(617)
 DEF_ICON_BLANK(618)
-DEF_ICON(META_EMPTY)
+DEF_ICON_COLOR(META_EMPTY)
 DEF_ICON(META_PLANE)
 DEF_ICON(META_CUBE)
 DEF_ICON(META_BALL)
@@ -390,25 +388,25 @@ DEF_ICON_BLANK(648)
 DEF_ICON(COLOR_RED)
 DEF_ICON(COLOR_GREEN)
 DEF_ICON(COLOR_BLUE)
-DEF_ICON_MONO(TRIA_RIGHT_BAR)
-DEF_ICON_MONO(TRIA_DOWN_BAR)
-DEF_ICON_MONO(TRIA_LEFT_BAR)
-DEF_ICON_MONO(TRIA_UP_BAR)
+DEF_ICON(TRIA_RIGHT_BAR)
+DEF_ICON(TRIA_DOWN_BAR)
+DEF_ICON(TRIA_LEFT_BAR)
+DEF_ICON(TRIA_UP_BAR)
 
 	/* EMPTY */
-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_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_BLANK(673)
 DEF_ICON_BLANK(674)
 DEF_ICON_BLANK(675)
@@ -424,14 +422,14 @@ DEF_ICON_BLANK(684)
 DEF_ICON_BLANK(685)
 
 	/* EMPTY */
-DEF_ICON_BLANK(690)  /* XXX 'Temperature' icon! */
+DEF_ICON_COLOR(TEMPERATURE)  /* XXX 'Temperature' icon! */
 DEF_ICON_BLANK(691)  /* XXX 'Temperature' icon! */
-DEF_ICON_BLANK(692)  /* XXX 'Gear' icon! */
+DEF_ICON_COLOR(GEAR)  /* XXX 'Gear' icon! */
 DEF_ICON(NODE_INSERT_ON)
 DEF_ICON(NODE_INSERT_OFF)
-DEF_ICON_BLANK(695)
-DEF_ICON_BLANK(696)
-DEF_ICON_BLANK(697)
+DEF_ICON(NODE_TOP)
+DEF_ICON(NODE_SIDE)
+DEF_ICON(NODE_CORNER)
 DEF_ICON_BLANK(698)
 DEF_ICON_BLANK(699)
 DEF_ICON_BLANK(700)
@@ -452,19 +450,19 @@ DEF_ICON_BLANK(714)
 DEF_ICON_BLANK(715)
 
 	/* EMPTY */
-DEF_ICON_MONO(ALIGN_LEFT)
-DEF_ICON_MONO(ALIGN_CENTER)
-DEF_ICON_MONO(ALIGN_RIGHT)
-DEF_ICON_MONO(ALIGN_JUSTIFY)
-DEF_ICON_MONO(ALIGN_FLUSH)
-DEF_ICON_MONO(ALIGN_TOP)
-DEF_ICON_MONO(ALIGN_MIDDLE)
-DEF_ICON_MONO(ALIGN_BOTTOM)
-DEF_ICON_MONO(BOLD)
-DEF_ICON_MONO(ITALIC)
-DEF_ICON_MONO(UNDERLINE)
-DEF_ICON_MONO(SMALL_CAPS_ON)
-DEF_ICON_MONO(SMALL_CAPS_OFF)
+DEF_ICON(ALIGN_LEFT)
+DEF_ICON(ALIGN_CENTER)
+DEF_ICON(ALIGN_RIGHT)
+DEF_ICON(ALIGN_JUSTIFY)
+DEF_ICON(ALIGN_FLUSH)
+DEF_ICON(ALIGN_TOP)
+DEF_ICON(ALIGN_MIDDLE)
+DEF_ICON(ALIGN_BOTTOM)
+DEF_ICON(BOLD)
+DEF_ICON(ITALIC)
+DEF_ICON(UNDERLINE)
+DEF_ICON(SMALL_CAPS)
+DEF_ICON_BLANK(742)
 DEF_ICON_BLANK(743)
 DEF_ICON_BLANK(744)
 DEF_ICON_BLANK(745)
@@ -509,50 +507,50 @@ DEF_ICON_BLANK(785)
 
 	/* MODIFIERS */
 DEF_ICON(MODIFIER)
-DEF_ICON(MOD_WAVE)
-DEF_ICON(MOD_BUILD)
-DEF_ICON(MOD_DECIM)
-DEF_ICON(MOD_MIRROR)
-DEF_ICON(MOD_SOFT)
-DEF_ICON(MOD_SUBSURF)
-DEF_ICON(HOOK)
-DEF_ICON(MOD_PHYSICS)
-DEF_ICON(MOD_PARTICLES)
-DEF_ICON(MOD_BOOLEAN)
-DEF_ICON(MOD_EDGESPLIT)
-DEF_ICON(MOD_ARRAY)
-DEF_ICON(MOD_UVPROJECT)
-DEF_ICON(MOD_DISPLACE)
-DEF_ICON(MOD_CURVE)
-DEF_ICON(MOD_LATTICE)
-DEF_ICON(CONSTRAINT_DATA)
-DEF_ICON(MOD_ARMATURE)
-DEF_ICON(MOD_SHRINKWRAP)
-DEF_ICON(MOD_CAST)
-DEF_ICON(MOD_MESHDEFORM)
-DEF_ICON(MOD_BEVEL)
-DEF_ICON(MOD_SMOOTH)
-DEF_ICON(MOD_SIMPLEDEFORM)
-DEF_ICON(MOD_MASK)
+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_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)
 
 	/* MODIFIERS */
-DEF_ICON(MOD_CLOTH)
-DEF_ICON(MOD_EXPLODE)
-DEF_ICON(MOD_FLUIDSIM)
-DEF_ICON(MOD_MULTIRES)
-DEF_ICON(MOD_SMOKE)
-DEF_ICON(MOD_SOLIDIFY)
-DEF_ICON(MOD_SCREW)
-DEF_ICON(MOD_VERTEX_WEIGHT)
-DEF_ICON(MOD_DYNAMICPAINT)
-DEF_ICON(MOD_REMESH)
-DEF_ICON(MOD_OCEAN)
-DEF_ICON(MOD_WARP)
-DEF_ICON(MOD_SKIN)
-DEF_ICON(MOD_TRIANGULATE)
-DEF_ICON(MOD_WIREFRAME)
-DEF_ICON(MOD_DATA_TRANSFER)
-DEF_ICON(MOD_NORMALEDIT)
+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_BLANK(169)
 DEF_ICON_BLANK(170)
 DEF_ICON_BLANK(171)
@@ -564,24 +562,24 @@ DEF_ICON_BLANK(176)
 DEF_ICON_BLANK(177)
 
 	/* ANIMATION */
-DEF_ICON_MONO(REC)
-DEF_ICON_MONO(PLAY)
-DEF_ICON_MONO(FF)
-DEF_ICON_MONO(REW)
-DEF_ICON_MONO(PAUSE)
-DEF_ICON_MONO(PREV_KEYFRAME)
-DEF_ICON_MONO(NEXT_KEYFRAME)
+DEF_ICON(REC)
+DEF_ICON(PLAY)
+DEF_ICON(FF)
+DEF_ICON(REW)
+DEF_ICON(PAUSE)
+DEF_ICON(PREV_KEYFRAME)
+DEF_ICON(NEXT_KEYFRAME)
 DEF_ICON_BLANK(185)
-DEF_ICON_MONO(PLAY_REVERSE)
+DEF_ICON(PLAY_REVERSE)
 DEF_ICON(PREVIEW_RANGE)
 DEF_ICON(ACTION_TWEAK)
 DEF_ICON(PMARKER_ACT)
 DEF_ICON(PMARKER_SEL)
-DEF_ICON(PMARKER)
+DEF_ICON_COLOR(PMARKER)
 DEF_ICON(MARKER_HLT)
 DEF_ICON(MARKER)
-DEF_ICON(SPACE2)	// XXX
-DEF_ICON(SPACE3)	// XXX
+DEF_ICON(KEYFRAME_HLT)
+DEF_ICON(KEYFRAME)
 DEF_ICON(KEYINGSET)
 DEF_ICON(KEY_DEHLT)
 DEF_ICON(KEY_HLT)
@@ -594,8 +592,8 @@ DEF_ICON(DRIVER)
 	/* ANIMATION */
 DEF_ICON(SOLO_OFF)
 DEF_ICON(SOLO_ON)
-DEF_ICON_MONO(FRAME_PREV)
-DEF_ICON_MONO(FRAME_NEXT)
+DEF_ICON(FRAME_PREV)
+DEF_ICON(FRAME_NEXT)
 DEF_ICON(NLA_PUSHDOWN)
 DEF_ICON(IPO_CONSTANT)
 DEF_ICON(IPO_LINEAR)
@@ -614,7 +612,6 @@ DEF_ICON(IPO_EASE_IN)
 DEF_ICON(IPO_EASE_OUT)
 DEF_ICON(IPO_EASE_IN_OUT)
 DEF_ICON(NORMALIZE_FCURVES)
-	/* available */
 DEF_ICON_BLANK(204)
 DEF_ICON_BLANK(205)
 DEF_ICON_BLANK(206)
@@ -624,14 +621,14 @@ DEF_ICON_BLANK(207)
 DEF_ICON(VERTEXSEL)
 DEF_ICON(EDGESEL)
 DEF_ICON(FACESEL)
-DEF_ICON(LOOPSEL)
+DEF_ICON_BLANK(209)
 DEF_ICON_BLANK(210)
-DEF_ICON(ROTATE)
-DEF_ICON(CURSOR)
-DEF_ICON(ROTATECOLLECTION)
-DEF_ICON(ROTATECENTER)
-DEF_ICON(ROTACTIVE)
-DEF_ICON(ALIGN)
+DEF_ICON(PIVOT_BOUNDBOX)
+DEF_ICON(PIVOT_CURSOR)
+DEF_ICON(PIVOT_INDIVIDUAL)
+DEF_ICON(PIVOT_MEDIAN)
+DEF_ICON(PIVOT_ACTIVE)
+DEF_ICON(CENTER_ONLY)
 DEF_ICON_BLANK(211)
 DEF_ICON(SMOOTHCURVE)
 DEF_ICON(SPHERECURVE)
@@ -649,10 +646,10 @@ DEF_ICON(PARTICLE_TIP)
 DEF_ICON(PARTICLE_PATH)
 
 	/* EDITING */
-DEF_ICON(MAN_TRANS)
-DEF_ICON(MAN_ROT)
-DEF_ICON(MAN_SCALE)
-DEF_ICON(MANIPUL)
+DEF_ICON_COLOR(MAN_TRANS)
+DEF_ICON_COLOR(MAN_ROT)
+DEF_ICON_COLOR(MAN_SCALE)
+DEF_ICON_COLOR(MANIPUL)
 DEF_ICON(SNAP_OFF)
 DEF_ICON(SNAP_ON)
 DEF_ICON(SNAP_NORMAL)
@@ -670,11 +667,11 @@ DEF_ICON(CLIPUV_HLT)
 DEF_ICON(SNAP_PEEL_OBJECT)
 DEF_ICON(GRID)
 DEF_ICON(OBJECT_ORIGIN)
-DEF_ICON_BLANK(222)
-DEF_ICON_BLANK(224)
-DEF_ICON_BLANK(225)
-DEF_ICON_BLANK(226)
-DEF_ICON_BLANK(226b)
+DEF_ICON(ORIENTATION_GLOBAL)
+DEF_ICON(ORIENTATION_GIMBAL)
+DEF_ICON(ORIENTATION_LOCAL)
+DEF_ICON(ORIENTATION_NORMAL)
+DEF_ICON(ORIENTATION_VIEW)
 
 	/* EDITING */
 DEF_ICON(PASTEDOWN)
@@ -685,10 +682,10 @@ DEF_ICON(VIS_SEL_11)
 DEF_ICON(VIS_SEL_10)
 DEF_ICON(VIS_SEL_01)
 DEF_ICON(VIS_SEL_00)
-DEF_ICON(SNAP_SURFACE)
+DEF_ICON_BLANK(231)
 DEF_ICON(AUTOMERGE_ON)
 DEF_ICON(AUTOMERGE_OFF)
-DEF_ICON(RETOPO)
+DEF_ICON_COLOR(RETOPO)
 DEF_ICON(UV_VERTEXSEL)
 DEF_ICON(UV_EDGESEL)
 DEF_ICON(UV_FACESEL)
@@ -700,18 +697,18 @@ DEF_ICON_BLANK(242)
 DEF_ICON_BLANK(243)
 DEF_ICON_BLANK(244)
 DEF_ICON_BLANK(245)
-DEF_ICON_BLANK(246)
-DEF_ICON_BLANK(247)
-DEF_ICON_BLANK(247b)
+DEF_ICON(NORMALS_VERTEX)
+DEF_ICON(NORMALS_VERTEX_FACE)
+DEF_ICON(NORMALS_FACE)
 
 	/* 3D VIEW */
-DEF_ICON(BBOX)
-DEF_ICON(WIRE)
-DEF_ICON(SOLID)
-DEF_ICON(SMOOTH)
-DEF_ICON(POTATO)
+DEF_ICON(SHADING_BBOX)
+DEF_ICON(SHADING_WIRE)
+DEF_ICON(SHADING_SOLID)
+DEF_ICON(SHADING_RENDERED)
+DEF_ICON(SHADING_TEXTURE)
 DEF_ICON(OVERLAY)
-DEF_ICON(ORTHO)
+DEF_ICON(XRAY)
 DEF_ICON_BLANK(249)
 DEF_ICON_BLANK(250)
 DEF_ICON(LOCKVIEW_OFF)
@@ -766,17 +763,17 @@ DEF_ICON(SORTTIME)
 DEF_ICON(SORTSIZE)
 DEF_ICON(LONGDISPLAY)
 DEF_ICON(SHORTDISPLAY)
-DEF_ICON(GHOST)
-DEF_ICON(IMGDISPLAY)
-DEF_ICON(SAVE_AS)
-DEF_ICON(SAVE_COPY)
+DEF_ICON_COLOR(GHOST)
+DEF_ICON_COLOR(IMGDISPLAY)
+DEF_ICON_BLANK(292)
+DEF_ICON_BLANK(293)
 DEF_ICON(BOOKMARKS)
 DEF_ICON(FONTPREVIEW)
 DEF_ICON(FILTER)
 DEF_ICON(NEWFOLDER)
 DEF_ICON(OPEN_RECENT)
-DEF_ICON_MONO(FILE_PARENT)
-DEF_ICON_MONO(FILE_REFRESH)
+DEF_ICON(FILE_PARENT)
+DEF_ICON(FILE_REFRESH)
 DEF_ICON(FILE_FOLDER)
 DEF_ICON(FILE_BLANK)
 DEF_ICON(FILE_BLEND)
@@ -788,29 +785,29 @@ DEF_ICON(FILE_FONT)
 DEF_ICON(FILE_TEXT)
 
 	/* FILE SELECT */
-DEF_ICON_MONO(RECOVER_AUTO)
-DEF_ICON_MONO(SAVE_PREFS)
-DEF_ICON_MONO(LINK_BLEND)
-DEF_ICON_MONO(APPEND_BLEND)
-DEF_ICON_MONO(IMPORT)
-DEF_ICON_MONO(EXPORT)
-DEF_ICON(EXTERNAL_DATA)
-DEF_ICON(LOAD_FACTORY)
+DEF_ICON(SORT_DESC)
+DEF_ICON(SORT_ASC)
+DEF_ICON(LINK_BLEND)
+DEF_ICON(APPEND_BLEND)
+DEF_ICON(IMPORT)
+DEF_ICON(EXPORT)
+DEF_ICON_COLOR(EXTERNAL_DATA)
+DEF_ICON_BLANK(299)
 DEF_ICON_BLANK(300)
 DEF_ICON_BLANK(301)
 DEF_ICON_BLANK(302)
 DEF_ICON_BLANK(303)
 DEF_ICON_BLANK(304)
-DEF_ICON_MONO(LOOP_BACK)
-DEF_ICON_MONO(LOOP_FORWARDS)
-DEF_ICON_MONO(BACK)
-DEF_ICON_MONO(FORWARD)
+DEF_ICON(LOOP_BACK)
+DEF_ICON(LOOP_FORWARDS)
+DEF_ICON(BACK)
+DEF_ICON(FORWARD)
 DEF_ICON_BLANK(309)
 DEF_ICON_BLANK(310)
 DEF_ICON_BLANK(311)
 DEF_ICON_BLANK(312)
-DEF_ICON_BLANK(313)
-DEF_ICON_BLANK(314)
+DEF_ICON(ALEMBIC)
+DEF_ICON(VOLUME)
 DEF_ICON(FILE_HIDDEN)
 DEF_ICON(FILE_BACKUP)
 DEF_ICON(DISK_DRIVE)
@@ -857,7 +854,7 @@ DEF_ICON(IMAGE_RGB)	// XXX CHANGE TO STRAIGHT ALPHA, Z ETC
 DEF_ICON(IMAGE_RGB_ALPHA)
 DEF_ICON(IMAGE_ALPHA)
 DEF_ICON(IMAGE_ZDEPTH)
-DEF_ICON(IMAGEFILE)
+DEF_ICON_COLOR(IMAGEFILE)
 DEF_ICON_BLANK(336)
 DEF_ICON_BLANK(337)
 DEF_ICON_BLANK(338)
@@ -873,88 +870,88 @@ DEF_ICON(VIEW_ZOOM)
 
 	/* brush icons */
 
-DEF_ICON(BRUSH_ADD)
-DEF_ICON(BRUSH_BLOB)
-DEF_ICON(BRUSH_BLUR)
-DEF_ICON(BRUSH_CLAY)
-DEF_ICON(BRUSH_CLAY_STRIPS)
-DEF_ICON(BRUSH_CLONE)
-DEF_ICON(BRUSH_CREASE)
-DEF_ICON(BRUSH_DARKEN)
-DEF_ICON(BRUSH_FILL)
-DEF_ICON(BRUSH_FLATTEN)
-DEF_ICON(BRUSH_GRAB)
-DEF_ICON(BRUSH_INFLATE)
-DEF_ICON(BRUSH_LAYER)
-DEF_ICON(BRUSH_LIGHTEN)
-DEF_ICON(BRUSH_MASK)
-DEF_ICON(BRUSH_MIX)
-DEF_ICON(BRUSH_MULTIPLY)
-DEF_ICON(BRUSH_NUDGE)
-DEF_ICON(BRUSH_PINCH)
-DEF_ICON(BRUSH_SCRAPE)
-DEF_ICON(BRUSH_SCULPT_DRAW)
-DEF_ICON(BRUSH_SMEAR)
-DEF_ICON(BRUSH_SMOOTH)
-DEF_ICON(BRUSH_SNAKE_HOOK)
-DEF_ICON(BRUSH_SOFTEN)
-DEF_ICON(BRUSH_SUBTRACT)
-DEF_ICON(BRUSH_TEXDRAW)
-DEF_ICON(BRUSH_TEXFILL)
-DEF_ICON(BRUSH_TEXMASK)
-DEF_ICON(BRUSH_THUMB)
-DEF_ICON(BRUSH_ROTATE)
-DEF_ICON(BRUSH_VERTEXDRAW)
+DEF_ICON_COLOR(BRUSH_ADD)
+DEF_ICON_COLOR(BRUSH_BLOB)
+DEF_ICON_COLOR(BRUSH_BLUR)
+DEF_ICON_COLOR(BRUSH_CLAY)
+DEF_ICON_COLOR(BRUSH_CLAY_STRIPS)
+DEF_ICON_COLOR(BRUSH_CLONE)
+DEF_ICON_COLOR(BRUSH_CREASE)
+DEF_ICON_COLOR(BRUSH_DARKEN)
+DEF_ICON_COLOR(BRUSH_FILL)
+DEF_ICON_COLOR(BRUSH_FLATTEN)
+DEF_ICON_COLOR(BRUSH_GRAB)
+DEF_ICON_COLOR(BRUSH_INFLATE)
+DEF_ICON_COLOR(BRUSH_LAYER)
+DEF_ICON_COLOR(BRUSH_LIGHTEN)
+DEF_ICON_COLOR(BRUSH_MASK)
+DEF_ICON_COLOR(BRUSH_MIX)
+DEF_ICON_COLOR(BRUSH_MULTIPLY)
+DEF_ICON_COLOR(BRUSH_NUDGE)
+DEF_ICON_COLOR(BRUSH_PINCH)
+DEF_ICON_COLOR(BRUSH_SCRAPE)
+DEF_ICON_COLOR(BRUSH_SCULPT_DRAW)
+DEF_ICON_COLOR(BRUSH_SMEAR)
+DEF_ICON_COLOR(BRUSH_SMOOTH)
+DEF_ICON_COLOR(BRUSH_SNAKE_HOOK)
+DEF_ICON_COLOR(BRUSH_SOFTEN)
+DEF_ICON_COLOR(BRUSH_SUBTRACT)
+DEF_ICON_COLOR(BRUSH_TEXDRAW)
+DEF_ICON_COLOR(BRUSH_TEXFILL)
+DEF_ICON_COLOR(BRUSH_TEXMASK)
+DEF_ICON_COLOR(BRUSH_THUMB)
+DEF_ICON_COLOR(BRUSH_ROTATE)
+DEF_ICON_COLOR(BRUSH_VERTEXDRAW)
 
 	/* Matcaps */
-DEF_ICON(MATCAP_01)
-DEF_ICON(MATCAP_02)
-DEF_ICON(MATCAP_03)
-DEF_ICON(MATCAP_04)
-DEF_ICON(MATCAP_05)
-DEF_ICON(MATCAP_06)
-DEF_ICON(MATCAP_07)
-DEF_ICON(MATCAP_08)
-DEF_ICON(MATCAP_09)
-DEF_ICON(MATCAP_10)
-DEF_ICON(MATCAP_11)
-DEF_ICON(MATCAP_12)
-DEF_ICON(MATCAP_13)
-DEF_ICON(MATCAP_14)
-DEF_ICON(MATCAP_15)
-DEF_ICON(MATCAP_16)
-DEF_ICON(MATCAP_17)
-DEF_ICON(MATCAP_18)
-DEF_ICON(MATCAP_19)
-DEF_ICON(MATCAP_20)
-DEF_ICON(MATCAP_21)
-DEF_ICON(MATCAP_22)
-DEF_ICON(MATCAP_23)
-DEF_ICON(MATCAP_24)
+DEF_ICON_COLOR(MATCAP_01)
+DEF_ICON_COLOR(MATCAP_02)
+DEF_ICON_COLOR(MATCAP_03)
+DEF_ICON_COLOR(MATCAP_04)
+DEF_ICON_COLOR(MATCAP_05)
+DEF_ICON_COLOR(MATCAP_06)
+DEF_ICON_COLOR(MATCAP_07)
+DEF_ICON_COLOR(MATCAP_08)
+DEF_ICON_COLOR(MATCAP_09)
+DEF_ICON_COLOR(MATCAP_10)
+DEF_ICON_COLOR(MATCAP_11)
+DEF_ICON_COLOR(MATCAP_12)
+DEF_ICON_COLOR(MATCAP_13)
+DEF_ICON_COLOR(MATCAP_14)
+DEF_ICON_COLOR(MATCAP_15)
+DEF_ICON_COLOR(MATCAP_16)
+DEF_ICON_COLOR(MATCAP_17)
+DEF_ICON_COLOR(MATCAP_18)
+DEF_ICON_COLOR(MATCAP_19)
+DEF_ICON_COLOR(MATCAP_20)
+DEF_ICON_COLOR(MATCAP_21)
+DEF_ICON_COLOR(MATCAP_22)
+DEF_ICON_COLOR(MATCAP_23)
+DEF_ICON_COLOR(MATCAP_24)
 
 /* grease pencil sculpt */
-DEF_ICON(GPBRUSH_SMOOTH)
-DEF_ICON(GPBRUSH_THICKNESS)
-DEF_ICON(GPBRUSH_STRENGTH)
-DEF_ICON(GPBRUSH_GRAB)
-DEF_ICON(GPBRUSH_PUSH)
-DEF_ICON(GPBRUSH_TWIST)
-DEF_ICON(GPBRUSH_PINCH)
-DEF_ICON(GPBRUSH_RANDOMIZE)
-DEF_ICON(GPBRUSH_CLONE)
-DEF_ICON(GPBRUSH_WEIGHT)
+DEF_ICON_COLOR(GPBRUSH_SMOOTH)
+DEF_ICON_COLOR(GPBRUSH_THICKNESS)
+DEF_ICON_COLOR(GPBRUSH_STRENGTH)
+DEF_ICON_COLOR(GPBRUSH_GRAB)
+DEF_ICON_COLOR(GPBRUSH_PUSH)
+DEF_ICON_COLOR(GPBRUSH_TWIST)
+DEF_ICON_COLOR(GPBRUSH_PINCH)
+DEF_ICON_COLOR(GPBRUSH_RANDOMIZE)
+DEF_ICON_COLOR(GPBRUSH_CLONE)
+DEF_ICON_COLOR(GPBRUSH_WEIGHT)
 
-DEF_ICON(GPBRUSH_PENCIL)
-DEF_ICON(GPBRUSH_PEN)
-DEF_ICON(GPBRUSH_INK)
-DEF_ICON(GPBRUSH_INKNOISE)
-DEF_ICON(GPBRUSH_BLOCK)
-DEF_ICON(GPBRUSH_MARKER)
-DEF_ICON(GPBRUSH_CUSTOM)
-DEF_ICON(GPBRUSH_FILL)
-DEF_ICON(GPBRUSH_ERASE_SOFT)
-DEF_ICON(GPBRUSH_ERASE_HARD)
-DEF_ICON(GPBRUSH_ERASE_STROKE)
+DEF_ICON_COLOR(GPBRUSH_PENCIL)
+DEF_ICON_COLOR(GPBRUSH_PEN)
+DEF_ICON_COLOR(GPBRUSH_INK)
+DEF_ICON_COLOR(GPBRUSH_INKNOISE)
+DEF_ICON_COLOR(GPBRUSH_BLOCK)
+DEF_ICON_COLOR(GPBRUSH_MARKER)
+DEF_ICON_COLOR(GPBRUSH_CUSTOM)
+DEF_ICON_COLOR(GPBRUSH_FILL)
+DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT)
+DEF_ICON_COLOR(GPBRUSH_ERASE_HARD)
+DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE)
 
 /* Vector Icons */
 DEF_ICON_VECTOR(SMALL_TRI_RIGHT_VEC)
@@ -987,53 +984,53 @@ DEF_ICON_VECTOR(COLORSET_19_VEC)
 DEF_ICON_VECTOR(COLORSET_20_VEC)
 
 /* Events  */
-DEF_ICON(EVENT_A)
-DEF_ICON(EVENT_B)
-DEF_ICON(EVENT_C)
-DEF_ICON(EVENT_D)
-DEF_ICON(EVENT_E)
-DEF_ICON(EVENT_F)
-DEF_ICON(EVENT_G)
-DEF_ICON(EVENT_H)
-DEF_ICON(EVENT_I)
-DEF_ICON(EVENT_J)
-DEF_ICON(EVENT_K)
-DEF_ICON(EVENT_L)
-DEF_ICON(EVENT_M)
-DEF_ICON(EVENT_N)
-DEF_ICON(EVENT_O)
-DEF_ICON(EVENT_P)
-DEF_ICON(EVENT_Q)
-DEF_ICON(EVENT_R)
-DEF_ICON(EVENT_S)
-DEF_ICON(EVENT_T)
-DEF_ICON(EVENT_U)
-DEF_ICON(EVENT_V)
-DEF_ICON(EVENT_W)
-DEF_ICON(EVENT_X)
-DEF_ICON(EVENT_Y)
-DEF_ICON(EVENT_Z)
-DEF_ICON(EVENT_SHIFT)
-DEF_ICON(EVENT_CTRL)
-DEF_ICON(EVENT_ALT)
-DEF_ICON(EVENT_OS)
-DEF_ICON(EVENT_F1)
-DEF_ICON(EVENT_F2)
-DEF_ICON(EVENT_F3)
-DEF_ICON(EVENT_F4)
-DEF_ICON(EVENT_F5)
-DEF_ICON(EVENT_F6)
-DEF_ICON(EVENT_F7)
-DEF_ICON(EVENT_F8)
-DEF_ICON(EVENT_F9)
-DEF_ICON(EVENT_F10)
-DEF_ICON(EVENT_F11)
-DEF_ICON(EVENT_F12)
-DEF_ICON(EVENT_ESC)
-DEF_ICON(EVENT_TAB)
-DEF_ICON(EVENT_PAGEUP)
-DEF_ICON(EVENT_PAGEDOWN)
-DEF_ICON(EVENT_HOME)
-DEF_ICON(EVENT_END)
-DEF_ICON(EVENT_RETURN)
+DEF_ICON_COLOR(EVENT_A)
+DEF_ICON_COLOR(EVENT_B)
+DEF_ICON_COLOR(EVENT_C)
+DEF_ICON_COLOR(EVENT_D)
+DEF_ICON_COLOR(EVENT_E)
+DEF_ICON_COLOR(EVENT_F)
+DEF_ICON_COLOR(EVENT_G)
+DEF_ICON_COLOR(EVENT_H)
+DEF_ICON_COLOR(EVENT_I)
+DEF_ICON_COLOR(EVENT_J)
+DEF_ICON_COLOR(EVENT_K)
+DEF_ICON_COLOR(EVENT_L)
+DEF_ICON_COLOR(EVENT_M)
+DEF_ICON_COLOR(EVENT_N)
+DEF_ICON_COLOR(EVENT_O)
+DEF_ICON_COLOR(EVENT_P)
+DEF_ICON_COLOR(EVENT_Q)
+DEF_ICON_COLOR(EVENT_R)
+DEF_ICON_COLOR(EVENT_S)
+DEF_ICON_COLOR(EVENT_T)
+DEF_ICON_COLOR(EVENT_U)
+DEF_ICON_COLOR(EVENT_V)
+DEF_ICON_COLOR(EVENT_W)
+DEF_ICON_COLOR(EVENT_X)
+DEF_ICON_COLOR(EVENT_Y)
+DEF_ICON_COLOR(EVENT_Z)
+DEF_ICON_COLOR(EVENT_SHIFT)
+DEF_ICON_COLOR(EVENT_CTRL)
+DEF_ICON_COLOR(EVENT_ALT)
+DEF_ICON_COLOR(EVENT_OS)
+DEF_ICON_COLOR(EVENT_F1)
+DEF_ICON_COLOR(EVENT_F2)
+DEF_ICON_COLOR(EVENT_F3)
+DEF_ICON_COLOR(EVENT_F4)
+DEF_ICON_COLOR(EVENT_F5)
+DEF_ICON_COLOR(EVENT_F6)
+DEF_ICON_COLOR(EVENT_F7)
+DEF_ICON_COLOR(EVENT_F8)
+DEF_ICON_COLOR(EVENT_F9)
+DEF_ICON_COLOR(EVENT_F10)
+DEF_ICON_COLOR(EVENT_F11)
+DEF_ICON_COLOR(EVENT_F12)
+DEF_ICON_COLOR(EVENT_ESC)
+DEF_ICON_COLOR(EVENT_TAB)
+DEF_ICON_COLOR(EVENT_PAGEUP)
+DEF_ICON_COLOR(EVENT_PAGEDOWN)
+DEF_ICON_COLOR(EVENT_HOME)
+DEF_ICON_COLOR(EVENT_END)
+DEF_ICON_COLOR(EVENT_RETURN)
 /* add as needed. */
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 458b43231d9..6315a3daafa 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -36,7 +36,7 @@
 /* and add/replace include of UI_resources.h by UI_interface_icons.h */
 #define DEF_ICON(name) ICON_##name,
 #define DEF_ICON_VECTOR(name) ICON_##name,
-#define DEF_ICON_MONO(name) ICON_##name,
+#define DEF_ICON_COLOR(name) ICON_##name,
 #define DEF_ICON_BLANK(name) ICON_BLANK_##name,
 
 typedef enum {
@@ -49,7 +49,7 @@ typedef enum {
 
 #undef DEF_ICON
 #undef DEF_ICON_VECTOR
-#undef DEF_ICON_MONO
+#undef DEF_ICON_COLOR
 #undef DEF_ICON_BLANK
 
 /* use to denote intentionally unset theme color */
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 64f3a8a31d8..1737cd74c8a 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -104,7 +104,7 @@ typedef struct IconImage {
 typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha);
 
 #define ICON_TYPE_PREVIEW        0
-#define ICON_TYPE_TEXTURE        1
+#define ICON_TYPE_COLOR_TEXTURE  1
 #define ICON_TYPE_MONO_TEXTURE   2
 #define ICON_TYPE_BUFFER         3
 #define ICON_TYPE_VECTOR         4
@@ -156,14 +156,14 @@ static struct ListBase iconfilelist = {NULL, NULL};
 static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f};
 
 static const int icontypes[] = {
-#define DEF_ICON(name) ICON_TYPE_TEXTURE,
+#define DEF_ICON(name) ICON_TYPE_MONO_TEXTURE,
 #define DEF_ICON_VECTOR(name) ICON_TYPE_VECTOR,
-#define DEF_ICON_MONO(name) ICON_TYPE_MONO_TEXTURE,
+#define DEF_ICON_COLOR(name) ICON_TYPE_COLOR_TEXTURE,
 #define DEF_ICON_BLANK(name) ICON_TYPE_BLANK,
 #include "UI_icons.h"
 #undef DEF_ICON
 #undef DEF_ICON_VECTOR
-#undef DEF_ICON_MONO
+#undef DEF_ICON_COLOR
 #undef DEF_ICON_BLANK
 };
 
@@ -185,7 +185,7 @@ static DrawInfo *def_internal_icon(ImBuf *bbuf, int icon_id, int xofs, int yofs,
 	di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
 	di->type = type;
 
-	if (ELEM(type, ICON_TYPE_TEXTURE, ICON_TYPE_MONO_TEXTURE)) {
+	if (ELEM(type, ICON_TYPE_COLOR_TEXTURE, ICON_TYPE_MONO_TEXTURE)) {
 		di->data.texture.x = xofs;
 		di->data.texture.y = yofs;
 		di->data.texture.w = size;
@@ -742,7 +742,7 @@ static void init_internal_icons(void)
 			/* Row W has monochrome icons. */
 			for (x = 0; x < ICON_GRID_COLS; x++) {
 				int icontype = icontypes[y * ICON_GRID_COLS + x];
-				if (!ELEM(icontype, ICON_TYPE_TEXTURE, ICON_TYPE_MONO_TEXTURE)) {
+				if (!ELEM(icontype, ICON_TYPE_COLOR_TEXTURE, ICON_TYPE_MONO_TEXTURE)) {
 					continue;
 				}
 
@@ -1520,7 +1520,7 @@ static void icon_draw_size(
 		const short event_value = di->data.input.event_value;
 		icon_draw_rect_input(x, y, w, h, alpha, event_type, event_value);
 	}
-	else if (di->type == ICON_TYPE_TEXTURE) {
+	else if (di->type == ICON_TYPE_COLOR_TEXTURE) {
 		/* texture image use premul alpha for correct scaling */
 		icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y,
 		                  di->data.texture.w, di->data.texture.h, alpha, rgb);
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 8612a14c308..cfc47e65a26 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -788,7 +788,7 @@ static uiBut *ui_item_with_label(
 		/* BUTTONS_OT_file_browse calls UI_context_active_but_prop_get_filebrowser */
 		uiDefIconButO(
 		        block, UI_BTYPE_BUT, subtype == PROP_DIRPATH ? "BUTTONS_OT_directory_browse" : "BUTTONS_OT_file_browse",
-		        WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL);
+		        WM_OP_INVOKE_DEFAULT, ICON_FILEBROWSER, x, y, UI_UNIT_X, h, NULL);
 	}
 	else if (flag & UI_ITEM_R_EVENT) {
 		but = uiDefButR_prop(block, UI_BTYPE_KEY_EVENT, 0, name, x, y, prop_but_width, h, ptr, prop, index, 0, 0, -1, -1, NULL);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 78322e1e1bc..67ab9aa7f44 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -623,13 +623,13 @@ static uiBut *template_id_def_new_but(
 
 	if (newop) {
 		but = uiDefIconTextButO(
-		        block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN,
+		        block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD,
 		        (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL);
 		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW));
 	}
 	else {
 		but = uiDefIconTextBut(
-		        block, but_type, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
+		        block, but_type, 0, ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
 		        0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL);
 		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW));
 	}
@@ -773,13 +773,13 @@ static void template_ID(
 
 		if (openop) {
 			but = uiDefIconTextButO(
-			        block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id) ? "" : IFACE_("Open"),
+			        block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILEBROWSER, (id) ? "" : IFACE_("Open"),
 			        0, 0, w, UI_UNIT_Y, NULL);
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_OPEN));
 		}
 		else {
 			but = uiDefIconTextBut(
-			        block, UI_BTYPE_BUT, 0, ICON_FILESEL, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y,
+			        block, UI_BTYPE_BUT, 0, ICON_FILEBROWSER, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y,
 			        NULL, 0, 0, 0, 0, NULL);
 			UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_OPEN));
 		}
@@ -1164,7 +1164,7 @@ static void template_search_buttons(
 
 	template_search_add_button_searchmenu(C, layout, block, template_search, editable, false);
 	template_search_add_button_name(block, &active_ptr, type);
-	template_search_add_button_operator(block, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, editable);
+	template_search_add_button_operator(block, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD, editable);
 	template_search_add_button_operator(block, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, editable);
 
 	UI_block_align_end(block);
@@ -1474,10 +1474,10 @@ static uiLayout *draw_modifier(
 			uiItemO(row, "", ICON_X, "OBJECT_OT_modifier_remove");
 		}
 		else if (modifier_is_simulation(md) == 1) {
-			uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PHYSICS");
+			uiItemStringO(row, "", ICON_PROPERTIES, "WM_OT_properties_context_change", "context", "PHYSICS");
 		}
 		else if (modifier_is_simulation(md) == 2) {
-			uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PARTICLES");
+			uiItemStringO(row, "", ICON_PROPERTIES, "WM_OT_properties_context_change", "context", "PARTICLES");
 		}
 		UI_block_emboss_set(block, UI_EMBOSS);
 	}
@@ -2039,7 +2039,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
 		/* enabled */
 		UI_block_emboss_set(block, UI_EMBOSS_NONE);
 		uiItemR(row, &ptr, "mute", 0, "",
-		        (con->flag & CONSTRAINT_OFF) ? ICON_HIDE_ON : ICON_HIDE_OFF);
+		        (con->flag & CONSTRAINT_OFF) ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF);
 		UI_block_emboss_set(block, UI_EMBOSS);
 
 		uiLayoutSetOperatorContext(row, WM_OP_INVOKE_DEFAULT);
@@ -2361,13 +2361,13 @@ static void colorband_buttons_layout(
 	row = uiLayoutRow(split, false);
 
 	bt = uiDefIconTextBut(
-	        block, UI_BTYPE_BUT, 0, ICON_ZOOMIN, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL,
+	        block, UI_BTYPE_BUT, 0, ICON_ADD, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL,
 	        0, 0, 0, 0, TIP_("Add a new color stop to the colorband"));
 
 	UI_but_funcN_set(bt, colorband_add_cb, MEM_dupallocN(cb), coba);
 
 	bt = uiDefIconTextBut(
-	        block, UI_BTYPE_BUT, 0, ICON_ZOOMOUT, "", xs +  2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
+	        block, UI_BTYPE_BUT, 0, ICON_REMOVE, "", xs +  2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y,
 	        NULL, 0, 0, 0, 0, TIP_("Delete the active position"));
 	UI_but_funcN_set(bt, colorband_del_cb, MEM_dupallocN(cb), coba);
 
@@ -3309,8 +3309,8 @@ void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname,
 
 	col = uiLayoutColumn(layout, true);
 	uiLayoutRow(col, true);
-	uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_add", WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
-	uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_delete", WM_OP_INVOKE_DEFAULT, ICON_ZOOMOUT, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
+	uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_add", WM_OP_INVOKE_DEFAULT, ICON_ADD, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
+	uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_delete", WM_OP_INVOKE_DEFAULT, ICON_REMOVE, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
 
 	col = uiLayoutColumn(layout, true);
 	uiLayoutRow(col, true);
@@ -3491,7 +3491,7 @@ static void uilist_draw_filter_default(struct uiList *ui_list, struct bContext *
 	subrow = uiLayoutRow(row, true);
 	uiItemR(subrow, &listptr, "use_filter_sort_alpha", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 	uiItemR(subrow, &listptr, "use_filter_sort_reverse", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "",
-	        (ui_list->filter_sort_flag & UILST_FLT_SORT_REVERSE) ? ICON_TRIA_UP : ICON_TRIA_DOWN);
+	        (ui_list->filter_sort_flag & UILST_FLT_SORT_REVERSE) ? ICON_SORT_DESC : ICON_SORT_ASC);
 }
 
 typedef struct {
@@ -4299,10 +4299,10 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs(
 		uiItemM(row, "WM_MT_operator_presets", NULL, ICON_NONE);
 
 		wmOperatorType *ot = WM_operatortype_find("WM_OT_operator_preset_add", false);
-		uiItemFullO_ptr(row, ot, "", ICON_ZOOMIN, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+		uiItemFullO_ptr(row, ot, "", ICON_ADD, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
 		RNA_string_set(&op_ptr, "operator", op->type->idname);
 
-		uiItemFullO_ptr(row, ot, "", ICON_ZOOMOUT, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
+		uiItemFullO_ptr(row, ot, "", ICON_REMOVE, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr);
 		RNA_string_set(&op_ptr, "operator", op->type->idname);
 		RNA_boolean_set(&op_ptr, "remove_active", true);
 	}
@@ -4481,7 +4481,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
 			owner = sa;
 		}
 		handle_event = B_STOPFILE;
-		icon = ICON_FILESEL;
+		icon = ICON_FILEBROWSER;
 	}
 	else {
 		Scene *scene;
@@ -4506,7 +4506,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
 				 */
 				if (sa->spacetype != SPACE_NODE) {
 					handle_event = B_STOPOTHER;
-					icon = ICON_IMAGE_COL;
+					icon = ICON_IMAGE;
 					break;
 				}
 			}
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index c893f106363..89eea4c1b64 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1993,7 +1993,7 @@ static void move_to_collection_menu_create(bContext *UNUSED(C), uiLayout *layout
 	uiItemFullO_ptr(layout,
 	                menu->ot,
 	                "New Collection",
-	                ICON_ZOOMIN,
+	                ICON_ADD,
 	                menu->ptr.data,
 	                WM_OP_INVOKE_DEFAULT,
 	                0,
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index de422565abd..958b55526c3 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -507,7 +507,7 @@ void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, Prope
 		uiBlock *block = uiLayoutGetBlock(layout);
 		uiBut *but;
 
-		but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_BUTS, 0, 0, UI_UNIT_X, UI_UNIT_Y,
+		but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_PROPERTIES, 0, 0, UI_UNIT_X, UI_UNIT_Y,
 		                   NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Show texture in texture tab"));
 		UI_but_func_set(but, template_texture_show, user->ptr.data, user->prop);
 	}
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 679ae6b9648..79b73f6ff52 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -221,13 +221,13 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 	/* Filename number increment / decrement buttons. */
 	if (fnumbuttons && (params->flag & FILE_DIRSEL_ONLY) == 0) {
 		UI_block_align_begin(block);
-		but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT,
+		but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_REMOVE,
 		                    min_x + line2_w + separator - chan_offs, line2_y,
 		                    btn_fn_w, btn_h,
 		                    TIP_("Decrement the filename number"));
 		RNA_int_set(UI_but_operator_ptr_get(but), "increment", -1);
 
-		but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN,
+		but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ADD,
 		                    min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y,
 		                    btn_fn_w, btn_h,
 		                    TIP_("Increment the filename number"));
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index c8b3b182b9c..ddb248f754d 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -874,7 +874,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, ID *id, FCurve *f
 		/* add driver variable - add blank */
 		row = uiLayoutRow(layout, true);
 		block = uiLayoutGetBlock(row);
-		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Input Variable"),
+		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ADD, IFACE_("Add Input Variable"),
 		                       0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
 		                       NULL, 0.0, 0.0, 0, 0,
 		                       TIP_("Add a Driver Variable to keep track an input used by the driver"));
@@ -888,7 +888,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, ID *id, FCurve *f
 		/* add driver variable */
 		row = uiLayoutRow(layout, false);
 		block = uiLayoutGetBlock(row);
-		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Input Variable"),
+		but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ADD, IFACE_("Add Input Variable"),
 		                       0, 0, 10 * UI_UNIT_X, UI_UNIT_Y,
 		                       NULL, 0.0, 0.0, 0, 0,
 		                       TIP_("Driver variables ensure that all dependencies will be accounted for, eusuring that drivers will update correctly"));
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index b9f49d0aeae..fa2fc44645a 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1786,7 +1786,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
 
 	uiItemS(layout);
 
-	uiItemO(layout, IFACE_("Add Input"), ICON_ZOOMIN, "NODE_OT_output_file_add_socket");
+	uiItemO(layout, IFACE_("Add Input"), ICON_ADD, "NODE_OT_output_file_add_socket");
 
 	row = uiLayoutRow(layout, false);
 	col = uiLayoutColumn(row, true);
@@ -2495,8 +2495,8 @@ static void node_composit_buts_cryptomatte(uiLayout *layout, bContext *UNUSED(C)
 
 static void node_composit_buts_cryptomatte_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *UNUSED(ptr))
 {
-	uiItemO(layout, IFACE_("Add Crypto Layer"), ICON_ZOOMIN, "NODE_OT_cryptomatte_layer_add");
-	uiItemO(layout, IFACE_("Remove Crypto Layer"), ICON_ZOOMOUT, "NODE_OT_cryptomatte_layer_remove");
+	uiItemO(layout, IFACE_("Add Crypto Layer"), ICON_ADD, "NODE_OT_cryptomatte_layer_add");
+	uiItemO(layout, IFACE_("Remove Crypto Layer"), ICON_REMOVE, "NODE_OT_cryptomatte_layer_remove");
 }
 
 static void node_composit_buts_brightcontrast(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -3007,9 +3007,9 @@ void ED_node_init_butfuncs(void)
 	NODE_TYPES_END
 
 	/* tree type icons */
-	ntreeType_Composite->ui_icon = ICON_RENDERLAYERS;
-	ntreeType_Shader->ui_icon = ICON_MATERIAL;
-	ntreeType_Texture->ui_icon = ICON_TEXTURE;
+	ntreeType_Composite->ui_icon = ICON_NODE_COMPOSITING;
+	ntreeType_Shader->ui_icon = ICON_NODE_MATERIAL;
+	ntreeType_Texture->ui_icon = ICON_NODE_TEXTURE;
 }
 
 void ED_init_custom_node_type(bNodeType *ntype)
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index f95081da4a5..3bf85dd7e57 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1143,7 +1143,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
 				else if (te->idcode == SEQ_TYPE_SOUND_RAM)
 					data.icon = ICON_SOUND;
 				else if (te->idcode == SEQ_TYPE_IMAGE)
-					data.icon = ICON_IMAGE_COL;
+					data.icon = ICON_IMAGE;
 				else
 					data.icon = ICON_PARTICLES;
 				break;
@@ -1226,6 +1226,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
 					if (ob->dup_group) {
 						data.icon = ICON_OUTLINER_OB_GROUP_INSTANCE;
 					}
+					else if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
+						data.icon = ICON_OUTLINER_OB_IMAGE;
+					}
 					else {
 						data.icon = ICON_OUTLINER_OB_EMPTY;
 					}
@@ -1328,7 +1331,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
 					data.icon = ICON_BRUSH_DATA; break;
 				case ID_SCR:
 				case ID_WS:
-					data.icon = ICON_SPLITSCREEN; break;
+					data.icon = ICON_WORKSPACE; break;
 				default:
 					break;
 			}