Allow avatar_icon to operate on a User

If the User object is already known before calling this method being
able to re-use said object can save us an extra SQL query.