Move trayicon code to own file (same class)