Fixing annotation icon issues