Updated to use new icons and icon names