Fixed a few icon problems