UI: icon set updates Andrzej Ambroz, and various fixes.

* Text editor word wrap, line numbers & syntax toggles now use consistent icons
  that don’t change when you enable or disable them.
* Replaced icon toggle buttons in the snapping popover with normal checkboxes
  and descriptive text labels. This makes it clearer which item is the main
  radio button, is more consistent with other popovers, and allows us to use
  more descriptive text.
* Added correct icons for grease pencil add menu.
* Added bespoke icons for grease pencil modifiers.
* Added icon for particle instance modifier.
* Added icon for fake user on & off states.
* Added correct icons for enabling/disabling modifiers in the dopesheet &
  f-curve editor.
* Made it so the restrict viewport & restrict render toggles for modifier
  update correctly when enabled or disabled, by flipping the order in the
  icon sheet. This also required changing the outliner to match.
* Removed the few old remaining icons in the old style and made sure to replace
  the last places where they were used.
* Updated many icons to be clearer & more consistent.

1 files changed, 168 insertions, 168 deletions

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index c005d6dcc07..b5e910a650a 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -71,15 +71,15 @@ DEF_ICON(GRIP)
 DEF_ICON(DOT)
 DEF_ICON(COLLAPSEMENU)
 DEF_ICON(X)
-DEF_ICON_BLANK(5)  /* XXX 'DOWNARROW' icon! */
-DEF_ICON_COLOR(GO_LEFT)
-DEF_ICON_COLOR(PLUG)
-DEF_ICON_COLOR(UI)
+DEF_ICON_BLANK(74)
+DEF_ICON_BLANK(75)
+DEF_ICON_BLANK(76)
+DEF_ICON_BLANK(77)
 DEF_ICON(NODE)
 DEF_ICON(NODE_SEL)
 
 	/* ui */
-DEF_ICON_COLOR(FULLSCREEN)
+DEF_ICON_BLANK(FULLSCREEN)
 DEF_ICON(WORKSPACE)
 DEF_ICON(RIGHTARROW_THIN)
 DEF_ICON(BORDERMOVE)
@@ -89,7 +89,7 @@ DEF_ICON(REMOVE)
 DEF_ICON(PANEL_CLOSE)
 DEF_ICON_COLOR(COPY_ID)
 DEF_ICON(EYEDROPPER)
-DEF_ICON_COLOR(LINK_AREA)
+DEF_ICON_BLANK(92)
 DEF_ICON(AUTO)
 DEF_ICON(CHECKBOX_DEHLT) /* de-Hilight - Checkbox OFF */
 DEF_ICON(CHECKBOX_HLT) /* Hilight - Checkbox ON */
@@ -100,27 +100,27 @@ 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_COLOR(PLUGIN)
+DEF_ICON_BLANK(103)
+DEF_ICON_BLANK(104)
+DEF_ICON_BLANK(105)
+DEF_ICON_BLANK(106)
+DEF_ICON(PLUGIN)
 
 	/* various ui */
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
 DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
-DEF_ICON(LINKED)
 DEF_ICON(UNLINKED)
+DEF_ICON(LINKED)
 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_BLANK(121)
+DEF_ICON_BLANK(122)
+DEF_ICON_BLANK(123)
 DEF_ICON(FREEZE)
 DEF_ICON(STYLUS_PRESSURE)
 DEF_ICON(GHOST_DISABLED)
@@ -129,10 +129,10 @@ DEF_ICON(FILE_TICK)
 DEF_ICON(QUIT)
 DEF_ICON(URL)
 DEF_ICON(RECOVER_LAST)
-DEF_ICON(30)
+DEF_ICON(THREE_DOTS)
 DEF_ICON(FULLSCREEN_ENTER)
 DEF_ICON(FULLSCREEN_EXIT)
-DEF_ICON_BLANK(33)
+DEF_ICON_BLANK(135)
 
 	/* BUTTONS */
 DEF_ICON_SHADING(LIGHT)
@@ -141,26 +141,26 @@ DEF_ICON_SHADING(TEXTURE)
 DEF_ICON(ANIM)
 DEF_ICON_SHADING(WORLD)
 DEF_ICON(SCENE)
