New icons, some bug fixes