Add icons and tidy up

Change-Id: Iacf1d8a87adbf751235743e4560046b7f836ac3b
Merge "Add icons and tidy up" into cm-11.0