-Correct some icon settings, still not complete