Fixed icon bugs