feature icons and some bug fixes