Avatar shape—theme dependent

I’ll second (third? fourth? whateverth) that.