-DEF_ICON(EDIT)
-DEF_ICON(GAME)
-DEF_ICON(RADIO)
-DEF_ICON_COLOR(SCRIPT)
+DEF_ICON_BLANK(144)
+DEF_ICON_BLANK(145)
+DEF_ICON_BLANK(146)
+DEF_ICON(SCRIPT)
 DEF_ICON_MODIFIER(PARTICLES)
 DEF_ICON(PHYSICS)
 DEF_ICON(SPEAKER)
-DEF_ICON(TEXTURE_SHADED)
+DEF_ICON_BLANK(151)
 DEF_ICON(TOOL_SETTINGS)
 DEF_ICON(SHADERFX)
-DEF_ICON_BLANK(44)
-DEF_ICON_BLANK(45)
-DEF_ICON_BLANK(46)
-DEF_ICON_BLANK(47)
-DEF_ICON_BLANK(48)
-DEF_ICON_BLANK(49)
-DEF_ICON_BLANK(50)
-DEF_ICON_BLANK(51)
-DEF_ICON_BLANK(52)
-DEF_ICON_COLOR(BLANK1)    // Not actually blank - this is used all over the place
+DEF_ICON_BLANK(154)
+DEF_ICON_BLANK(155)
+DEF_ICON_BLANK(156)
+DEF_ICON_BLANK(157)
+DEF_ICON_BLANK(158)
+DEF_ICON_BLANK(159)
+DEF_ICON_BLANK(160)
+DEF_ICON(BLANK1) // Not actually blank - this is used all over the place
+DEF_ICON(FAKE_USER_OFF)
+DEF_ICON(FAKE_USER_ON)
 	/* EDITORS */
 DEF_ICON(VIEW3D)
 DEF_ICON(GRAPH)
@@ -171,23 +171,23 @@ DEF_ICON(IMAGE)
 DEF_ICON(INFO)
 DEF_ICON(SEQUENCE)
 DEF_ICON(TEXT)
-DEF_ICON_BLANK(62)
+DEF_ICON_BLANK(174)
 DEF_ICON(SOUND)
 DEF_ICON(ACTION)
 DEF_ICON(NLA)
 DEF_ICON(PREFERENCES)
 DEF_ICON(TIME)
 DEF_ICON(NODETREE)
-DEF_ICON(LOGIC)
+DEF_ICON_BLANK(181)
 DEF_ICON(CONSOLE)
-DEF_ICON_BLANK(54)
+DEF_ICON_BLANK(183)
 DEF_ICON(CLIP)
 DEF_ICON(ASSET_MANAGER)
 DEF_ICON(NODE_COMPOSITING)
 DEF_ICON(NODE_TEXTURE)
 DEF_ICON(NODE_MATERIAL)
-DEF_ICON_BLANK(60)
-DEF_ICON_BLANK(61)
+DEF_ICON_BLANK(189)
+DEF_ICON_BLANK(190)
 
 	/* MODES */
 DEF_ICON(OBJECT_DATAMODE)	// XXX fix this up
@@ -199,13 +199,13 @@ DEF_ICON(WPAINT_HLT)
 DEF_ICON(SCULPTMODE_HLT)
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
-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(202)
+DEF_ICON_BLANK(203)
+DEF_ICON_BLANK(204)
+DEF_ICON_BLANK(205)
+DEF_ICON_BLANK(206)
+DEF_ICON_BLANK(207)
+DEF_ICON_BLANK(208)
 DEF_ICON(TRACKING)
 DEF_ICON(TRACKING_BACKWARDS)
 DEF_ICON(TRACKING_FORWARDS)
@@ -238,12 +238,12 @@ DEF_ICON(ARMATURE_DATA)
 DEF_ICON(POSE_DATA)
 DEF_ICON(BONE_DATA)
 DEF_ICON_MODIFIER(CONSTRAINT)
-DEF_ICON_COLOR(SHAPEKEY_DATA)
+DEF_ICON(SHAPEKEY_DATA)
 DEF_ICON_MODIFIER(CONSTRAINT_BONE)
 DEF_ICON(CAMERA_STEREO)
 DEF_ICON(PACKAGE)
 DEF_ICON(UGLYPACKAGE)
