Fixed misc icon issues