Update icons, fixed a couple of bugs