-DEF_ICON_BLANK(79b)
+DEF_ICON_BLANK(246)
 
 	/* DATA */
 DEF_ICON_SHADING(BRUSH_DATA)
@@ -254,11 +254,11 @@ DEF_ICON(FONT_DATA)
 DEF_ICON(RENDER_RESULT)
 DEF_ICON(SURFACE_DATA)
 DEF_ICON(EMPTY_DATA)
-DEF_ICON_BLANK(88)
+DEF_ICON(PRESET)
 DEF_ICON(RENDER_ANIMATION)
 DEF_ICON(RENDER_STILL)
 DEF_ICON(LIBRARY_DATA_BROKEN)
-DEF_ICON_COLOR(BOIDS)
+DEF_ICON(BOIDS)
 DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
@@ -269,7 +269,7 @@ DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
 DEF_ICON(GROUP_UVS)
 DEF_ICON(FACE_MAPS)
-DEF_ICON_BLANK(90)
+DEF_ICON_BLANK(272)
 DEF_ICON(RNA)
 DEF_ICON(RNA_ADD)
 
@@ -281,21 +281,21 @@ 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(PRESET)
-DEF_ICON_BLANK(101)
+DEF_ICON_BLANK(284)
+DEF_ICON_BLANK(285)
+DEF_ICON_BLANK(286)
 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_LIBRARY_OVERRIDE)
 DEF_ICON(DECORATE_UNLOCKED)
 DEF_ICON(DECORATE_LOCKED)
-DEF_ICON_BLANK(110)
+DEF_ICON(DECORATE_OVERRIDE)
 DEF_ICON_BLANK(111)
-DEF_ICON_BLANK(112)
-DEF_ICON(FAKE_USER)
+DEF_ICON(SEALED)
+DEF_ICON(HEART)
 DEF_ICON(ORPHAN_DATA)
 DEF_ICON(USER)
 DEF_ICON(SYSTEM)
@@ -318,7 +318,7 @@ DEF_ICON_OBJECT(OUTLINER_OB_GROUP_INSTANCE)
 DEF_ICON_OBJECT(OUTLINER_OB_GREASEPENCIL)
 DEF_ICON_OBJECT(OUTLINER_OB_LIGHTPROBE)
 DEF_ICON_OBJECT(OUTLINER_OB_IMAGE)
-DEF_ICON_BLANK(125)
+DEF_ICON_BLANK(321)
 DEF_ICON(RESTRICT_COLOR_OFF)
 DEF_ICON(RESTRICT_COLOR_ON)
 DEF_ICON(HIDE_OFF)
@@ -327,10 +327,10 @@ DEF_ICON(RESTRICT_SELECT_OFF)
 DEF_ICON(RESTRICT_SELECT_ON)
 DEF_ICON(RESTRICT_RENDER_OFF)
 DEF_ICON(RESTRICT_RENDER_ON)
-DEF_ICON_BLANK(127b)
+DEF_ICON_BLANK(330)
 
 	/* OUTLINER */
-DEF_ICON_BLANK(128)
+DEF_ICON_OBJECT_DATA(OUTLINER_DATA_EMPTY)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_MESH)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CURVE)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_LATTICE)
@@ -342,20 +342,20 @@ DEF_ICON_OBJECT_DATA(OUTLINER_DATA_FONT)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SURFACE)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SPEAKER)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_POSE)
-DEF_ICON_BLANK(130)
+DEF_ICON_BLANK(345)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GREASEPENCIL)
 DEF_ICON(GP_SELECT_POINTS)
 DEF_ICON(GP_SELECT_STROKES)
 DEF_ICON(GP_MULTIFRAME_EDITING)
 DEF_ICON(GP_ONLY_SELECTED)
-DEF_ICON_BLANK(136)
-DEF_ICON_BLANK(137)
-DEF_ICON_BLANK(138)
+DEF_ICON_BLANK(351)
+DEF_ICON(MODIFIER_OFF)
+DEF_ICON(MODIFIER_ON)
 DEF_ICON(ONIONSKIN_OFF)
 DEF_ICON(ONIONSKIN_ON)
 DEF_ICON(RESTRICT_VIEW_OFF)
 DEF_ICON(RESTRICT_VIEW_ON)
