New Icons and higlight fix