Finished base toolbars & tools, updated icons