Redo icons for consitency

- Redo some of the icons for consistency
- Remove unused icons