Change the X to a back icon in editing workflow

Change-Id: I9d029033ee26a300f6256a3840bd1c622d1d424d