Updated use of new icons