#66 Added Icon and ToolbarButton