Clean up, add missing icon