-DEF_ICON_BLANK(142b)
+DEF_ICON_BLANK(353)
 
 	/* PRIMITIVES */
 DEF_ICON(MESH_PLANE)
@@ -369,15 +369,15 @@ DEF_ICON(MESH_CYLINDER)
 DEF_ICON(MESH_TORUS)
 DEF_ICON(MESH_CONE)
 DEF_ICON(MESH_CAPSULE)
-DEF_ICON_BLANK(611)
+DEF_ICON_BLANK(372)
 DEF_ICON_SHADING(LIGHT_POINT)
 DEF_ICON_SHADING(LIGHT_SUN)
 DEF_ICON_SHADING(LIGHT_SPOT)
 DEF_ICON_SHADING(LIGHT_HEMI)
 DEF_ICON_SHADING(LIGHT_AREA)
-DEF_ICON_BLANK(617)
-DEF_ICON_BLANK(618)
-DEF_ICON_COLOR(META_EMPTY)
+DEF_ICON_BLANK(278)
+DEF_ICON_BLANK(379)
+DEF_ICON(META_EMPTY)
 DEF_ICON(META_PLANE)
 DEF_ICON(META_CUBE)
 DEF_ICON(META_BALL)
@@ -394,7 +394,7 @@ DEF_ICON(SURFACE_NSPHERE)
 DEF_ICON(SURFACE_NTORUS)
 DEF_ICON(GP_EMPTY)
 DEF_ICON(GP_STROKE)
-DEF_ICON_BLANK(638)
+DEF_ICON_BLANK(397)
 DEF_ICON(CURVE_BEZCURVE)
 DEF_ICON(CURVE_BEZCIRCLE)
 DEF_ICON(CURVE_NCURVE)
@@ -403,8 +403,8 @@ DEF_ICON(CURVE_PATH)
 DEF_ICON_SHADING(LIGHTPROBE_CUBEMAP)
 DEF_ICON_SHADING(LIGHTPROBE_PLANAR)
 DEF_ICON_SHADING(LIGHTPROBE_GRID)
-DEF_ICON_BLANK(647)
-DEF_ICON_BLANK(648)
+DEF_ICON_BLANK(406)
+DEF_ICON_BLANK(407)
 DEF_ICON(COLOR_RED)
 DEF_ICON(COLOR_GREEN)
 DEF_ICON(COLOR_BLUE)
@@ -442,9 +442,9 @@ DEF_ICON_BLANK(684)
 DEF_ICON_BLANK(685)
 
 	/* EMPTY */
-DEF_ICON_COLOR(TEMPERATURE)  /* XXX 'Temperature' icon! */
-DEF_ICON_BLANK(691)  /* XXX 'Temperature' icon! */
-DEF_ICON_COLOR(GEAR)  /* XXX 'Gear' icon! */
+DEF_ICON_BLANK(445)
+DEF_ICON_BLANK(446)
+DEF_ICON_BLANK(447)
 DEF_ICON(NODE_INSERT_ON)
 DEF_ICON(NODE_INSERT_OFF)
 DEF_ICON(NODE_TOP)
@@ -498,32 +498,32 @@ DEF_ICON_BLANK(754)
 DEF_ICON_BLANK(755)
 
 	/* EMPTY */
