Replace icon fields with dropdown