Outline: improved origin tracking, follow restriction, icons