Merge "Replace cancel button with a delete icon." into sc-dev