I'm glad at least part of the problem is gone now!

I'm about to call it a night, but I will look into the context menu/tray icon thing tomorrow.

If I find a fix for that I'll post it for you.