Add set field and fix icons