Fix issues about icon top