Add tree avatar. Issue #435.
Merge branch 'dev-newavatars' into sta