Better icons and types