Fixed some icon problems