TDS/TCR - Update icons; TCR: Add more metadata, update Search Service.