Feature/user icons

WIP