Extra Language Icons for new node

Hi,

I've set up a Drupal 6 site with I18n translations, and for the most part it's working perfectly. I'm using the Language Icons block to display language flags, and have hidden the language links at the bottom of the nodes.

I'm having one issue with the appearance of flags.

When I create a new node, it shows the language icons for all four languages my site is translated to. However, three of them will link to pages that don't give a very satisfactory result.

So for example, if I create a node in English (i've checked the language is English, not language neutral) with a URL of mysite.com/en/content/testpage, the German link will be something like mysite.com/de/node/42. Clicking on this link will take me to the English page, with German menus, however the Primary Links menu disappears, which is not very satisfactory as that's the main way users will navigate the site.

When I add a translation, the extra language icons disappear, and only the ones with translations remain, which I think is the correct Drupal behavior. Is there a way I can make the site behave like that for untranslated pages?

Second problem: Just to throw another spanner in the works, my client has requested that if a page hasn't been translated, he'd still like to display all language icons, but have the untranslated ones link to the languages home page. Can anyone suggest how I might achieve this?

Thanks!