I think I wasn't clear, from a filesize perspective, the ideal class markup would be

```html
<div class="avatar"></div>  <!-- SQUARE -->
<div class="avatar avatar--round"></div>  <!-- CIRCLE -->
```

This would require all current instances of `class="avatar"` to be changed to `class="avatar avatar--round"` or whatever the round version is called.

Either way, it would probably be ideal if every avatar-related element got the base class plus a variant instead of just a variant class. Makes things easier and lighter-weight on the CSS side.

I'll make some changes and update the PR