Latest round of bug fixes, new icons