* Style fixes.
Revert "Revert "Clean up obsolete icons""

This reverts commit c04875503f089cddf99868b3e211be8950e4d8d2.