added icons and templates