Integrated new icons, see #35.