Redo icons for consitency

- Redo some of the icons for consistency
- Remove unused icons
Merge branch 'master' into ST2