Updated with new icons