Revise custom avatar feature