Fix missing icon in one case.
Merge latest from dev.