Changed the delete_icon form and queries