diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh
index 00334000a31..b40abc3e478 100644
--- a/source/blender/editors/include/UI_icons.hh
+++ b/source/blender/editors/include/UI_icons.hh
@@ -37,11 +37,59 @@
 #  define DEF_ICON_FUND DEF_ICON
 #endif
 
-/* ICON_ prefix added */
+/* ICON_NONE has to be the first item here because it is hard-coded in places as 0. */
 DEF_ICON(NONE)
+
+/* Blank is no real icon, but used as placeholder or spacers,
+ * it takes the space of an icon but is empty. */
+DEF_ICON(BLANK1)
+
+/* Keep the order among the pairs because these icons
+ * are used for toggles that require a consecutive order. */
+/* TOGGLES */
+DEF_ICON(AUTOMERGE_OFF)
+DEF_ICON(AUTOMERGE_ON)
+DEF_ICON(CHECKBOX_DEHLT) /* de-Highlight - Checkbox OFF */
+DEF_ICON(CHECKBOX_HLT)   /* Highlight - Checkbox ON */
+DEF_ICON(CLIPUV_DEHLT)
+DEF_ICON(CLIPUV_HLT)
+DEF_ICON(DECORATE_UNLOCKED)
+DEF_ICON(DECORATE_LOCKED)
+DEF_ICON(FAKE_USER_OFF)
+DEF_ICON(FAKE_USER_ON)
+DEF_ICON(HIDE_ON)
+DEF_ICON(HIDE_OFF)
+DEF_ICON(INDIRECT_ONLY_OFF)
+DEF_ICON(INDIRECT_ONLY_ON)
+DEF_ICON(ONIONSKIN_OFF)
+DEF_ICON(ONIONSKIN_ON)
+DEF_ICON(UNPINNED)
+DEF_ICON(PINNED)
+DEF_ICON(RADIOBUT_OFF)
+DEF_ICON(RADIOBUT_ON)
+DEF_ICON(RECORD_OFF)
+DEF_ICON_COLOR(RECORD_ON)
+DEF_ICON(RESTRICT_RENDER_ON)
+DEF_ICON(RESTRICT_RENDER_OFF)
+DEF_ICON(RESTRICT_SELECT_ON)
+DEF_ICON(RESTRICT_SELECT_OFF)
+DEF_ICON(RESTRICT_VIEW_ON)
+DEF_ICON(RESTRICT_VIEW_OFF)
+DEF_ICON(RIGHTARROW)
+DEF_ICON(DOWNARROW_HLT)
+DEF_ICON(SELECT_INTERSECT)
+DEF_ICON(SELECT_DIFFERENCE)
+DEF_ICON(SNAP_OFF)
+DEF_ICON(SNAP_ON)
+DEF_ICON(UNLOCKED)
+DEF_ICON(LOCKED)
+
+/* DIALOGS */
 DEF_ICON(QUESTION)
 DEF_ICON(ERROR)
 DEF_ICON(CANCEL)
+
+/* UI */
 DEF_ICON(TRIA_RIGHT)
 DEF_ICON(TRIA_DOWN)
 DEF_ICON(TRIA_LEFT)
@@ -50,8 +98,6 @@ 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(MENU_PANEL)
 DEF_ICON(BLENDER)
 DEF_ICON(GRIP)
@@ -64,8 +110,6 @@ DEF_ICON(COLLECTION_NEW)
 DEF_ICON(OPTIONS)
 DEF_ICON(NODE)
 DEF_ICON(NODE_SEL)
-
-/* ui */
 DEF_ICON(WINDOW)
 DEF_ICON(WORKSPACE)
 DEF_ICON(RIGHTARROW_THIN)
@@ -78,22 +122,13 @@ DEF_ICON(COPY_ID)
 DEF_ICON(EYEDROPPER)
 DEF_ICON(CHECKMARK)
 DEF_ICON(AUTO)
