updated with icons