Merge "Updated delete icon" into pi-dev