New icons.
Minor refactoring.