-DEF_ICON_BLANK(760)
-DEF_ICON_BLANK(761)
-DEF_ICON_BLANK(762)
-DEF_ICON_BLANK(763)
-DEF_ICON_BLANK(764)
-DEF_ICON_BLANK(765)
-DEF_ICON_BLANK(766)
-DEF_ICON_BLANK(767)
-DEF_ICON_BLANK(768)
-DEF_ICON_BLANK(769)
-DEF_ICON_BLANK(770)
-DEF_ICON_BLANK(771)
-DEF_ICON_BLANK(772)
-DEF_ICON_BLANK(773)
-DEF_ICON_BLANK(774)
-DEF_ICON_BLANK(775)
-DEF_ICON_BLANK(776)
-DEF_ICON_BLANK(777)
-DEF_ICON_BLANK(778)
-DEF_ICON_BLANK(779)
-DEF_ICON_BLANK(780)
-DEF_ICON_BLANK(781)
-DEF_ICON_BLANK(782)
-DEF_ICON_BLANK(783)
-DEF_ICON_BLANK(784)
-DEF_ICON_BLANK(785)
+DEF_ICON_BLANK(501)
+DEF_ICON_BLANK(502)
+DEF_ICON_BLANK(503)
+DEF_ICON_BLANK(504)
+DEF_ICON_BLANK(505)
+DEF_ICON_BLANK(506)
+DEF_ICON_BLANK(507)
+DEF_ICON_BLANK(508)
+DEF_ICON_BLANK(509)
+DEF_ICON_BLANK(510)
+DEF_ICON_BLANK(511)
+DEF_ICON_BLANK(512)
+DEF_ICON_BLANK(513)
+DEF_ICON_BLANK(514)
+DEF_ICON_BLANK(515)
+DEF_ICON_BLANK(516)
+DEF_ICON_BLANK(517)
+DEF_ICON_BLANK(518)
+DEF_ICON_BLANK(519)
+DEF_ICON_BLANK(520)
+DEF_ICON_BLANK(521)
+DEF_ICON_BLANK(522)
+DEF_ICON_BLANK(523)
+DEF_ICON_BLANK(524)
+DEF_ICON_BLANK(525)
+DEF_ICON_BLANK(526)
 
 	/* MODIFIERS */
 DEF_ICON_MODIFIER(MODIFIER)
@@ -543,7 +543,7 @@ DEF_ICON_MODIFIER(MOD_UVPROJECT)
 DEF_ICON_MODIFIER(MOD_DISPLACE)
 DEF_ICON_MODIFIER(MOD_CURVE)
 DEF_ICON_MODIFIER(MOD_LATTICE)
-DEF_ICON_COLOR(CONSTRAINT_DATA)
+DEF_ICON_MODIFIER(MOD_TINT)
 DEF_ICON_MODIFIER(MOD_ARMATURE)
 DEF_ICON_MODIFIER(MOD_SHRINKWRAP)
 DEF_ICON_MODIFIER(MOD_CAST)
@@ -571,15 +571,15 @@ DEF_ICON_MODIFIER(MOD_TRIANGULATE)
 DEF_ICON_MODIFIER(MOD_WIREFRAME)
 DEF_ICON_MODIFIER(MOD_DATA_TRANSFER)
 DEF_ICON_MODIFIER(MOD_NORMALEDIT)
-DEF_ICON_BLANK(169)
-DEF_ICON_BLANK(170)
-DEF_ICON_BLANK(171)
-DEF_ICON_BLANK(172)
-DEF_ICON_BLANK(173)
-DEF_ICON_BLANK(174)
-DEF_ICON_BLANK(175)
-DEF_ICON_BLANK(176)
-DEF_ICON_BLANK(177)
+DEF_ICON_MODIFIER(MOD_PARTICLE_INSTANCE)
+DEF_ICON_MODIFIER(MOD_HUE_SATURATION)
+DEF_ICON_MODIFIER(MOD_NOISE)
+DEF_ICON_MODIFIER(MOD_OFFSET)
+DEF_ICON_MODIFIER(MOD_SIMPLIFY)
+DEF_ICON_MODIFIER(MOD_THICKNESS)
+DEF_ICON_MODIFIER(MOD_INSTANCE)
+DEF_ICON_MODIFIER(MOD_TIME)
+DEF_ICON_MODIFIER(MOD_OPACITY)
 
 	/* ANIMATION */
 DEF_ICON(REC)
@@ -595,7 +595,7 @@ DEF_ICON(PREVIEW_RANGE)
 DEF_ICON(ACTION_TWEAK)
 DEF_ICON(PMARKER_ACT)
 DEF_ICON(PMARKER_SEL)
-DEF_ICON_COLOR(PMARKER)
+DEF_ICON(PMARKER)
 DEF_ICON(MARKER_HLT)
 DEF_ICON(MARKER)
 DEF_ICON(KEYFRAME_HLT)
