Fixed things, broke things, added missing icons