diff --git a/release/datafiles/locale b/release/datafiles/locale
index 63699f96834..716dc02ec30 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 63699f968344db7dc853d2c5972325beea44900c
+Subproject commit 716dc02ec30c0810513f7b4adc4ae865ae50c4e6
diff --git a/release/scripts/addons b/release/scripts/addons
index 4d53ec76a3d..787ea78f7fa 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4d53ec76a3d8b0a72fcc7a795067a159ce6dcd2c
+Subproject commit 787ea78f7fa6f0373d80ba1247768402df93f8ad
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 1bfd82cc790..1ba7a4a5413 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -599,21 +599,22 @@ class MESH_UL_color_attributes(UIList, ColorAttributesListBase):
         split.emboss = 'NONE'
         split.prop(attribute, "name", text="")
 
-        active_render = _index == data.color_attributes.render_color_index
-
-        props = split.operator(
-            "geometry.color_attribute_render_set",
-            text="",
-            icon='RESTRICT_RENDER_OFF' if active_render else 'RESTRICT_RENDER_ON',
-        )
-
-        props.name = attribute.name
-
         sub = split.row()
         sub.alignment = 'RIGHT'
         sub.active = False
         sub.label(text="%s ▶ %s" % (domain_name, data_type.name))
 
+        active_render = _index == data.color_attributes.render_color_index
+        
+        row = layout.row()
+        row.emboss = 'NONE'
+        prop = row.operator(
+            "geometry.color_attribute_render_set",
+            text="",
+            icon='RESTRICT_RENDER_OFF' if active_render else 'RESTRICT_RENDER_ON',
+        )
+        prop.name = attribute.name
+
 
 class MESH_UL_color_attributes_selector(UIList, ColorAttributesListBase):
     def draw_item(self, _context, layout, data, attribute, _icon, _active_data, _active_propname, _index):
diff --git a/source/tools b/source/tools
index f4af5ed5a70..1e658ca996f 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit f4af5ed5a705c5d048b137ba56a6cf9295681ec5
+Subproject commit 1e658ca996f11e5ff3398d89bd81f5b719304a57