Fix edit list regression, update icons