Add icons and tidy up

Change-Id: Iacf1d8a87adbf751235743e4560046b7f836ac3b
Remove extraneous files

Change-Id: I341bf5c3ea3650298bd59b16a75fee35de8c7e7f