add tray class and icons
fix window state
fix state, new initialization, bitmaps
Merge branch 'andrew'