It would be nice if there was a separate eqipment slot for villagers based on their current role. At the moment it can be difficult for villagers to pick up and use the correct weapon or shield if they swap them out for 2 handed tools or dump them to pick up a different tool. If there was a slot for Worker tools and a different slot that became active when they were called to Arms or switched to a companion or guard, that would make it easier to control them.
For example I had a farmer who was also an archer, but they would dump their bow to collect a hoe for farming. Other workers would dump shields to pick up shovels etc.
It would be a nice feature if you could elect to have them carry a weapon / shield but it only becomes active if their role changes to a combat role. In that case the tool would become inactive. I have seen one Villager wade into battle with a shovel because that was what he had at the time he was called to arms, even though I pointed the squad to a weapon rack and told the squad to interact with it.