Added ToolItem to WidgetResolver. Fixes #856