Updated infrastructure; added icons.