continued to reskin, added icons