[TASK] Fluidification of Avatar.php