Improved Users/avatar tool and Avatar->displayName