Updated icons and directives