Merge "postEdit: Use standard close icon"