-DEF_ICON(CHECKBOX_DEHLT) /* de-Highlight - Checkbox OFF */
-DEF_ICON(CHECKBOX_HLT)   /* Highlight - Checkbox ON */
-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(FCURVE_SNAPSHOT)
 DEF_ICON(OBJECT_HIDDEN)
 DEF_ICON(TOPBAR)
 DEF_ICON(STATUSBAR)
 DEF_ICON(PLUGIN)
-
-/* various ui */
+DEF_ICON(PRESET_NEW)
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
 DEF_ICON(COLOR) /* see COLOR_RED/GREEN/BLUE */
@@ -121,7 +156,7 @@ DEF_ICON(FULLSCREEN_ENTER)
 DEF_ICON(FULLSCREEN_EXIT)
 DEF_ICON(BRUSHES_ALL)
 
-/* BUTTONS */
+/* PROPERTIES */
 DEF_ICON_SHADING(LIGHT)
 DEF_ICON_SHADING(MATERIAL)
 DEF_ICON_SHADING(TEXTURE)
@@ -136,11 +171,7 @@ DEF_ICON_OBJECT_DATA(SPEAKER)
 DEF_ICON_SCENE(TOOL_SETTINGS)
 DEF_ICON_MODIFIER(SHADERFX)
 DEF_ICON_MODIFIER(MODIFIER)
-DEF_ICON(RECORD_OFF)
-DEF_ICON_COLOR(RECORD_ON)
-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)
@@ -178,6 +209,8 @@ DEF_ICON(WPAINT_HLT)
 DEF_ICON(SCULPTMODE_HLT)
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
+
+/* TRACKING */
 DEF_ICON(TRACKING)
 DEF_ICON(TRACKING_BACKWARDS)
 DEF_ICON(TRACKING_FORWARDS)
@@ -187,6 +220,7 @@ DEF_ICON(TRACKING_CLEAR_BACKWARDS)
 DEF_ICON(TRACKING_CLEAR_FORWARDS)
 DEF_ICON(TRACKING_REFINE_BACKWARDS)
 DEF_ICON(TRACKING_REFINE_FORWARDS)
+DEF_ICON(TRACKER_DATA)
 
 /* DATA */
 DEF_ICON_SCENE(SCENE_DATA)
@@ -211,12 +245,6 @@ DEF_ICON_OBJECT_DATA(BONE_DATA)
 DEF_ICON_MODIFIER(CONSTRAINT)
 DEF_ICON_OBJECT_DATA(SHAPEKEY_DATA)
 DEF_ICON_MODIFIER(CONSTRAINT_BONE)
-DEF_ICON(CAMERA_STEREO)
-DEF_ICON(PACKAGE)
-DEF_ICON(UGLYPACKAGE)
-DEF_ICON(EXPERIMENTAL)
-
-/* DATA */
 DEF_ICON_SHADING(BRUSH_DATA)
 DEF_ICON_SHADING(IMAGE_DATA)
 DEF_ICON(FILE)
@@ -228,6 +256,7 @@ DEF_ICON_OBJECT_DATA(EMPTY_DATA)
 DEF_ICON(PRESET)
 DEF_ICON(RENDER_ANIMATION)
 DEF_ICON(RENDER_STILL)
+DEF_ICON(CAMERA_STEREO)
 DEF_ICON(LIBRARY_DATA_BROKEN)
 DEF_ICON(BOIDS)
 DEF_ICON(STRANDS)
@@ -241,8 +270,12 @@ DEF_ICON(GROUP_UVS)
 DEF_ICON(FACE_MAPS)
 DEF_ICON(RNA)
 DEF_ICON(RNA_ADD)
+DEF_ICON(PACKAGE)
+DEF_ICON(UGLYPACKAGE)
+DEF_ICON(ORPHAN_DATA)
 
