Fix icons and improve list view