Button polish, delete trigger logic