Merge branch 'master' into marcus
Some icon errors fixed
Workspace problems as usual - fixed