the firefox.ico is not the official firefox art, so i think we'd be better served by it getting a new name: /browser/app/firefox.ico /browser/app/firefox-os2.ico /browser/app/macbuild/firefox.icns

The icon name doesn't show up in the final build, does it? I think this is an internal build-filename detail and is therefore unrelated to trademarks. The fact that we always name the final executable "firefox" is more interesting, IMO... but that decision was also made for technical reasons, such as testing the installer when building nightly builds (which don't have official branding).

since it ends up internally in the app, can't we rename the cvs file to browser.ico? it's basically a false positive and confusing when i browse the repository.

Confirming...

While this bug refers to a different file, I'm going to dupe it against bug 356543 so we have a common place to track the issue of trademarks/branding names in filenames.