MIGR-124 WIP; Improve icons.