Preliminary support for chart, new icons