Remove some Code Duplication in regards to Killing MC and updating Tray
Icon