-/* INPUT + DECORATOR */
+/* Careful, order is narrow to wide. */
+/* INPUT */
 DEF_ICON(MOUSE_LMB)
 DEF_ICON(MOUSE_MMB)
 DEF_ICON(MOUSE_RMB)
@@ -252,24 +285,15 @@ DEF_ICON(MOUSE_MOVE)
 DEF_ICON(MOUSE_LMB_DRAG)
 DEF_ICON(MOUSE_MMB_DRAG)
 DEF_ICON(MOUSE_RMB_DRAG)
-DEF_ICON(MEMORY)
-DEF_ICON(PRESET_NEW)
+
+/* DECORATE */
 DEF_ICON(DECORATE)
 DEF_ICON(DECORATE_KEYFRAME)
 DEF_ICON(DECORATE_ANIMATE)
 DEF_ICON(DECORATE_DRIVER)
 DEF_ICON(DECORATE_LINKED)
 DEF_ICON(DECORATE_LIBRARY_OVERRIDE)
-DEF_ICON(DECORATE_UNLOCKED)
-DEF_ICON(DECORATE_LOCKED)
 DEF_ICON(DECORATE_OVERRIDE)
-DEF_ICON_FUND(FUND)
-DEF_ICON(TRACKER_DATA)
-DEF_ICON(HEART)
-DEF_ICON(ORPHAN_DATA)
-DEF_ICON(USER)
-DEF_ICON(SYSTEM)
-DEF_ICON(SETTINGS)
 
 /* OUTLINER */
 DEF_ICON_OBJECT(OUTLINER_OB_EMPTY)
@@ -288,18 +312,9 @@ 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_COLLECTION(OUTLINER_COLLECTION)
-DEF_ICON(RESTRICT_COLOR_OFF)
-DEF_ICON(RESTRICT_COLOR_ON)
-DEF_ICON(HIDE_ON)
-DEF_ICON(HIDE_OFF)
-DEF_ICON(RESTRICT_SELECT_ON)
-DEF_ICON(RESTRICT_SELECT_OFF)
-DEF_ICON(RESTRICT_RENDER_ON)
-DEF_ICON(RESTRICT_RENDER_OFF)
-DEF_ICON(RESTRICT_INSTANCED_OFF)
-
-/* OUTLINER */
+DEF_ICON_OBJECT(OUTLINER_OB_CURVES)
+DEF_ICON_OBJECT(OUTLINER_OB_POINTCLOUD)
+DEF_ICON_OBJECT(OUTLINER_OB_VOLUME)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_EMPTY)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_MESH)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CURVE)
@@ -314,6 +329,18 @@ DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SPEAKER)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_LIGHTPROBE)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GP_LAYER)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GREASEPENCIL)
+DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CURVES)
+DEF_ICON_OBJECT_DATA(CURVES_DATA)
+DEF_ICON_OBJECT_DATA(OUTLINER_DATA_POINTCLOUD)
+DEF_ICON_OBJECT_DATA(POINTCLOUD_DATA)
+DEF_ICON_OBJECT_DATA(OUTLINER_DATA_VOLUME)
+DEF_ICON_OBJECT_DATA(VOLUME_DATA)
+DEF_ICON_OBJECT_DATA(POINTCLOUD_POINT)
+DEF_ICON_COLLECTION(OUTLINER_COLLECTION)
+DEF_ICON(RESTRICT_COLOR_OFF)
+DEF_ICON(RESTRICT_COLOR_ON)
+DEF_ICON(RESTRICT_INSTANCED_OFF)
+DEF_ICON(RESTRICT_INSTANCED_ON)
 DEF_ICON(GP_SELECT_POINTS)
 DEF_ICON(GP_SELECT_STROKES)
 DEF_ICON(GP_MULTIFRAME_EDITING)
@@ -321,13 +348,11 @@ DEF_ICON(GP_ONLY_SELECTED)
 DEF_ICON(GP_SELECT_BETWEEN_STROKES)
 DEF_ICON(MODIFIER_OFF)
 DEF_ICON(MODIFIER_ON)
