Update icons for TableView, some improvement code