Fix choice icon edit event
Fix layout