-DEF_ICON(ONIONSKIN_OFF)
-DEF_ICON(ONIONSKIN_ON)
-DEF_ICON(RESTRICT_VIEW_ON)
-DEF_ICON(RESTRICT_VIEW_OFF)
-DEF_ICON(RESTRICT_INSTANCED_ON)
+DEF_ICON(HOLDOUT_OFF)
+DEF_ICON(HOLDOUT_ON)
 
 /* PRIMITIVES */
+DEF_ICON(MONKEY)
 DEF_ICON(MESH_PLANE)
 DEF_ICON(MESH_CUBE)
 DEF_ICON(MESH_CIRCLE)
@@ -353,8 +378,6 @@ DEF_ICON(META_CUBE)
 DEF_ICON(META_BALL)
 DEF_ICON(META_ELLIPSOID)
 DEF_ICON(META_CAPSULE)
-
-/* PRIMITIVES */
 DEF_ICON(SURFACE_NCURVE)
 DEF_ICON(SURFACE_NCIRCLE)
 DEF_ICON(SURFACE_NSURFACE)
@@ -369,6 +392,7 @@ DEF_ICON(CURVE_BEZCIRCLE)
 DEF_ICON(CURVE_NCURVE)
 DEF_ICON(CURVE_NCIRCLE)
 DEF_ICON(CURVE_PATH)
+DEF_ICON(CURVES)
 DEF_ICON_OBJECT_DATA(LIGHTPROBE_SPHERE)
 DEF_ICON_OBJECT_DATA(LIGHTPROBE_PLANE)
 DEF_ICON_OBJECT_DATA(LIGHTPROBE_VOLUME)
@@ -408,7 +432,7 @@ DEF_ICON(IMAGE_PLANE)
 DEF_ICON(IMAGE_BACKGROUND)
 DEF_ICON(IMAGE_REFERENCE)
 
-/* EMPTY */
+/* ALIGNMENT */
 DEF_ICON(NODE_INSERT_ON)
 DEF_ICON(NODE_INSERT_OFF)
 DEF_ICON(NODE_TOP)
@@ -419,13 +443,20 @@ DEF_ICON(ANCHOR_BOTTOM)
 DEF_ICON(ANCHOR_LEFT)
 DEF_ICON(ANCHOR_RIGHT)
 DEF_ICON(ANCHOR_CENTER)
+
+/* SELECTION */
 DEF_ICON(SELECT_SET)
 DEF_ICON(SELECT_EXTEND)
 DEF_ICON(SELECT_SUBTRACT)
-DEF_ICON(SELECT_INTERSECT)
-DEF_ICON(SELECT_DIFFERENCE)
 
-/* EMPTY */
+/* TEXT */
+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)
 DEF_ICON(ALIGN_LEFT)
 DEF_ICON(ALIGN_CENTER)
 DEF_ICON(ALIGN_RIGHT)
@@ -438,18 +469,9 @@ DEF_ICON(BOLD)
 DEF_ICON(ITALIC)
 DEF_ICON(UNDERLINE)
 DEF_ICON(SMALL_CAPS)
-DEF_ICON_MODIFIER(CON_ACTION)
-DEF_ICON_MODIFIER(MOD_ENVELOPE)
-DEF_ICON_MODIFIER(MOD_OUTLINE)
-DEF_ICON_MODIFIER(MOD_LENGTH)
-DEF_ICON_MODIFIER(MOD_DASH)
-DEF_ICON_MODIFIER(MOD_LINEART)
-DEF_ICON(HOLDOUT_OFF)
-DEF_ICON(HOLDOUT_ON)
-DEF_ICON(INDIRECT_ONLY_OFF)
-DEF_ICON(INDIRECT_ONLY_ON)
 
 /* CONSTRAINTS */
