Readded DEFAULT_ICON_ROOT temporarily, to repair PR ordering issue