Added icons, fixed cache indicator bug