ClassIcon, TreeNode, Bugfixes