Add icons to working set, fix #1