SOC-3231, SOC-3233: incorrect UI of define avatar