modify icons
add some system collections support