Refactors added mac tray.