diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 6a87ac0adaa..ebebc82695a 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -1048,6 +1048,9 @@
+
+
+
@@ -1062,6 +1065,9 @@
+
+
+
@@ -1321,6 +1327,14 @@
+
+
+
+
+
+
+
+
@@ -3732,6 +3746,14 @@
+
+
+
+
+
+
+
+
@@ -3809,6 +3831,11 @@
+
+
+
+
+
@@ -4137,6 +4164,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5348,6 +5435,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/release/datafiles/blender_icons16/icon16_anchor_bottom.dat b/release/datafiles/blender_icons16/icon16_anchor_bottom.dat
new file mode 100644
index 00000000000..e79dfded6ef
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_anchor_bottom.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_anchor_center.dat b/release/datafiles/blender_icons16/icon16_anchor_center.dat
new file mode 100644
index 00000000000..7dfbc8cce3a
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_anchor_center.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_anchor_left.dat b/release/datafiles/blender_icons16/icon16_anchor_left.dat
new file mode 100644
index 00000000000..665291de855
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_anchor_left.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_anchor_right.dat b/release/datafiles/blender_icons16/icon16_anchor_right.dat
new file mode 100644
index 00000000000..fcd2fe6c872
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_anchor_right.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_anchor_top.dat b/release/datafiles/blender_icons16/icon16_anchor_top.dat
new file mode 100644
index 00000000000..fc90b1fed63
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_anchor_top.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_brushes_all.dat b/release/datafiles/blender_icons16/icon16_brushes_all.dat
new file mode 100644
index 00000000000..82840288a39
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_brushes_all.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_folder_redirect.dat b/release/datafiles/blender_icons16/icon16_folder_redirect.dat
new file mode 100644
index 00000000000..90b3498c0fd
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_folder_redirect.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_handle_aligned.dat b/release/datafiles/blender_icons16/icon16_handle_aligned.dat
new file mode 100644
index 00000000000..5b265740449
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_handle_aligned.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_handle_auto.dat b/release/datafiles/blender_icons16/icon16_handle_auto.dat
new file mode 100644
index 00000000000..93e21513010
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_handle_auto.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_handle_autoclamped.dat b/release/datafiles/blender_icons16/icon16_handle_autoclamped.dat
new file mode 100644
index 00000000000..05e3b834710
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_handle_autoclamped.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_handle_free.dat b/release/datafiles/blender_icons16/icon16_handle_free.dat
new file mode 100644
index 00000000000..d3cf9857b53
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_handle_free.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_handle_vector.dat b/release/datafiles/blender_icons16/icon16_handle_vector.dat
new file mode 100644
index 00000000000..4d2e11ff72c
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_handle_vector.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_anchor_bottom.dat b/release/datafiles/blender_icons32/icon32_anchor_bottom.dat
new file mode 100644
index 00000000000..0e56e3c653b
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_anchor_bottom.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_anchor_center.dat b/release/datafiles/blender_icons32/icon32_anchor_center.dat
new file mode 100644
index 00000000000..0f859b7a316
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_anchor_center.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_anchor_left.dat b/release/datafiles/blender_icons32/icon32_anchor_left.dat
new file mode 100644
index 00000000000..354154d1cf6
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_anchor_left.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_anchor_right.dat b/release/datafiles/blender_icons32/icon32_anchor_right.dat
new file mode 100644
index 00000000000..7c7f7987596
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_anchor_right.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_anchor_top.dat b/release/datafiles/blender_icons32/icon32_anchor_top.dat
new file mode 100644
index 00000000000..d4d67ce90c3
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_anchor_top.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_brushes_all.dat b/release/datafiles/blender_icons32/icon32_brushes_all.dat
new file mode 100644
index 00000000000..d224036d082
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_brushes_all.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_folder_redirect.dat b/release/datafiles/blender_icons32/icon32_folder_redirect.dat
new file mode 100644
index 00000000000..45ed10c6f46
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_folder_redirect.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_handle_aligned.dat b/release/datafiles/blender_icons32/icon32_handle_aligned.dat
new file mode 100644
index 00000000000..7793d128216
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_handle_aligned.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_handle_auto.dat b/release/datafiles/blender_icons32/icon32_handle_auto.dat
new file mode 100644
index 00000000000..e8675fb5884
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_handle_auto.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_handle_autoclamped.dat b/release/datafiles/blender_icons32/icon32_handle_autoclamped.dat
new file mode 100644
index 00000000000..0bc5ba6275f
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_handle_autoclamped.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_handle_free.dat b/release/datafiles/blender_icons32/icon32_handle_free.dat
new file mode 100644
index 00000000000..a2ee1527b1d
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_handle_free.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_handle_vector.dat b/release/datafiles/blender_icons32/icon32_handle_vector.dat
new file mode 100644
index 00000000000..78788c56873
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_handle_vector.dat differ
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 93bf5eca052..a9e8cae3c8b 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -121,7 +121,7 @@ class UnifiedPaintPanel:
if unified_name and not header:
# NOTE: We don't draw UnifiedPaintSettings in the header to reduce clutter. D5928#136281
- row.prop(ups, unified_name, text="", icon="WORLD")
+ row.prop(ups, unified_name, text="", icon="BRUSHES_ALL")
return row
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 44c734e264a..fabf6baed23 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -134,7 +134,7 @@ DEF_ICON(RECOVER_LAST)
DEF_ICON(THREE_DOTS)
DEF_ICON(FULLSCREEN_ENTER)
DEF_ICON(FULLSCREEN_EXIT)
-DEF_ICON_BLANK(135)
+DEF_ICON(BRUSHES_ALL)
/* BUTTONS */
DEF_ICON_SHADING(LIGHT)
@@ -452,11 +452,11 @@ DEF_ICON(NODE_INSERT_OFF)
DEF_ICON(NODE_TOP)
DEF_ICON(NODE_SIDE)
DEF_ICON(NODE_CORNER)
-DEF_ICON_BLANK(698)
-DEF_ICON_BLANK(699)
-DEF_ICON_BLANK(700)
-DEF_ICON_BLANK(701)
-DEF_ICON_BLANK(702)
+DEF_ICON(ANCHOR_TOP)
+DEF_ICON(ANCHOR_BOTTOM)
+DEF_ICON(ANCHOR_LEFT)
+DEF_ICON(ANCHOR_RIGHT)
+DEF_ICON(ANCHOR_CENTER)
DEF_ICON_BLANK(703)
DEF_ICON_BLANK(704)
DEF_ICON_BLANK(705)
@@ -793,7 +793,7 @@ DEF_ICON(BOOKMARKS)
DEF_ICON(FONTPREVIEW)
DEF_ICON(FILTER)
DEF_ICON(NEWFOLDER)
-DEF_ICON_BLANK(794)
+DEF_ICON(FOLDER_REDIRECT)
DEF_ICON(FILE_PARENT)
DEF_ICON(FILE_REFRESH)
DEF_ICON_FOLDER(FILE_FOLDER)
@@ -876,11 +876,11 @@ 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_BLANK(877)
-DEF_ICON_BLANK(878)
-DEF_ICON_BLANK(879)
-DEF_ICON_BLANK(880)
-DEF_ICON_BLANK(881)
+DEF_ICON(HANDLE_AUTOCLAMPED)
+DEF_ICON(HANDLE_AUTO)
+DEF_ICON(HANDLE_ALIGNED)
+DEF_ICON(HANDLE_VECTOR)
+DEF_ICON(HANDLE_FREE)
DEF_ICON_BLANK(882)
DEF_ICON_BLANK(883)
DEF_ICON_BLANK(884)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index e900160a653..b295a169c83 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -51,29 +51,25 @@ static const EnumPropertyItem beztriple_handle_type_items[] = {
#endif
const EnumPropertyItem rna_enum_keyframe_handle_type_items[] = {
- {HD_FREE,
- "FREE",
- ICON_HANDLETYPE_FREE_VEC,
- "Free",
- "Completely independent manually set handle"},
+ {HD_FREE, "FREE", ICON_HANDLE_FREE, "Free", "Completely independent manually set handle"},
{HD_ALIGN,
"ALIGNED",
- ICON_HANDLETYPE_ALIGNED_VEC,
+ ICON_HANDLE_ALIGNED,
"Aligned",
"Manually set handle with rotation locked together with its pair"},
{HD_VECT,
"VECTOR",
- ICON_HANDLETYPE_VECTOR_VEC,
+ ICON_HANDLE_VECTOR,
"Vector",
"Automatic handles that create straight lines"},
{HD_AUTO,
"AUTO",
- ICON_HANDLETYPE_AUTO_VEC,
+ ICON_HANDLE_AUTO,
"Automatic",
"Automatic handles that create smooth curves"},
{HD_AUTO_ANIM,
"AUTO_CLAMPED",
- ICON_HANDLETYPE_AUTO_CLAMP_VEC,
+ ICON_HANDLE_AUTOCLAMPED,
"Auto Clamped",
"Automatic handles that create smooth curves which only change direction at keyframes"},
{0, NULL, 0, NULL, NULL},
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 2c5f93e28ed..16dbe38f866 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -2701,15 +2701,15 @@ static void rna_def_text(StructRNA *srna)
{
/* Avoid text icons because they imply this aligns within a frame, see: T71082 */
static const EnumPropertyItem text_align_x_items[] = {
- {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""},
- {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""},
- {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""},
+ {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", ICON_ANCHOR_LEFT, "Left", ""},
+ {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", ICON_ANCHOR_CENTER, "Center", ""},
+ {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", ICON_ANCHOR_RIGHT, "Right", ""},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem text_align_y_items[] = {
- {SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""},
- {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""},
- {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""},
+ {SEQ_TEXT_ALIGN_Y_TOP, "TOP", ICON_ANCHOR_TOP, "Top", ""},
+ {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", ICON_ANCHOR_CENTER, "Center", ""},
+ {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ANCHOR_BOTTOM, "Bottom", ""},
{0, NULL, 0, NULL, NULL},
};