Updated with icon based listview