Merge systray icons

Also, catch a possible problem with the login answer from the
webapp and display a proper message