Re-cleanup qt, fix systemtray issues, part2