Abstract out IconifiedListItem; various fixes