updated to include icons