Support deletion and add delete icon