Fix busted data source dropdown
Add icons for chart types