added icons and types