diff --git a/web/src/components/core/Field.jsx b/web/src/components/core/Field.jsx
index 2d607d6653..93c2f26a44 100644
--- a/web/src/components/core/Field.jsx
+++ b/web/src/components/core/Field.jsx
@@ -103,10 +103,12 @@ const SwitchField = ({ isChecked = false, highlightContent = false, ...props })
 /**
  * @param {FieldProps & {isExpanded: boolean}} props
  */
-const ExpandableField = ({ isExpanded, ...props }) => {
+const ExpandableField = ({ label, isExpanded, ...props }) => {
+  const iconName = isExpanded ? "collapse_all" : "expand_all";
   const className = isExpanded ? "expanded" : "collapsed";
+  const iconizedLabel = <>{label} <Icon name={iconName} size="xs" /></>;
 
-  return <Field {...props} className={className} />;
+  return <Field {...props} label={iconizedLabel} className={className} />;
 };
 
 export default Field;