Index tweaks, icons