+DEF_ICON_MODIFIER(CON_ACTION)
 DEF_ICON_MODIFIER(CON_CAMERASOLVER)
 DEF_ICON_MODIFIER(CON_FOLLOWTRACK)
 DEF_ICON_MODIFIER(CON_OBJECTSOLVER)
@@ -504,8 +526,11 @@ DEF_ICON_MODIFIER(MOD_BEVEL)
 DEF_ICON_MODIFIER(MOD_SMOOTH)
 DEF_ICON_MODIFIER(MOD_SIMPLEDEFORM)
 DEF_ICON_MODIFIER(MOD_MASK)
-
-/* MODIFIERS */
+DEF_ICON_MODIFIER(MOD_ENVELOPE)
+DEF_ICON_MODIFIER(MOD_OUTLINE)
+DEF_ICON_MODIFIER(MOD_LENGTH)
+DEF_ICON_MODIFIER(MOD_DASH)
+DEF_ICON_MODIFIER(MOD_LINEART)
 DEF_ICON_MODIFIER(MOD_CLOTH)
 DEF_ICON_MODIFIER(MOD_EXPLODE)
 DEF_ICON_MODIFIER(MOD_FLUIDSIM)
@@ -558,8 +583,6 @@ DEF_ICON(KEY_HLT)
 DEF_ICON(MUTE_IPO_OFF)
 DEF_ICON(MUTE_IPO_ON)
 DEF_ICON(DRIVER)
-
-/* ANIMATION */
 DEF_ICON(ACTION_SLOT)
 DEF_ICON(SOLO_OFF)
 DEF_ICON(SOLO_ON)
@@ -584,12 +607,17 @@ DEF_ICON(IPO_EASE_OUT)
 DEF_ICON(IPO_EASE_IN_OUT)
 DEF_ICON(NORMALIZE_FCURVES)
 DEF_ICON(ORIENTATION_PARENT)
-DEF_ICON(FACE_CORNER)
+DEF_ICON(HANDLE_AUTOCLAMPED)
+DEF_ICON(HANDLE_AUTO)
+DEF_ICON(HANDLE_ALIGNED)
+DEF_ICON(HANDLE_VECTOR)
+DEF_ICON(HANDLE_FREE)
 
 /* EDITING */
 DEF_ICON(VERTEXSEL)
 DEF_ICON(EDGESEL)
 DEF_ICON(FACESEL)
+DEF_ICON(FACE_CORNER)
 DEF_ICON(CURSOR)
 DEF_ICON(PIVOT_BOUNDBOX)
 DEF_ICON(PIVOT_CURSOR)
@@ -613,13 +641,11 @@ DEF_ICON(PARTICLE_POINT)
 DEF_ICON(PARTICLE_TIP)
 DEF_ICON(PARTICLE_PATH)
 
-/* EDITING */
+/* SNAPPING */
 DEF_ICON(SNAP_FACE_NEAREST)
 DEF_ICON(SNAP_FACE_CENTER)
 DEF_ICON(SNAP_PERPENDICULAR)
 DEF_ICON(SNAP_MIDPOINT)
-DEF_ICON(SNAP_OFF)
-DEF_ICON(SNAP_ON)
 DEF_ICON(SNAP_NORMAL)
 DEF_ICON(SNAP_GRID)
 DEF_ICON(SNAP_VERTEX)
@@ -630,11 +656,9 @@ DEF_ICON(SNAP_INCREMENT)
 DEF_ICON(STICKY_UVS_LOC)
 DEF_ICON(STICKY_UVS_DISABLE)
 DEF_ICON(STICKY_UVS_VERT)
-DEF_ICON(CLIPUV_DEHLT)
-DEF_ICON(CLIPUV_HLT)
 DEF_ICON(SNAP_PEEL_OBJECT)
