Issue 5716 - Allow removal of avatar

Add class and style