Drawer's avatar image lacks styling

For the default avatar the styling is fine, but if you add a new image with the attachment selector, the styling (class="avatar avatar_120") is missing.

The Drawer's avatar is set in drawer.vm
https://github.com/xwiki/xwiki-platform/blob/master/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm

while the macro definition is in macros.vm
https://github.com/xwiki/xwiki-platform/blob/master/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm