New icons & cleanup