More stupid bug fixes after xing icon additon!