Change array key from 'icon' to 'image'.
Merge branch 'tng' into rework-sorting