-DEF_ICON(GRID)
-DEF_ICON(OBJECT_ORIGIN)
+
+/* ORIENTATION  */
 DEF_ICON(ORIENTATION_GLOBAL)
 DEF_ICON(ORIENTATION_GIMBAL)
 DEF_ICON(ORIENTATION_LOCAL)
@@ -650,8 +674,6 @@ DEF_ICON(VIS_SEL_11)
 DEF_ICON(VIS_SEL_10)
 DEF_ICON(VIS_SEL_01)
 DEF_ICON(VIS_SEL_00)
-DEF_ICON(AUTOMERGE_OFF)
-DEF_ICON(AUTOMERGE_ON)
 DEF_ICON(UV_VERTEXSEL)
 DEF_ICON(UV_EDGESEL)
 DEF_ICON(UV_FACESEL)
@@ -666,6 +688,7 @@ DEF_ICON(ORIENTATION_CURSOR)
 DEF_ICON(NORMALS_VERTEX)
 DEF_ICON(NORMALS_FACE)
 DEF_ICON(NORMALS_VERTEX_FACE)
+DEF_ICON(OBJECT_ORIGIN)
 
 /* 3D VIEW */
 DEF_ICON(SHADING_BBOX)
@@ -682,26 +705,19 @@ DEF_ICON(AXIS_FRONT)
 DEF_ICON(AXIS_TOP)
 DEF_ICON(LAYER_USED)
 DEF_ICON(LAYER_ACTIVE)
+DEF_ICON(GRID)
 
-/* ADDITIONAL OBJECT TYPES */
-DEF_ICON_OBJECT(OUTLINER_OB_CURVES)
-DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CURVES)
-DEF_ICON_OBJECT_DATA(CURVES_DATA)
-DEF_ICON_OBJECT(OUTLINER_OB_POINTCLOUD)
-DEF_ICON_OBJECT_DATA(OUTLINER_DATA_POINTCLOUD)
-DEF_ICON_OBJECT_DATA(POINTCLOUD_DATA)
-DEF_ICON_OBJECT(OUTLINER_OB_VOLUME)
-DEF_ICON_OBJECT_DATA(OUTLINER_DATA_VOLUME)
-DEF_ICON_OBJECT_DATA(VOLUME_DATA)
-DEF_ICON_OBJECT_DATA(POINTCLOUD_POINT)
-DEF_ICON(INTERNET_OFFLINE)
-DEF_ICON(INTERNET)
-DEF_ICON(CURRENT_FILE)
-DEF_ICON(HOME)
-DEF_ICON(DOCUMENTS)
-DEF_ICON(TEMP)
+/* VIEW */
+DEF_ICON(VIEW_CAMERA_UNSELECTED)
+DEF_ICON(VIEW_UNLOCKED)
+DEF_ICON(VIEW_LOCKED)
+DEF_ICON(VIEW_PERSPECTIVE)
+DEF_ICON(VIEW_ORTHO)
+DEF_ICON(VIEW_CAMERA)
+DEF_ICON(VIEW_PAN)
+DEF_ICON(VIEW_ZOOM)
 
-/* FILE SELECT */
+/* FILE */
 DEF_ICON(SORTALPHA)
 DEF_ICON(SORTBYEXT)
 DEF_ICON(SORTTIME)
@@ -727,8 +743,6 @@ DEF_ICON(FILE_SOUND)
 DEF_ICON(FILE_FONT)
 DEF_ICON(FILE_TEXT)
 DEF_ICON_COLOR(FILE_ALIAS)
-
-/* FILE SELECT */
 DEF_ICON(SORT_DESC)
 DEF_ICON(SORT_ASC)
 DEF_ICON(LINK_BLEND)
@@ -746,32 +760,29 @@ DEF_ICON(FILE_3D)
 DEF_ICON(FILE_HIDDEN)
 DEF_ICON(FILE_BACKUP)
 DEF_ICON(DISK_DRIVE)
