code cleanup for IconsWindow