Hopefully fixed some icon problems