diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc
index 4c92b5f62bd..b9c35384b25 100644
--- a/source/blender/editors/animation/fmodifier_ui.cc
+++ b/source/blender/editors/animation/fmodifier_ui.cc
@@ -280,7 +280,7 @@ static void fmodifier_frame_range_draw(const bContext *C, Panel *panel)
   PointerRNA *ptr = fmodifier_get_pointers(C, panel, nullptr);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   FModifier *fcm = static_cast<FModifier *>(ptr->data);
   layout->active_set(fcm->flag & FMODIFIER_FLAG_RANGERESTRICT);
@@ -366,7 +366,7 @@ static void generator_panel_draw(const bContext *C, Panel *panel)
   layout->prop(ptr, "mode", UI_ITEM_NONE, "", ICON_NONE);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(ptr, "use_additive", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
@@ -449,7 +449,7 @@ static void fn_generator_panel_draw(const bContext *C, Panel *panel)
   layout->prop(ptr, "function_type", UI_ITEM_NONE, "", ICON_NONE);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   col = &layout->column(false);
   col->prop(ptr, "use_additive", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -492,7 +492,7 @@ static void cycles_panel_draw(const bContext *C, Panel *panel)
   PointerRNA *ptr = fmodifier_get_pointers(C, panel, nullptr);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Before. */
   col = &layout->column(false);
@@ -536,7 +536,7 @@ static void noise_panel_draw(const bContext *C, Panel *panel)
   PointerRNA *ptr = fmodifier_get_pointers(C, panel, nullptr);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(ptr, "blend_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
@@ -674,7 +674,7 @@ static void envelope_panel_draw(const bContext *C, Panel *panel)
   FMod_Envelope *env = static_cast<FMod_Envelope *>(fcm->data);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* General settings. */
   col = &layout->column(true);
@@ -765,7 +765,7 @@ static void limits_panel_draw(const bContext *C, Panel *panel)
   PointerRNA *ptr = fmodifier_get_pointers(C, panel, nullptr);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Minimums. */
   col = &layout->column(false);
@@ -827,7 +827,7 @@ static void stepped_panel_draw(const bContext *C, Panel *panel)
   PointerRNA *ptr = fmodifier_get_pointers(C, panel, nullptr);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Stepping Settings. */
   col = &layout->column(false);
diff --git a/source/blender/editors/curves/intern/curves_attribute_set.cc b/source/blender/editors/curves/intern/curves_attribute_set.cc
index 500c511e976..b0f53b12c86 100644
--- a/source/blender/editors/curves/intern/curves_attribute_set.cc
+++ b/source/blender/editors/curves/intern/curves_attribute_set.cc
@@ -187,7 +187,7 @@ static void set_attribute_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = &op->layout->column(true);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   Object *object = CTX_data_active_object(C);
   Curves &curves_id = *static_cast<Curves *>(object->data);
diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc
index 70c25373516..fd27107c7c0 100644
--- a/source/blender/editors/curves/intern/curves_ops.cc
+++ b/source/blender/editors/curves/intern/curves_ops.cc
@@ -1013,7 +1013,7 @@ static void select_ends_ui(bContext * /*C*/, wmOperator *op)
   layout->use_property_split_set(true);
 
   uiLayout *col = &layout->column(true);
-  uiLayoutSetPropDecorate(col, false);
+  col->use_property_decorate_set(false);
   col->prop(op->ptr, "amount_start", UI_ITEM_NONE, IFACE_("Amount Start"), ICON_NONE);
   col->prop(op->ptr, "amount_end", UI_ITEM_NONE, IFACE_("End"), ICON_NONE);
 }
diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc
index ba173e1d404..a00c5e6e318 100644
--- a/source/blender/editors/geometry/geometry_attributes.cc
+++ b/source/blender/editors/geometry/geometry_attributes.cc
@@ -650,7 +650,7 @@ static void geometry_color_attribute_add_ui(bContext * /*C*/, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(op->ptr, "name", UI_ITEM_NONE, std::nullopt, ICON_NONE);
   layout->prop(op->ptr, "domain", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
@@ -883,7 +883,7 @@ static void geometry_attribute_convert_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   Object *ob = object::context_object(C);
   if (ob->type == OB_MESH) {
@@ -1013,7 +1013,7 @@ static void geometry_color_attribute_convert_ui(bContext * /*C*/, wmOperator *op
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(op->ptr, "domain", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
   layout->prop(op->ptr, "data_type", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc
index 6a4aacd0c43..302c93bf15a 100644
--- a/source/blender/editors/geometry/node_group_operator.cc
+++ b/source/blender/editors/geometry/node_group_operator.cc
@@ -881,7 +881,7 @@ static void run_node_group_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   Main *bmain = CTX_data_main(C);
   PointerRNA bmain_ptr = RNA_main_pointer_create(bmain);
 
diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
index 39f60810325..23160e6d062 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
@@ -371,7 +371,7 @@ static void grease_pencil_simplify_ui(bContext *C, wmOperator *op)
   PointerRNA ptr = RNA_pointer_create_discrete(&wm->id, op->type->srna, op->properties);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(&ptr, "mode", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
@@ -3304,7 +3304,7 @@ static void grease_pencil_reproject_ui(bContext * /*C*/, wmOperator *op)
   const ReprojectMode type = ReprojectMode(RNA_enum_get(op->ptr, "type"));
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   row = &layout->row(true);
   row->prop(op->ptr, "type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
@@ -4589,7 +4589,7 @@ static void grease_pencil_convert_curve_type_ui(bContext *C, wmOperator *op)
   PointerRNA ptr = RNA_pointer_create_discrete(&wm->id, op->type->srna, op->properties);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(&ptr, "type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
diff --git a/source/blender/editors/include/UI_interface_layout.hh b/source/blender/editors/include/UI_interface_layout.hh
index 57be74ce3b0..627d4452e06 100644
--- a/source/blender/editors/include/UI_interface_layout.hh
+++ b/source/blender/editors/include/UI_interface_layout.hh
@@ -198,6 +198,13 @@ struct uiLayout : uiItem {
    */
   void use_property_split_set(bool value);
 
+  bool use_property_decorate() const;
+  /**
+   * Sets when to add an extra button to insert keyframes next to new property buttons added in the
+   * layout.
+   */
+  void use_property_decorate_set(bool is_sep);
+
   int width() const;
 
   /** Sub-layout items. */
@@ -665,9 +672,7 @@ void UI_menutype_draw(bContext *C, MenuType *mt, uiLayout *layout);
  */
 void UI_paneltype_draw(bContext *C, PanelType *pt, uiLayout *layout);
 
-void uiLayoutSetPropDecorate(uiLayout *layout, bool is_sep);
 int uiLayoutGetLocalDir(const uiLayout *layout);
-bool uiLayoutGetPropDecorate(uiLayout *layout);
 
 int uiLayoutListItemPaddingWidth();
 void uiLayoutListItemAddPadding(uiLayout *layout);
diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index 7642189ac99..3197e66dd37 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -3191,7 +3191,7 @@ uiPropertySplitWrapper uiItemPropertySplitWrapperCreate(uiLayout *parent_layout)
   split_wrapper.label_column = &layout_split->column(true);
   split_wrapper.label_column->alignment_ = blender::ui::LayoutAlign::Right;
   split_wrapper.property_row = ui_item_prop_split_layout_hack(parent_layout, layout_split);
-  split_wrapper.decorate_column = uiLayoutGetPropDecorate(parent_layout) ?
+  split_wrapper.decorate_column = parent_layout->use_property_decorate() ?
                                       &layout_row->column(true) :
                                       nullptr;
 
@@ -5116,14 +5116,14 @@ void uiLayout::use_property_split_set(bool is_sep)
   SET_FLAG_FROM_TEST(flag_, is_sep, uiItemInternalFlag::PropSep);
 }
 
-bool uiLayoutGetPropDecorate(uiLayout *layout)
+bool uiLayout::use_property_decorate() const
 {
-  return bool(layout->flag_ & uiItemInternalFlag::PropDecorate);
+  return bool(flag_ & uiItemInternalFlag::PropDecorate);
 }
 
-void uiLayoutSetPropDecorate(uiLayout *layout, bool is_sep)
+void uiLayout::use_property_decorate_set(bool is_sep)
 {
-  SET_FLAG_FROM_TEST(layout->flag_, is_sep, uiItemInternalFlag::PropDecorate);
+  SET_FLAG_FROM_TEST(flag_, is_sep, uiItemInternalFlag::PropDecorate);
 }
 
 Panel *uiLayout::root_panel() const
diff --git a/source/blender/editors/interface/templates/interface_template_cache_file.cc b/source/blender/editors/interface/templates/interface_template_cache_file.cc
index 913571cefaa..c9e6eaf4c51 100644
--- a/source/blender/editors/interface/templates/interface_template_cache_file.cc
+++ b/source/blender/editors/interface/templates/interface_template_cache_file.cc
@@ -114,7 +114,7 @@ void uiTemplateCacheFileTimeSettings(uiLayout *layout, PointerRNA *fileptr)
 
   row = &layout->row(true, IFACE_("Override Frame"));
   sub = &row->row(true);
-  uiLayoutSetPropDecorate(sub, false);
+  sub->use_property_decorate_set(false);
   sub->prop(fileptr, "override_frame", UI_ITEM_NONE, "", ICON_NONE);
   subsub = &sub->row(true);
   subsub->active_set(RNA_boolean_get(fileptr, "override_frame"));
diff --git a/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc b/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
index ec4d893e6b3..19915ae09d1 100644
--- a/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
+++ b/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
@@ -217,7 +217,7 @@ class LayerViewItem : public AbstractTreeViewItem {
     build_layer_name(row);
 
     uiLayout *sub = &row.row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
 
     build_layer_buttons(*sub);
   }
@@ -378,7 +378,7 @@ class LayerGroupViewItem : public AbstractTreeViewItem {
     build_layer_group_name(row);
 
     uiLayout *sub = &row.row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
 
     build_layer_group_buttons(*sub);
   }
diff --git a/source/blender/editors/interface/templates/interface_template_light_linking.cc b/source/blender/editors/interface/templates/interface_template_light_linking.cc
index cfa6be69b33..be93d4eb62a 100644
--- a/source/blender/editors/interface/templates/interface_template_light_linking.cc
+++ b/source/blender/editors/interface/templates/interface_template_light_linking.cc
@@ -246,7 +246,7 @@ class CollectionViewItem : public BasicTreeViewItem {
     add_label(row);
 
     uiLayout *sub = &row.row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
 
     build_state_button(*sub);
   }
diff --git a/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc b/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
index 88046896420..0f81a2f1c5d 100644
--- a/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
+++ b/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
@@ -105,7 +105,7 @@ class NodeSocketViewItem : public BasicTreeViewItem {
       row.enabled_set(false);
     }
 
-    uiLayoutSetPropDecorate(&row, false);
+    row.use_property_decorate_set(false);
 
     uiLayout *input_socket_layout = &row.row(true);
     if (socket_.flag & NODE_INTERFACE_SOCKET_INPUT) {
@@ -206,7 +206,7 @@ class NodePanelViewItem : public BasicTreeViewItem {
     this->add_label(row);
 
     uiLayout *sub = &row.row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
   }
 
  protected:
diff --git a/source/blender/editors/interface/templates/interface_template_operator_property.cc b/source/blender/editors/interface/templates/interface_template_operator_property.cc
index 448503698a1..327c42a993c 100644
--- a/source/blender/editors/interface/templates/interface_template_operator_property.cc
+++ b/source/blender/editors/interface/templates/interface_template_operator_property.cc
@@ -127,7 +127,7 @@ static eAutoPropButsReturn template_operator_property_buts_draw_single(
     PointerRNA ptr = RNA_pointer_create_discrete(&wm->id, op->type->srna, op->properties);
 
     layout->use_property_split_set(use_prop_split);
-    uiLayoutSetPropDecorate(layout, false);
+    layout->use_property_decorate_set(false);
 
     /* main draw call */
     return_info = uiDefAutoButsRNA(
@@ -366,7 +366,7 @@ static void draw_export_properties(bContext *C,
   uiLayout *col = &layout->column(false);
 
   col->use_property_split_set(true);
-  uiLayoutSetPropDecorate(col, false);
+  col->use_property_decorate_set(false);
 
   /* Note this property is used as an alternative to the `filepath` property of `op->ptr`.
    * This property is a wrapper to access that property, see the `CollectionExport::filepath`
diff --git a/source/blender/editors/io/io_alembic.cc b/source/blender/editors/io/io_alembic.cc
index b25fb1c6c3d..a3572f8f6ae 100644
--- a/source/blender/editors/io/io_alembic.cc
+++ b/source/blender/editors/io/io_alembic.cc
@@ -150,7 +150,7 @@ static wmOperatorStatus wm_alembic_export_exec(bContext *C, wmOperator *op)
 static void ui_alembic_export_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "ABC_export_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
@@ -567,7 +567,7 @@ static int get_sequence_len(const char *filepath, int *ofs)
 static void ui_alembic_import_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "ABC_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/io/io_fbx_ops.cc b/source/blender/editors/io/io_fbx_ops.cc
index 551ecbbe628..efcec18c04d 100644
--- a/source/blender/editors/io/io_fbx_ops.cc
+++ b/source/blender/editors/io/io_fbx_ops.cc
@@ -90,7 +90,7 @@ static bool wm_fbx_import_check(bContext * /*C*/, wmOperator * /*op*/)
 static void ui_fbx_import_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "FBX_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/io/io_grease_pencil.cc b/source/blender/editors/io/io_grease_pencil.cc
index 3b9604ed768..6914156fc36 100644
--- a/source/blender/editors/io/io_grease_pencil.cc
+++ b/source/blender/editors/io/io_grease_pencil.cc
@@ -190,7 +190,7 @@ static void grease_pencil_import_svg_draw(bContext * /*C*/, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   uiLayout *box = &layout->box();
   uiLayout *col = &box->column(false);
   col->prop(op->ptr, "resolution", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -363,7 +363,7 @@ static void ui_gpencil_export_settings(uiLayout *layout,
   uiLayout *box, *row, *col, *sub;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   box = &layout->box();
 
diff --git a/source/blender/editors/io/io_obj.cc b/source/blender/editors/io/io_obj.cc
index 3f0fc343612..370eb971548 100644
--- a/source/blender/editors/io/io_obj.cc
+++ b/source/blender/editors/io/io_obj.cc
@@ -140,7 +140,7 @@ static void ui_obj_export_settings(const bContext *C, uiLayout *layout, PointerR
   const bool export_materials = RNA_boolean_get(ptr, "export_materials");
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Object General options. */
   if (uiLayout *panel = layout->panel(C, "OBJ_export_general", false, IFACE_("General"))) {
@@ -459,7 +459,7 @@ static wmOperatorStatus wm_obj_import_exec(bContext *C, wmOperator *op)
 static void ui_obj_import_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "OBJ_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/io/io_ply_ops.cc b/source/blender/editors/io/io_ply_ops.cc
index 6b42f4290a0..495241b2cd3 100644
--- a/source/blender/editors/io/io_ply_ops.cc
+++ b/source/blender/editors/io/io_ply_ops.cc
@@ -106,7 +106,7 @@ static void wm_ply_export_draw(bContext *C, wmOperator *op)
   PointerRNA *ptr = op->ptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "PLY_export_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
@@ -283,7 +283,7 @@ static wmOperatorStatus wm_ply_import_exec(bContext *C, wmOperator *op)
 static void ui_ply_import_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "PLY_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/io/io_stl_ops.cc b/source/blender/editors/io/io_stl_ops.cc
index dfb88093cb2..f8d4d8244a9 100644
--- a/source/blender/editors/io/io_stl_ops.cc
+++ b/source/blender/editors/io/io_stl_ops.cc
@@ -82,7 +82,7 @@ static void wm_stl_export_draw(bContext *C, wmOperator *op)
   PointerRNA *ptr = op->ptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "STL_export_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
@@ -244,7 +244,7 @@ static bool wm_stl_import_check(bContext * /*C*/, wmOperator *op)
 static void ui_stl_import_settings(const bContext *C, uiLayout *layout, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "STL_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/io/io_usd.cc b/source/blender/editors/io/io_usd.cc
index 0b5d25ad115..83e74c0721d 100644
--- a/source/blender/editors/io/io_usd.cc
+++ b/source/blender/editors/io/io_usd.cc
@@ -446,7 +446,7 @@ static void wm_usd_export_draw(bContext *C, wmOperator *op)
   PointerRNA *ptr = op->ptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "USD_export_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
@@ -1090,7 +1090,7 @@ static void wm_usd_import_draw(bContext *C, wmOperator *op)
   PointerRNA *ptr = op->ptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (uiLayout *panel = layout->panel(C, "USD_import_general", false, IFACE_("General"))) {
     uiLayout *col = &panel->column(false);
diff --git a/source/blender/editors/mesh/editmesh_attribute.cc b/source/blender/editors/mesh/editmesh_attribute.cc
index 21c506c22fc..3e56dd5e7eb 100644
--- a/source/blender/editors/mesh/editmesh_attribute.cc
+++ b/source/blender/editors/mesh/editmesh_attribute.cc
@@ -245,7 +245,7 @@ static void mesh_set_attribute_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = &op->layout->column(true);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   Mesh *mesh = ED_mesh_context(C);
   AttributeOwner owner = AttributeOwner::from_id(&mesh->id);
diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc
index e67a3dfa247..62ed4df4ca3 100644
--- a/source/blender/editors/mesh/editmesh_bevel.cc
+++ b/source/blender/editors/mesh/editmesh_bevel.cc
@@ -897,7 +897,7 @@ static void edbm_bevel_ui(bContext *C, wmOperator *op)
   bool affect_type = RNA_enum_get(op->ptr, "affect");
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   row = &layout->row(false);
   row->prop(op->ptr, "affect", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
diff --git a/source/blender/editors/mesh/editmesh_intersect.cc b/source/blender/editors/mesh/editmesh_intersect.cc
index e098dd9851f..0cf0aa7be38 100644
--- a/source/blender/editors/mesh/editmesh_intersect.cc
+++ b/source/blender/editors/mesh/editmesh_intersect.cc
@@ -247,7 +247,7 @@ static void edbm_intersect_ui(bContext * /*C*/, wmOperator *op)
   bool use_exact = RNA_enum_get(op->ptr, "solver") == ISECT_SOLVER_EXACT;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   row = &layout->row(false);
   row->prop(op->ptr, "mode", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
   layout->separator();
@@ -407,7 +407,7 @@ static void edbm_intersect_boolean_ui(bContext * /*C*/, wmOperator *op)
   bool use_exact = RNA_enum_get(op->ptr, "solver") == ISECT_SOLVER_EXACT;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   row = &layout->row(false);
   row->prop(op->ptr, "operation", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc
index 082c9d90994..c202f5f797a 100644
--- a/source/blender/editors/mesh/editmesh_tools.cc
+++ b/source/blender/editors/mesh/editmesh_tools.cc
@@ -3932,7 +3932,7 @@ static void edbm_blend_from_shape_ui(bContext *C, wmOperator *op)
   PointerRNA ptr_key = RNA_id_pointer_create((ID *)mesh->key);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiItemPointerR(
       layout, op->ptr, "shape", &ptr_key, "key_blocks", std::nullopt, ICON_SHAPEKEY_DATA);
diff --git a/source/blender/editors/object/interface_template_shape_key_tree.cc b/source/blender/editors/object/interface_template_shape_key_tree.cc
index c0aa4ee1e3a..a4928d7f72d 100644
--- a/source/blender/editors/object/interface_template_shape_key_tree.cc
+++ b/source/blender/editors/object/interface_template_shape_key_tree.cc
@@ -169,7 +169,7 @@ class ShapeKeyItem : public ui::AbstractTreeViewItem {
   {
     uiItemL_ex(&row, this->label_, ICON_SHAPEKEY_DATA, false, false);
     uiLayout *sub = &row.row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
     PointerRNA shapekey_ptr = RNA_pointer_create_discrete(
         &shape_key_.key->id, &RNA_ShapeKey, shape_key_.kb);
 
diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc
index c2b5f31d6ec..6823ed98785 100644
--- a/source/blender/editors/object/object_edit.cc
+++ b/source/blender/editors/object/object_edit.cc
@@ -1927,7 +1927,7 @@ static void shade_auto_smooth_ui(bContext * /*C*/, wmOperator *op)
   uiLayout *layout = op->layout;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(op->ptr, "use_auto_smooth", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
diff --git a/source/blender/editors/pointcloud/intern/attribute_set.cc b/source/blender/editors/pointcloud/intern/attribute_set.cc
index b5c79044778..2e54b0d2297 100644
--- a/source/blender/editors/pointcloud/intern/attribute_set.cc
+++ b/source/blender/editors/pointcloud/intern/attribute_set.cc
@@ -171,7 +171,7 @@ static void set_attribute_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = &op->layout->column(true);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   Object *object = CTX_data_active_object(C);
   PointCloud &pointcloud = *static_cast<PointCloud *>(object->data);
diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc
index fb9df10d55c..07b68a6dac0 100644
--- a/source/blender/editors/screen/screendump.cc
+++ b/source/blender/editors/screen/screendump.cc
@@ -214,7 +214,7 @@ static void screenshot_draw(bContext * /*C*/, wmOperator *op)
   ScreenshotData *scd = static_cast<ScreenshotData *>(op->customdata);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* image template */
   PointerRNA ptr = RNA_pointer_create_discrete(nullptr, &RNA_ImageFormatSettings, &scd->im_format);
diff --git a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc
index 45222a782e8..fbdb11015af 100644
--- a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc
@@ -1452,7 +1452,7 @@ static void grease_pencil_interpolate_sequence_ui(bContext *C, wmOperator *op)
   const InterpolationType type = InterpolationType(RNA_enum_get(op->ptr, "type"));
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   row = &layout->row(true);
   row->prop(op->ptr, "step", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc
index 31d7f5288ba..ad0267497f9 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@ -6874,7 +6874,7 @@ static void texture_paint_add_texture_paint_slot_ui(bContext *C, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   Object *ob = blender::ed::object::context_active_object(C);
   ePaintCanvasSource slot_type = PAINT_CANVAS_SOURCE_IMAGE;
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc
index 3e9723495ca..c8ad9f296d1 100644
--- a/source/blender/editors/sculpt_paint/sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc
@@ -1296,7 +1296,7 @@ static void mask_from_cavity_ui(bContext *C, wmOperator *op)
   Sculpt *sd = scene->toolsettings ? scene->toolsettings->sculpt : nullptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   MaskSettingsSource source = (MaskSettingsSource)RNA_enum_get(op->ptr, "settings_source");
 
   if (!sd) {
@@ -1478,7 +1478,7 @@ static void mask_from_boundary_ui(bContext *C, wmOperator *op)
   Sculpt *sd = scene->toolsettings ? scene->toolsettings->sculpt : nullptr;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   MaskSettingsSource source = (MaskSettingsSource)RNA_enum_get(op->ptr, "settings_source");
 
   if (!sd) {
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index f76b12e270d..0a52072bc66 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -562,7 +562,7 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
   PropertyRNA *prop_bitrate;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   AUD_Container container = AUD_Container(RNA_enum_get(op->ptr, "container"));
   AUD_Codec codec = AUD_Codec(RNA_enum_get(op->ptr, "codec"));
diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc
index 86b70e68b7c..8e22650bc12 100644
--- a/source/blender/editors/space_graph/graph_buttons.cc
+++ b/source/blender/editors/space_graph/graph_buttons.cc
@@ -140,7 +140,7 @@ static void graph_panel_cursor(const bContext *C, Panel *panel)
   PointerRNA spaceptr = RNA_pointer_create_discrete(&screen->id, &RNA_SpaceGraphEditor, sipo);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* 2D-Cursor */
   col = &layout->column(false);
@@ -219,7 +219,7 @@ static void graph_panel_properties(const bContext *C, Panel *panel)
   col->label(name, icon);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* RNA-Path Editing - only really should be enabled when things aren't working */
   col = &layout->column(false);
@@ -367,7 +367,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel)
   block = layout->block();
   // UI_block_func_handle_set(block, do_graph_region_buttons, nullptr);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* only show this info if there are keyframes to edit */
   if (get_active_fcurve_keyframe_edit(fcu, &bezt, &prevbezt)) {
diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc
index 68544513604..20f00cc6811 100644
--- a/source/blender/editors/space_image/image_buttons.cc
+++ b/source/blender/editors/space_image/image_buttons.cc
@@ -834,7 +834,7 @@ void uiTemplateImage(uiLayout *layout,
 
   layout = &layout->column(false);
   layout->enabled_set(!is_dirty);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Image source */
   {
@@ -990,7 +990,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr, bool color_ma
   col = &layout->column(false);
 
   col->use_property_split_set(true);
-  uiLayoutSetPropDecorate(col, false);
+  col->use_property_decorate_set(false);
 
   col->prop(imfptr, "file_format", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 
@@ -1117,7 +1117,7 @@ static void uiTemplateViewsFormat(uiLayout *layout,
   col = &layout->column(false);
 
   col->use_property_split_set(true);
-  uiLayoutSetPropDecorate(col, false);
+  col->use_property_decorate_set(false);
 
   col->prop(ptr, "views_format", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
 
diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc
index c7aa423c694..f80bda3d596 100644
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -2046,7 +2046,7 @@ static void image_save_as_draw(bContext * /*C*/, wmOperator *op)
   const bool save_as_render = RNA_boolean_get(op->ptr, "save_as_render");
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Operator settings. */
   uiDefAutoButsRNA(layout,
@@ -2700,7 +2700,7 @@ static void image_new_draw(bContext * /*C*/, wmOperator *op)
   /* copy of WM_operator_props_dialog_popup() layout */
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   col = &layout->column(false);
   col->prop(op->ptr, "name", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -4237,7 +4237,7 @@ static bool do_fill_tile(PointerRNA *ptr, Image *ima, ImageTile *tile)
 static void draw_fill_tile(PointerRNA *ptr, uiLayout *layout)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiLayout *col = &layout->column(false);
   col->prop(ptr, "color", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -4384,7 +4384,7 @@ static void tile_add_draw(bContext * /*C*/, wmOperator *op)
   uiLayout *layout = op->layout;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   col = &layout->column(false);
   col->prop(op->ptr, "number", UI_ITEM_NONE, std::nullopt, ICON_NONE);
diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc
index 8326cdae031..d6485e72abf 100644
--- a/source/blender/editors/space_nla/nla_buttons.cc
+++ b/source/blender/editors/space_nla/nla_buttons.cc
@@ -309,7 +309,7 @@ static void nla_panel_animdata(const bContext *C, Panel *panel)
   block = layout->block();
   UI_block_func_handle_set(block, do_nla_region_buttons, nullptr);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* AnimData Source Properties ----------------------------------- */
 
@@ -416,7 +416,7 @@ static void nla_panel_properties(const bContext *C, Panel *panel)
   /* strip type */
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* strip extents */
   column = &layout->column(true);
@@ -480,7 +480,7 @@ static void nla_panel_actclip(const bContext *C, Panel *panel)
   block = layout->block();
   UI_block_func_handle_set(block, do_nla_region_buttons, nullptr);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, true);
+  layout->use_property_decorate_set(true);
 
   /* Strip Properties ------------------------------------- */
   /* action pointer */
diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc
index c51ad333490..a2cba0f6484 100644
--- a/source/blender/editors/space_node/node_templates.cc
+++ b/source/blender/editors/space_node/node_templates.cc
@@ -745,7 +745,7 @@ static void ui_node_draw_recursive(uiLayout &layout,
   PanelLayout panel_layout = layout.panel(&C, panel_id.c_str(), panel_decl.default_collapsed);
   if (panel_toggle_decl) {
     panel_layout.header->use_property_split_set(false);
-    uiLayoutSetPropDecorate(panel_layout.header, false);
+    panel_layout.header->use_property_decorate_set(false);
     PointerRNA toggle_ptr = RNA_pointer_create_discrete(
         &ntree.id, &RNA_NodeSocket, &node.socket_by_decl(*panel_toggle_decl));
     panel_layout.header->prop(&toggle_ptr,
@@ -854,7 +854,7 @@ static void ui_node_draw_input(uiLayout &layout,
 
   uiPropertySplitWrapper split_wrapper = uiItemPropertySplitWrapperCreate(row);
   /* Decorations are added manually here. */
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   /* Empty decorator item for alignment. */
   bool add_dummy_decorator = false;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc
index 5f7531924f2..3d8967d9067 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_edit.cc
@@ -1628,7 +1628,7 @@ static void sequencer_split_ui(bContext * /*C*/, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiLayout *row = &layout->row(false);
   row->prop(op->ptr, "type", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index 5ea0814d7c1..6d244615477 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -197,7 +197,7 @@ static void spreadsheet_filter_panel_draw(const bContext *C, Panel *panel)
   }
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->prop(filter_ptr, "column_name", UI_ITEM_NONE, IFACE_("Column"), ICON_NONE);
 
diff --git a/source/blender/editors/space_userpref/userpref_ops.cc b/source/blender/editors/space_userpref/userpref_ops.cc
index f6c31f38cd4..5e9377ddd29 100644
--- a/source/blender/editors/space_userpref/userpref_ops.cc
+++ b/source/blender/editors/space_userpref/userpref_ops.cc
@@ -426,7 +426,7 @@ static void preferences_extension_repo_add_ui(bContext * /*C*/, wmOperator *op)
 
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   PointerRNA *ptr = op->ptr;
   const bUserExtensionRepoAddType repo_type = bUserExtensionRepoAddType(RNA_enum_get(ptr, "type"));
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
index 1083b666001..a42eb626502 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc
@@ -1890,7 +1890,7 @@ static void uv_pack_islands_ui(bContext * /*C*/, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(op->ptr, "shape_method", UI_ITEM_NONE, std::nullopt, ICON_NONE);
   layout->prop(op->ptr, "scale", UI_ITEM_NONE, std::nullopt, ICON_NONE);
   {
@@ -2884,7 +2884,7 @@ static void unwrap_draw(bContext * /*C*/, wmOperator *op)
   uiLayout *layout = op->layout;
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   /* Main draw call */
   PointerRNA ptr = RNA_pointer_create_discrete(nullptr, op->type->srna, op->properties);
diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc
index f5057fea649..6d8e050bc6e 100644
--- a/source/blender/makesrna/intern/rna_ui.cc
+++ b/source/blender/makesrna/intern/rna_ui.cc
@@ -1511,12 +1511,12 @@ static void rna_UILayout_property_split_set(PointerRNA *ptr, bool value)
 
 static bool rna_UILayout_property_decorate_get(PointerRNA *ptr)
 {
-  return uiLayoutGetPropDecorate(static_cast<uiLayout *>(ptr->data));
+  return static_cast<const uiLayout *>(ptr->data)->use_property_decorate();
 }
 
 static void rna_UILayout_property_decorate_set(PointerRNA *ptr, bool value)
 {
-  uiLayoutSetPropDecorate(static_cast<uiLayout *>(ptr->data), value);
+  static_cast<uiLayout *>(ptr->data)->use_property_decorate_set(value);
 }
 
 /* File Handler */
diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc
index 5bd85713736..54caccb382c 100644
--- a/source/blender/modifiers/intern/MOD_bevel.cc
+++ b/source/blender/modifiers/intern/MOD_bevel.cc
@@ -358,7 +358,7 @@ static void profile_panel_draw(const bContext * /*C*/, Panel *panel)
 
     if (profile_type == MOD_BEVEL_PROFILE_CUSTOM) {
       uiLayout *sub = &layout->column(false);
-      uiLayoutSetPropDecorate(sub, false);
+      sub->use_property_decorate_set(false);
       uiTemplateCurveProfile(sub, ptr, "custom_profile");
     }
   }
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc
index 1fbfc3da3f8..af7465df9d7 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.cc
+++ b/source/blender/modifiers/intern/MOD_datatransfer.cc
@@ -213,7 +213,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel)
   row = &layout->row(true);
   row->prop(ptr, "object", UI_ITEM_NONE, IFACE_("Source"), ICON_NONE);
   sub = &row->row(true);
-  uiLayoutSetPropDecorate(sub, false);
+  sub->use_property_decorate_set(false);
   sub->prop(ptr, "use_object_transform", UI_ITEM_NONE, "", ICON_ORIENTATION_GLOBAL);
 
   layout->prop(ptr, "mix_mode", UI_ITEM_NONE, std::nullopt, ICON_NONE);
diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc
index 7d8f64df23b..cb54135ce22 100644
--- a/source/blender/modifiers/intern/MOD_decimate.cc
+++ b/source/blender/modifiers/intern/MOD_decimate.cc
@@ -236,7 +236,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel)
     layout->prop(ptr, "ratio", UI_ITEM_R_SLIDER, std::nullopt, ICON_NONE);
 
     row = &layout->row(true, IFACE_("Symmetry"));
-    uiLayoutSetPropDecorate(row, false);
+    row->use_property_decorate_set(false);
     sub = &row->row(true);
     sub->prop(ptr, "use_symmetry", UI_ITEM_NONE, "", ICON_NONE);
     sub = &sub->row(true);
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
index d98f474c085..c91aa9666dc 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
@@ -105,7 +105,7 @@ void draw_layer_filter_settings(const bContext * /*C*/, uiLayout *layout, Pointe
 
   col = &layout->column(true);
   row = &col->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   if (use_layer_group_filter) {
     uiItemPointerR(row,
                    ptr,
@@ -129,7 +129,7 @@ void draw_layer_filter_settings(const bContext * /*C*/, uiLayout *layout, Pointe
   sub->prop(ptr, "invert_layer_filter", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
 
   row = &col->row(true, IFACE_("Layer Pass"));
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_layer_pass_filter", UI_ITEM_NONE, "", ICON_NONE);
   subsub = &sub->row(true);
@@ -149,14 +149,14 @@ void draw_material_filter_settings(const bContext * /*C*/, uiLayout *layout, Poi
 
   col = &layout->column(true);
   row = &col->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   uiItemPointerR(
       row, ptr, "material_filter", &obj_data_ptr, "materials", std::nullopt, ICON_SHADING_TEXTURE);
   sub = &row->row(true);
   sub->prop(ptr, "invert_material_filter", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
 
   row = &col->row(true, IFACE_("Material Pass"));
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_material_pass_filter", UI_ITEM_NONE, "", ICON_NONE);
   subsub = &sub->row(true);
@@ -175,11 +175,11 @@ void draw_vertex_group_settings(const bContext * /*C*/, uiLayout *layout, Pointe
 
   col = &layout->column(true);
   row = &col->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   uiItemPointerR(row, ptr, "vertex_group_name", &ob_ptr, "vertex_groups", std::nullopt, ICON_NONE);
   sub = &row->row(true);
   sub->active_set(has_vertex_group);
-  uiLayoutSetPropDecorate(sub, false);
+  sub->use_property_decorate_set(false);
   sub->prop(ptr, "invert_vertex_group", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
 }
 
@@ -190,7 +190,7 @@ void draw_custom_curve_settings(const bContext * /*C*/, uiLayout *layout, Pointe
 
   layout->use_property_split_set(true);
   row = &layout->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   row->prop(ptr, "use_custom_curve", UI_ITEM_NONE, IFACE_("Custom Curve"), ICON_NONE);
   if (use_custom_curve) {
     uiTemplateCurveMapping(layout, ptr, "custom_curve", 0, false, false, false, false);
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc b/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
index c1b990d2ba8..7730089d024 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
@@ -235,7 +235,7 @@ static void panel_draw(const bContext *C, Panel *panel)
 
   sub = &row->row(true);
   bool has_output = RNA_string_length(ptr, "target_vertex_group") != 0;
-  uiLayoutSetPropDecorate(sub, false);
+  sub->use_property_decorate_set(false);
   sub->active_set(has_output);
   sub->prop(ptr, "use_invert_output", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc b/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
index 984a14fdc60..647df6e61a8 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
@@ -257,7 +257,7 @@ static void panel_draw(const bContext *C, Panel *panel)
       row, ptr, "target_vertex_group", &ob_ptr, "vertex_groups", std::nullopt, ICON_NONE);
   sub = &row->row(true);
   bool has_output = RNA_string_length(ptr, "target_vertex_group") != 0;
-  uiLayoutSetPropDecorate(sub, false);
+  sub->use_property_decorate_set(false);
   sub->active_set(has_output);
   sub->prop(ptr, "use_invert_output", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
 
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc
index fdabbd2801d..17ef0f5c628 100644
--- a/source/blender/modifiers/intern/MOD_mask.cc
+++ b/source/blender/modifiers/intern/MOD_mask.cc
@@ -773,7 +773,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel)
     row = &layout->row(true);
     row->prop(ptr, "armature", UI_ITEM_NONE, std::nullopt, ICON_NONE);
     sub = &row->row(true);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
     sub->prop(ptr, "invert_vertex_group", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
   }
   else if (mode == MOD_MASK_MODE_VGROUP) {
diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc
index 850e27fa47b..0e40a15b029 100644
--- a/source/blender/modifiers/intern/MOD_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_mirror.cc
@@ -195,7 +195,7 @@ static void data_panel_draw(const bContext * /*C*/, Panel *panel)
 
   col = &layout->column(true);
   row = &col->row(true, IFACE_("Mirror U"));
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_mirror_u", UI_ITEM_NONE, "", ICON_NONE);
   sub = &sub->row(true);
@@ -204,7 +204,7 @@ static void data_panel_draw(const bContext * /*C*/, Panel *panel)
   uiItemDecoratorR(row, ptr, "mirror_offset_u", 0);
 
   row = &col->row(true, IFACE_("V"));
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_mirror_v", UI_ITEM_NONE, "", ICON_NONE);
   sub = &sub->row(true);
diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc
index 6b96375ec15..6dbd233157b 100644
--- a/source/blender/modifiers/intern/MOD_ui_common.cc
+++ b/source/blender/modifiers/intern/MOD_ui_common.cc
@@ -137,7 +137,7 @@ void modifier_vgroup_ui(uiLayout *layout,
   if (invert_vgroup_prop) {
     uiLayout *sub = &row->row(true);
     sub->active_set(has_vertex_group);
-    uiLayoutSetPropDecorate(sub, false);
+    sub->use_property_decorate_set(false);
     sub->prop(ptr, *invert_vgroup_prop, UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
   }
 }
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc
index 70f016e6bc6..454aa58adbe 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc
@@ -302,7 +302,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel)
 
   col = &layout->column(false, IFACE_("Group Add"));
   row = &col->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_add", UI_ITEM_NONE, "", ICON_NONE);
   sub = &sub->row(true);
@@ -313,7 +313,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel)
 
   col = &layout->column(false, IFACE_("Group Remove"));
   row = &col->row(true);
-  uiLayoutSetPropDecorate(row, false);
+  row->use_property_decorate_set(false);
   sub = &row->row(true);
   sub->prop(ptr, "use_remove", UI_ITEM_NONE, "", ICON_NONE);
   sub = &sub->row(true);
diff --git a/source/blender/nodes/composite/nodes/node_composite_file_output.cc b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
index caebba7c383..f4da840b242 100644
--- a/source/blender/nodes/composite/nodes/node_composite_file_output.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
@@ -332,7 +332,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
   {
     uiLayout *column = &layout->column(true);
     column->use_property_split_set(true);
-    uiLayoutSetPropDecorate(column, false);
+    column->use_property_decorate_set(false);
     column->prop(ptr, "save_as_render", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
   }
   const bool save_as_render = RNA_boolean_get(ptr, "save_as_render");
@@ -341,7 +341,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
   if (!save_as_render) {
     uiLayout *col = &layout->column(true);
     col->use_property_split_set(true);
-    uiLayoutSetPropDecorate(col, false);
+    col->use_property_decorate_set(false);
 
     PointerRNA linear_settings_ptr = RNA_pointer_get(&imfptr, "linear_colorspace_settings");
     col->prop(&linear_settings_ptr, "name", UI_ITEM_NONE, IFACE_("Color Space"), ICON_NONE);
@@ -451,7 +451,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
         {
           uiLayout *column = &layout->column(true);
           column->use_property_split_set(true);
-          uiLayoutSetPropDecorate(column, false);
+          column->use_property_decorate_set(false);
           column->prop(&active_input_ptr,
                        "save_as_render",
                        UI_ITEM_R_SPLIT_EMPTY_NAME,
@@ -467,7 +467,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi
         if (!use_color_management) {
           uiLayout *col = &layout->column(true);
           col->use_property_split_set(true);
-          uiLayoutSetPropDecorate(col, false);
+          col->use_property_decorate_set(false);
 
           PointerRNA linear_settings_ptr = RNA_pointer_get(&imfptr, "linear_colorspace_settings");
           col->prop(&linear_settings_ptr, "name", UI_ITEM_NONE, IFACE_("Color Space"), ICON_NONE);
diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
index 2250f17b389..ced2d5054cc 100644
--- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
+++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
@@ -28,7 +28,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->prop(ptr, "axis", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "pivot_axis", UI_ITEM_NONE, IFACE_("Pivot"), ICON_NONE);
 }
 
diff --git a/source/blender/nodes/function/nodes/node_fn_align_rotation_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_rotation_to_vector.cc
index 4d9c475cef3..379f9a52f9a 100644
--- a/source/blender/nodes/function/nodes/node_fn_align_rotation_to_vector.cc
+++ b/source/blender/nodes/function/nodes/node_fn_align_rotation_to_vector.cc
@@ -32,7 +32,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->prop(ptr, "axis", UI_ITEM_R_EXPAND, std::nullopt, ICON_NONE);
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "pivot_axis", UI_ITEM_NONE, IFACE_("Pivot"), ICON_NONE);
 }
 
diff --git a/source/blender/nodes/function/nodes/node_fn_format_string.cc b/source/blender/nodes/function/nodes/node_fn_format_string.cc
index 1654a98a7cc..af20c05126c 100644
--- a/source/blender/nodes/function/nodes/node_fn_format_string.cc
+++ b/source/blender/nodes/function/nodes/node_fn_format_string.cc
@@ -99,7 +99,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
     socket_items::ui::draw_active_item_props<FormatStringItemsAccessor>(
         tree, node, [&](PointerRNA *item_ptr) {
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
         });
   }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
index df6c8f4730a..8d7e66713df 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
@@ -60,7 +60,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "domain", UI_ITEM_NONE, "", ICON_NONE);
 }
 
@@ -86,7 +86,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
     socket_items::ui::draw_active_item_props<CaptureAttributeItemsAccessor>(
         tree, node, [&](PointerRNA *item_ptr) {
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "data_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
         });
   }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_bake.cc b/source/blender/nodes/geometry/nodes/node_geo_bake.cc
index 70de2c157c6..3fd2431321e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_bake.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_bake.cc
@@ -143,7 +143,7 @@ static void draw_bake_items(const bContext *C, uiLayout *layout, PointerRNA node
         tree, node, [&](PointerRNA *item_ptr) {
           const NodeGeometryBakeItem &active_item = storage.items[storage.active_index];
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
           if (socket_type_supports_fields(eNodeSocketDatatype(active_item.socket_type))) {
             panel->prop(item_ptr, "attribute_domain", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -800,7 +800,7 @@ void draw_bake_button_row(const BakeDrawContext &ctx, uiLayout *layout, const bo
 void draw_common_bake_settings(bContext *C, BakeDrawContext &ctx, uiLayout *layout)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiLayout *settings_col = &layout->column(false);
   settings_col->active_set(!ctx.is_baked);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_closure.cc b/source/blender/nodes/geometry/nodes/node_geo_closure.cc
index 51b721272f5..3690b9d0e73 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_closure.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_closure.cc
@@ -36,7 +36,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
   bNode &output_node = const_cast<bNode &>(*zone->output_node());
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   if (current_node->type_legacy == GEO_NODE_CLOSURE_INPUT) {
     if (uiLayout *panel = layout->panel(C, "input_items", false, TIP_("Input Items"))) {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_evaluate_closure.cc b/source/blender/nodes/geometry/nodes/node_geo_evaluate_closure.cc
index 4e12daa24c4..90c4c9513a1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_evaluate_closure.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_evaluate_closure.cc
@@ -89,7 +89,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
   bNode &node = *static_cast<bNode *>(ptr->data);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->op("node.sockets_sync", "Sync", ICON_FILE_REFRESH);
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
index c291b2a4c6c..ed9830a2daa 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
@@ -61,7 +61,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "mode", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_foreach_geometry_element.cc b/source/blender/nodes/geometry/nodes/node_geo_foreach_geometry_element.cc
index 006cfddaec1..278076e613f 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_foreach_geometry_element.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_foreach_geometry_element.cc
@@ -59,7 +59,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
       socket_items::ui::draw_active_item_props<ForeachGeometryElementInputItemsAccessor>(
           ntree, output_node, [&](PointerRNA *item_ptr) {
             panel->use_property_split_set(true);
-            uiLayoutSetPropDecorate(panel, false);
+            panel->use_property_decorate_set(false);
             panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
           });
     }
@@ -71,7 +71,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
       socket_items::ui::draw_active_item_props<ForeachGeometryElementMainItemsAccessor>(
           ntree, output_node, [&](PointerRNA *item_ptr) {
             panel->use_property_split_set(true);
-            uiLayoutSetPropDecorate(panel, false);
+            panel->use_property_decorate_set(false);
             panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
           });
     }
@@ -85,7 +85,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
             NodeForeachGeometryElementGenerationItem &active_item =
                 storage.generation_items.items[storage.generation_items.active_index];
             panel->use_property_split_set(true);
-            uiLayoutSetPropDecorate(panel, false);
+            panel->use_property_decorate_set(false);
             panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
             if (active_item.socket_type != SOCK_GEOMETRY) {
               panel->prop(item_ptr, "domain", UI_ITEM_NONE, std::nullopt, ICON_NONE);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_get_named_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_get_named_grid.cc
index 0a2c58c1fa0..c49b76db7f2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_get_named_grid.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_get_named_grid.cc
@@ -39,7 +39,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "data_type", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_gizmo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_gizmo_transform.cc
index 300cb5b63a7..53d32a480a3 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_gizmo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_gizmo_transform.cc
@@ -40,7 +40,7 @@ static void node_init(bNodeTree * /*tree*/, bNode *node)
 static void node_layout_ex(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   {
     uiLayout *row = &layout->column(true, IFACE_("Translation"));
diff --git a/source/blender/nodes/geometry/nodes/node_geo_grid_info.cc b/source/blender/nodes/geometry/nodes/node_geo_grid_info.cc
index 838a3237ed7..1b8982c3c51 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_grid_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_grid_info.cc
@@ -39,7 +39,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "data_type", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
index c79fc82c6e1..b04567c975e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
@@ -375,7 +375,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
     socket_items::ui::draw_active_item_props<MenuSwitchItemsAccessor>(
         tree, node, [&](PointerRNA *item_ptr) {
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "description", UI_ITEM_NONE, std::nullopt, ICON_NONE);
         });
   }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc
index e1ed678abfd..e3179dfbcfb 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc
@@ -34,7 +34,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "mode", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
index a9aab587e5d..dffa1426d9d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
@@ -39,7 +39,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "fill_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
index b6a1858e08b..dbff27da0ec 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
@@ -79,7 +79,7 @@ static void node_init(bNodeTree * /*tree*/, bNode *node)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "fill_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc
index 8cf7916c52a..1d89f119043 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc
@@ -65,7 +65,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "fill_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
index 9b06df64ea6..fd74eaed6ad 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@@ -47,7 +47,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "mode", UI_ITEM_NONE, "", ICON_NONE);
   if (RNA_enum_get(ptr, "mode") == GEO_NODE_MESH_LINE_MODE_END_POINTS) {
     layout->prop(ptr, "count_mode", UI_ITEM_NONE, "", ICON_NONE);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
index 556d04784d4..fdefbf161b4 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
@@ -50,7 +50,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "resolution_mode", UI_ITEM_NONE, IFACE_("Resolution"), ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
index 8b7715f873f..a3d2f2f4187 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
@@ -164,7 +164,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "resolution_mode", UI_ITEM_NONE, IFACE_("Resolution"), ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
index f2c90c399b5..773207212b1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
@@ -54,7 +54,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
     socket_items::ui::draw_active_item_props<RepeatItemsAccessor>(
         ntree, output_node, [&](PointerRNA *item_ptr) {
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
         });
   }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
index f78fe481b7e..ad3ad70363d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
@@ -193,7 +193,7 @@ static void draw_simulation_state(const bContext *C,
         ntree, output_node, [&](PointerRNA *item_ptr) {
           NodeSimulationItem &active_item = storage.items[storage.active_index];
           panel->use_property_split_set(true);
-          uiLayoutSetPropDecorate(panel, false);
+          panel->use_property_decorate_set(false);
           panel->prop(item_ptr, "socket_type", UI_ITEM_NONE, std::nullopt, ICON_NONE);
           if (socket_type_supports_fields(eNodeSocketDatatype(active_item.socket_type))) {
             panel->prop(item_ptr, "attribute_domain", UI_ITEM_NONE, std::nullopt, ICON_NONE);
@@ -230,7 +230,7 @@ static void node_layout_ex(uiLayout *layout, bContext *C, PointerRNA *current_no
   draw_simulation_state(C, layout, ntree, output_node);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->enabled_set(ID_IS_EDITABLE(ctx.object));
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc
index 7e94f7c72e6..d84be046d2e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc
@@ -42,7 +42,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "domain", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc
index 7477c69e3e5..ab24b2cdb0f 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc
@@ -47,7 +47,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "data_type", UI_ITEM_NONE, "", ICON_NONE);
   layout->prop(ptr, "domain", UI_ITEM_NONE, "", ICON_NONE);
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_grid.cc
index f35ef8b9503..dd4079ca0fd 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_store_named_grid.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_grid.cc
@@ -70,7 +70,7 @@ static void search_link_ops(GatherLinkSearchOpParams &params)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "data_type", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
index 51524559bd8..72b6a7dd612 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
@@ -63,7 +63,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   uiTemplateID(layout, C, ptr, "font", nullptr, "FONT_OT_open", "FONT_OT_unlink");
   layout->prop(ptr, "overflow", UI_ITEM_NONE, "", ICON_NONE);
   layout->prop(ptr, "align_x", UI_ITEM_NONE, "", ICON_NONE);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_tool_active_element.cc b/source/blender/nodes/geometry/nodes/node_geo_tool_active_element.cc
index 82298bfa9cc..90929c270d2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_tool_active_element.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_tool_active_element.cc
@@ -31,7 +31,7 @@ static void node_init(bNodeTree * /*tree*/, bNode *node)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "domain", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
index fb6a106da11..f46d986818f 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform_geometry.cc
@@ -49,7 +49,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "mode", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
index dc95b34033b..27b21844cbc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
@@ -41,7 +41,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "method", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index e204b754787..f4137ea98b3 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -64,7 +64,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "resolution_mode", UI_ITEM_NONE, IFACE_("Resolution"), ICON_NONE);
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_warning.cc b/source/blender/nodes/geometry/nodes/node_geo_warning.cc
index 311ace5612e..a24326ce96c 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_warning.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_warning.cc
@@ -72,7 +72,7 @@ class LazyFunctionForWarningNode : public LazyFunction {
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
   layout->prop(ptr, "warning_type", UI_ITEM_NONE, "", ICON_NONE);
 }
 
diff --git a/source/blender/nodes/intern/geometry_nodes_caller_ui.cc b/source/blender/nodes/intern/geometry_nodes_caller_ui.cc
index c0eb53c5f81..bfbc4a53959 100644
--- a/source/blender/nodes/intern/geometry_nodes_caller_ui.cc
+++ b/source/blender/nodes/intern/geometry_nodes_caller_ui.cc
@@ -226,7 +226,7 @@ static void add_layer_name_search_button(DrawGroupInputsContext &ctx,
     return;
   }
 
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiLayout *split = &layout->split(0.4f, false);
   uiLayout *name_row = &split->row(false);
@@ -414,7 +414,7 @@ static void add_attribute_search_or_value_buttons(DrawGroupInputsContext &ctx,
       "[\"{}{}\"]", BLI_str_escape(socket.identifier), nodes::input_attribute_name_suffix);
 
   /* We're handling this manually in this case. */
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   uiLayout *split = &layout->split(0.4f, false);
   uiLayout *name_row = &split->row(false);
@@ -489,7 +489,7 @@ static void draw_property_for_socket(DrawGroupInputsContext &ctx,
   }
 
   uiLayout *row = &layout->row(true);
-  uiLayoutSetPropDecorate(row, true);
+  row->use_property_decorate_set(true);
   row->active_set(ctx.input_is_active(socket));
 
   const std::string rna_path = fmt::format("[\"{}\"]", BLI_str_escape(identifier.c_str()));
@@ -802,7 +802,7 @@ static void draw_bake_panel(uiLayout *layout, PointerRNA *modifier_ptr)
 {
   uiLayout *col = &layout->column(false);
   col->use_property_split_set(true);
-  uiLayoutSetPropDecorate(col, false);
+  col->use_property_decorate_set(false);
   col->prop(modifier_ptr, "bake_target", UI_ITEM_NONE, std::nullopt, ICON_NONE);
   col->prop(modifier_ptr, "bake_directory", UI_ITEM_NONE, IFACE_("Bake Path"), ICON_NONE);
 }
@@ -937,7 +937,7 @@ void draw_geometry_nodes_modifier_ui(const bContext &C, PointerRNA *modifier_ptr
   layout.use_property_split_set(true);
   /* Decorators are added manually for supported properties because the
    * attribute/value toggle requires a manually built layout anyway. */
-  uiLayoutSetPropDecorate(&layout, false);
+  layout.use_property_decorate_set(false);
 
   if (!(nmd.flag & NODES_MODIFIER_HIDE_DATABLOCK_SELECTOR)) {
     const char *newop = (nmd.node_group == nullptr) ? "node.new_geometry_node_group_assign" :
@@ -1013,7 +1013,7 @@ void draw_geometry_nodes_operator_redo_ui(const bContext &C,
   layout.use_property_split_set(true);
   /* Decorators are added manually for supported properties because the
    * attribute/value toggle requires a manually built layout anyway. */
-  uiLayoutSetPropDecorate(&layout, false);
+  layout.use_property_decorate_set(false);
 
   tree.ensure_interface_cache();
   ctx.input_usages.reinitialize(tree.interface_inputs().size());
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index ecd93c79a84..3ddbfc1ed29 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -4020,7 +4020,7 @@ static void wm_clear_recent_files_ui(bContext * /*C*/, wmOperator *op)
 {
   uiLayout *layout = op->layout;
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   layout->separator();
   layout->prop(op->ptr, "remove", UI_ITEM_R_TOGGLE, std::nullopt, ICON_NONE);
diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc
index bcb8f121805..afa6ebc7441 100644
--- a/source/blender/windowmanager/intern/wm_stereo.cc
+++ b/source/blender/windowmanager/intern/wm_stereo.cc
@@ -363,7 +363,7 @@ void wm_stereo3d_set_draw(bContext * /*C*/, wmOperator *op)
       nullptr, &RNA_Stereo3dDisplay, &s3dd->stereo3d_format);
 
   layout->use_property_split_set(true);
-  uiLayoutSetPropDecorate(layout, false);
+  layout->use_property_decorate_set(false);
 
   col = &layout->column(false);
   col->prop(&stereo3d_format_ptr, "display_mode", UI_ITEM_NONE, std::nullopt, ICON_NONE);