@@ -632,10 +632,10 @@ DEF_ICON(IPO_EASE_IN)
 DEF_ICON(IPO_EASE_OUT)
 DEF_ICON(IPO_EASE_IN_OUT)
 DEF_ICON(NORMALIZE_FCURVES)
-DEF_ICON_BLANK(204)
-DEF_ICON_BLANK(205)
-DEF_ICON_BLANK(206)
-DEF_ICON_BLANK(207)
+DEF_ICON_BLANK(635)
+DEF_ICON_BLANK(636)
+DEF_ICON_BLANK(637)
+DEF_ICON_BLANK(638)
 
 	/* EDITING */
 DEF_ICON(VERTEXSEL)
@@ -649,7 +649,7 @@ DEF_ICON(PIVOT_INDIVIDUAL)
 DEF_ICON(PIVOT_MEDIAN)
 DEF_ICON(PIVOT_ACTIVE)
 DEF_ICON(CENTER_ONLY)
-DEF_ICON_BLANK(211)
+DEF_ICON_BLANK(652)
 DEF_ICON(SMOOTHCURVE)
 DEF_ICON(SPHERECURVE)
 DEF_ICON(ROOTCURVE)
@@ -666,10 +666,10 @@ DEF_ICON(PARTICLE_TIP)
 DEF_ICON(PARTICLE_PATH)
 
 	/* EDITING */
-DEF_ICON_COLOR(MAN_TRANS)
-DEF_ICON_COLOR(MAN_ROT)
-DEF_ICON_COLOR(MAN_SCALE)
-DEF_ICON_COLOR(MANIPUL)
+DEF_ICON_BLANK(669)
+DEF_ICON_BLANK(670)
+DEF_ICON_BLANK(671)
+DEF_ICON_BLANK(672)
 DEF_ICON(SNAP_OFF)
 DEF_ICON(SNAP_ON)
 DEF_ICON(SNAP_NORMAL)
@@ -705,7 +705,7 @@ DEF_ICON(VIS_SEL_00)
 DEF_ICON_BLANK(231)
 DEF_ICON(AUTOMERGE_ON)
 DEF_ICON(AUTOMERGE_OFF)
-DEF_ICON_COLOR(RETOPO)
+DEF_ICON_BLANK(234)
 DEF_ICON(UV_VERTEXSEL)
 DEF_ICON(UV_EDGESEL)
 DEF_ICON(UV_FACESEL)
@@ -763,18 +763,18 @@ DEF_ICON_BLANK(268)
 DEF_ICON_BLANK(269)
 DEF_ICON_BLANK(270)
 DEF_ICON_BLANK(271)
-DEF_ICON_BLANK(272)
-DEF_ICON_BLANK(273)
+DEF_ICON_BLANK(766)
+DEF_ICON_BLANK(767)
 DEF_ICON_BLANK(274)
 DEF_ICON_BLANK(275)
 DEF_ICON_BLANK(276)
 DEF_ICON_BLANK(277)
-DEF_ICON_BLANK(278)
-DEF_ICON_BLANK(279)
-DEF_ICON_BLANK(280)
-DEF_ICON_BLANK(281)
-DEF_ICON_BLANK(282)
-DEF_ICON_BLANK(282b)
+DEF_ICON_BLANK(772)
+DEF_ICON_BLANK(773)
+DEF_ICON_BLANK(774)
+DEF_ICON_BLANK(775)
+DEF_ICON_BLANK(776)
+DEF_ICON_BLANK(777)
 
 	/* FILE SELECT */
 DEF_ICON(SORTALPHA)
@@ -783,15 +783,15 @@ DEF_ICON(SORTTIME)
 DEF_ICON(SORTSIZE)
 DEF_ICON(SHORTDISPLAY)
 DEF_ICON(LONGDISPLAY)
-DEF_ICON_COLOR(GHOST)
-DEF_ICON_COLOR(IMGDISPLAY)
-DEF_ICON_BLANK(292)
-DEF_ICON_BLANK(293)
+DEF_ICON_BLANK(786)
+DEF_ICON(IMGDISPLAY)
+DEF_ICON_BLANK(788)
+DEF_ICON_BLANK(789)
 DEF_ICON(BOOKMARKS)
 DEF_ICON(FONTPREVIEW)
 DEF_ICON(FILTER)
 DEF_ICON(NEWFOLDER)
