Fixes a crash and updates a couple of icons