Patch 1/17
Added avatar support.
Updated icons (cleaner)
Fixes #22