diff -r 5d4419042d9b -r e411ed7c5f10 ui/common/toolbar.c
--- a/ui/common/toolbar.c	Sun Dec 07 14:39:03 2025 +0100
+++ b/ui/common/toolbar.c	Sun Dec 07 15:23:03 2025 +0100
@@ -57,8 +57,8 @@
     newargs.tooltip = nl_strdup(args->tooltip);
     newargs.onclick = args->onclick;
     newargs.onclickdata = args->onclickdata;
-    newargs.groups = uic_copy_groups(args->groups, ngroups);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.states = uic_copy_states(args->states, ngroups);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }
 
@@ -78,8 +78,8 @@
     newargs.varname = nl_strdup(args->varname);
     newargs.onchange = args->onchange;
     newargs.onchangedata = args->onchangedata;
-    newargs.groups = uic_copy_groups(args->groups, ngroups);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.states = uic_copy_states(args->states, ngroups);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }
 
@@ -95,7 +95,7 @@
     newargs.label = nl_strdup(args->label);
     newargs.icon = nl_strdup(args->icon);
     newargs.tooltip = nl_strdup(args->tooltip);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }