New icon, plus some bug fixes