Re #1256 - root icon, scroll fixes