[TASK] Add avatar to more places