rebase the changes onto the current master branch
Merge pull request #24 from debrief/issue11_tidying2

issue11 - new set of icons.