Cleanup and new icons