+DEF_ICON(SYSTEM)
+DEF_ICON(SETTINGS)
+DEF_ICON(DISC)
+DEF_ICON(DESKTOP)
+DEF_ICON(EXTERNAL_DRIVE)
+DEF_ICON(NETWORK_DRIVE)
+DEF_ICON(HOME)
+DEF_ICON(DOCUMENTS)
+DEF_ICON(TEMP)
+DEF_ICON(CURRENT_FILE)
 
-/* SHADING / TEXT */
+/* SHADING */
 DEF_ICON(MATPLANE)
 DEF_ICON(MATSPHERE)
 DEF_ICON(MATCUBE)
-DEF_ICON(MONKEY)
-DEF_ICON(CURVES)
 DEF_ICON(ALIASED)
 DEF_ICON(ANTIALIASED)
 DEF_ICON(MAT_SPHERE_SKY)
 DEF_ICON(MATSHADERBALL)
 DEF_ICON(MATCLOTH)
 DEF_ICON(MATFLUID)
-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)
-DEF_ICON(DISC)
-DEF_ICON(DESKTOP)
-DEF_ICON(EXTERNAL_DRIVE)
-DEF_ICON(NETWORK_DRIVE)
 
-/* SEQUENCE / IMAGE EDITOR */
+/* SEQUENCER */
 DEF_ICON(SEQ_SEQUENCER)
 DEF_ICON(SEQ_PREVIEW)
 DEF_ICON(SEQ_LUMA_WAVEFORM)
@@ -780,26 +791,15 @@ DEF_ICON(SEQ_HISTOGRAM)
 DEF_ICON(SEQ_SPLITVIEW)
 DEF_ICON(SEQ_STRIP_META)
 DEF_ICON(SEQ_STRIP_DUPLICATE)
+
+/* IMAGE EDITOR */
 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(HANDLE_AUTOCLAMPED)
-DEF_ICON(HANDLE_AUTO)
-DEF_ICON(HANDLE_ALIGNED)
-DEF_ICON(HANDLE_VECTOR)
-DEF_ICON(HANDLE_FREE)
-DEF_ICON(VIEW_CAMERA_UNSELECTED)
-DEF_ICON(VIEW_UNLOCKED)
-DEF_ICON(VIEW_LOCKED)
-DEF_ICON(VIEW_PERSPECTIVE)
-DEF_ICON(VIEW_ORTHO)
-DEF_ICON(VIEW_CAMERA)
-DEF_ICON(VIEW_PAN)
-DEF_ICON(VIEW_ZOOM)
-
-/* For larger use. Could be moved into main list. */
 
+/* For larger use, mostly used for the file browser */
+/* LARGE */
 DEF_ICON(BLENDER_LOGO_LARGE)
 DEF_ICON(CANCEL_LARGE)
 DEF_ICON(DISC_LARGE)
@@ -814,7 +814,7 @@ DEF_ICON(QUESTION_LARGE)
 DEF_ICON(WARNING_LARGE)
 
 /* The following are used when creating the Event Icons. */
-
+/* STATUSBAR */
 DEF_ICON(KEY_BACKSPACE)
 DEF_ICON(KEY_BACKSPACE_FILLED)
 DEF_ICON(KEY_COMMAND)
@@ -842,6 +842,17 @@ DEF_ICON(KEY_TAB_FILLED)
 DEF_ICON(KEY_WINDOWS)
 DEF_ICON(KEY_WINDOWS_FILLED)
 
+/* INTERNET */
+DEF_ICON(USER)
+DEF_ICON(INTERNET)
+DEF_ICON(INTERNET_OFFLINE)
+DEF_ICON_FUND(FUND)
+DEF_ICON(HEART)
+
+/* OTHER */
+DEF_ICON(EXPERIMENTAL)
+DEF_ICON(MEMORY)
+
 /* The items above are initiated sequentially while the ones that
  * follow are initiated individually. Therefore this item marks
  * the boundary. Add regular SVG icons above this one.*/