Reworks some of the look, adds updated icon