added icons/changed title
Merge branch 'janes-branch'