Get rid of images-NEXT; fix path to Echo icon

Change-Id: I059a258b9b53c5147df74f4c157606b0a6768694