#2353 - fix resizing, icon, other issues.