-DEF_ICON(OPEN_RECENT)
+DEF_ICON_BLANK(794)
 DEF_ICON(FILE_PARENT)
 DEF_ICON(FILE_REFRESH)
 DEF_ICON(FILE_FOLDER)
@@ -811,21 +811,21 @@ 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_BLANK(814)
+DEF_ICON_BLANK(815)
+DEF_ICON_BLANK(816)
+DEF_ICON_BLANK(817)
+DEF_ICON_BLANK(818)
+DEF_ICON_BLANK(819)
+DEF_ICON_BLANK(820)
 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(825)
+DEF_ICON_BLANK(826)
+DEF_ICON_BLANK(827)
+DEF_ICON_BLANK(828)
 DEF_ICON(ALEMBIC)
 DEF_ICON(VOLUME)
 DEF_ICON(FILE_HIDDEN)
@@ -841,24 +841,24 @@ DEF_ICON(HAIR)
 DEF_ICON(ALIASED)
 DEF_ICON(ANTIALIASED)
 DEF_ICON(MAT_SPHERE_SKY)
-DEF_ICON_BLANK(319)
-DEF_ICON_BLANK(320)
-DEF_ICON_BLANK(321)
-DEF_ICON_BLANK(322)
+DEF_ICON(MATSHADERBALL)
+DEF_ICON(MATCLOTH)
+DEF_ICON(MATFLUID)
+DEF_ICON_BLANK(847)
 DEF_ICON(WORDWRAP_OFF)
 DEF_ICON(WORDWRAP_ON)
 DEF_ICON(SYNTAX_OFF)
 DEF_ICON(SYNTAX_ON)
 DEF_ICON(LINENUMBERS_OFF)
 DEF_ICON(LINENUMBERS_ON)
-DEF_ICON(SCRIPTPLUGINS)		// XXX CREATE NEW
-DEF_ICON_BLANK(323)
-DEF_ICON_BLANK(324)
-DEF_ICON_BLANK(325)
-DEF_ICON_BLANK(326)
-DEF_ICON_BLANK(327)
-DEF_ICON_BLANK(328)
-DEF_ICON_BLANK(328b)
+DEF_ICON(SCRIPTPLUGINS)
+DEF_ICON_BLANK(855)
+DEF_ICON_BLANK(856)
+DEF_ICON_BLANK(857)
+DEF_ICON_BLANK(858)
+DEF_ICON_BLANK(859)
+DEF_ICON_BLANK(860)
+DEF_ICON_BLANK(861)
 
 	/* SEQUENCE / IMAGE EDITOR */
 DEF_ICON(SEQ_SEQUENCER)
@@ -867,21 +867,21 @@ DEF_ICON(SEQ_LUMA_WAVEFORM)
 DEF_ICON(SEQ_CHROMA_SCOPE)
 DEF_ICON(SEQ_HISTOGRAM)
 DEF_ICON(SEQ_SPLITVIEW)
-DEF_ICON_BLANK(331)
-DEF_ICON_BLANK(332)
-DEF_ICON_BLANK(333)
+DEF_ICON_BLANK(870)
+DEF_ICON_BLANK(871)
+DEF_ICON_BLANK(872)
 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_COLOR(IMAGEFILE)
-DEF_ICON_BLANK(336)
-DEF_ICON_BLANK(337)
-DEF_ICON_BLANK(338)
-DEF_ICON_BLANK(339)
-DEF_ICON_BLANK(340)
-DEF_ICON_BLANK(341)
-DEF_ICON_BLANK(342)
+DEF_ICON_BLANK(877)
+DEF_ICON_BLANK(878)
+DEF_ICON_BLANK(879)
+DEF_ICON_BLANK(880)
+DEF_ICON_BLANK(881)
+DEF_ICON_BLANK(882)
+DEF_ICON_BLANK(883)
+DEF_ICON_BLANK(884)
 DEF_ICON(VIEW_PERSPECTIVE)
 DEF_ICON(VIEW_ORTHO)
 DEF_ICON(VIEW_CAMERA)