=== renamed file '128/unity-webapps-hotmail.png' => '128/unity-webapps-outlook.png'
=== renamed file '48/unity-webapps-hotmail.png' => '48/unity-webapps-outlook.png'
=== renamed file '52/unity-webapps-hotmail.png' => '52/unity-webapps-outlook.png'
=== renamed file '64/unity-webapps-hotmail.png' => '64/unity-webapps-outlook.png'
=== modified file 'LiveMail.user.js'
--- LiveMail.user.js	2013-09-12 13:05:29 +0000
+++ LiveMail.user.js	2014-04-30 07:22:32 +0000
@@ -11,11 +11,20 @@
 
 window.Unity = external.getUnityObject(1);
 function isOutlook() {
-    return document.getElementById('folderListControlUl');
+    return document.getElementById('inboxControl0f') !== null;
 }
 
 function getOutlookInboxCountNode() {
-    return document.evaluate('//ul[@id="folderListControlUl"]/li[1]', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
+    return document.evaluate('//*[@id="inboxControl0f"]//*[contains(@title, "Inbox")]', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
+}
+
+function getOutlookInboxCount() {
+    var node = getOutlookInboxCountNode();
+    var match = node.title.match(/.*\s+(\d*)/);
+    if (match === null) {
+        return '0';
+    }
+    return match[1];
 }
 
 function getHotmailInboxCountNode() {
@@ -32,7 +41,7 @@
 
     try {
         if (isOutlook()) {
-            inboxCount = getOutlookInboxCountNode().getAttribute('count');
+            inboxCount = getOutlookInboxCount();
         } else {
             inboxCount = getHotmailInboxCountNode().textContent.match(/\d+/)[0];
             messageCount = getHotmailMessagesCountNode().textContent.match(/\d+/)[0];
@@ -56,7 +65,7 @@
 
 function isCorrectPage() {
     if (isOutlook()) {
-        return getOutlookInboxCountNode();
+        return getOutlookInboxCountNode() !== null;
     }
 
     // fall back on hotmail
@@ -67,7 +76,9 @@
     var checkMessagesCount = wrapCallback(function () {
         var d = getMailDataForPage();
         Unity.MessagingIndicator.showIndicator("Inbox", { count: d.inbox });
-        Unity.MessagingIndicator.showIndicator("Messenger", { count: d.messages });
+        if (!isOutlook()) {
+            Unity.MessagingIndicator.showIndicator("Messenger", { count: d.messages });
+        }
     });
 
     checkMessagesCount();
@@ -84,6 +95,6 @@
     Unity.init({ name: "LiveMail",
                  domain: 'mail.live.com',
                  homepage: 'http://mail.live.com',
-                 iconUrl: "icon://unity-webapps-hotmail",
+                 iconUrl: "icon://unity-webapps-outlook",
                  onInit: wrapCallback(messagingIndicatorSetup) });
 }, 1000);

=== modified file 'LiveMailmaillivecom.desktop'
--- LiveMailmaillivecom.desktop	2013-09-24 16:17:48 +0000
+++ LiveMailmaillivecom.desktop	2014-04-30 07:22:32 +0000
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=LiveMail
 Type=Application
-Icon=unity-webapps-livemail
+Icon=unity-webapps-outlook
 MimeType=
 Actions=S0;S1;S2;S3;S4;S5;S6;S7;S8;S9;S10;
 Exec=unity-webapps-runner -n 'TGl2ZU1haWw=' -d 'mail.live.com' %u
 StartupWMClass=LiveMailmaillivecom
-    
\ No newline at end of file
+

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-24 22:19:17 +0000
+++ debian/changelog	2014-04-30 07:22:32 +0000
@@ -1,3 +1,9 @@
+unity-webapps-livemail (2.4.17+13.10.20130924.2-0ubuntu2) saucy; urgency=medium
+
+  * Rename and fix icon details.
+
+ -- Justin McPherson <justin.mcpherson@canonical.com>  Wed, 30 Apr 2014 17:13:43 +1000
+
 unity-webapps-livemail (2.4.16+13.10.20130924.2-0ubuntu1) saucy; urgency=low
 
   [ Alexandre Abreu ]

=== modified file 'debian/install'
--- debian/install	2013-09-24 16:17:48 +0000
+++ debian/install	2014-04-30 07:22:32 +0000
@@ -1,9 +1,9 @@
 LiveMail.user.js usr/share/unity-webapps/userscripts/unity-webapps-livemail
-128/unity-webapps-hotmail.png usr/share/icons/unity-webapps-applications/128/apps
-48/unity-webapps-hotmail.png usr/share/icons/hicolor/48x48/apps
-48/unity-webapps-hotmail.png usr/share/icons/unity-webapps-applications/48/apps
-52/unity-webapps-hotmail.png usr/share/icons/unity-webapps-applications/52/apps
-64/unity-webapps-hotmail.png usr/share/icons/unity-webapps-applications/64/apps
+128/unity-webapps-outlook.png usr/share/icons/unity-webapps-applications/128/apps
+48/unity-webapps-outlook.png usr/share/icons/hicolor/48x48/apps
+48/unity-webapps-outlook.png usr/share/icons/unity-webapps-applications/48/apps
+52/unity-webapps-outlook.png usr/share/icons/unity-webapps-applications/52/apps
+64/unity-webapps-outlook.png usr/share/icons/unity-webapps-applications/64/apps
 manifest.json usr/share/unity-webapps/userscripts/unity-webapps-livemail
 
 LiveMailmaillivecom.desktop usr/share/applications

=== modified file 'manifest.json'
--- manifest.json	2013-03-26 15:50:21 +0000
+++ manifest.json	2014-04-30 07:22:32 +0000
@@ -1,1 +1,1 @@
-{"includes":["http://*.live.com/*","https://*.live.com/*"],"requires":["utils.js"],"name":"LiveMail","scripts":["LiveMail.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.3","package-name":"LiveMail","icons":{"128":"128/unity-webapps-hotmail.png","48":"48/unity-webapps-hotmail.png","52":"52/unity-webapps-hotmail.png","64":"64/unity-webapps-hotmail.png"},"domain":"mail.live.com","homepage":"http://mail.live.com", "license": "GPL-3"}
+{"includes":["http://*.live.com/*","https://*.live.com/*"],"requires":["utils.js"],"name":"LiveMail","scripts":["LiveMail.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.3","package-name":"LiveMail","icons":{"128":"128/unity-webapps-outlook.png","48":"48/unity-webapps-outlook.png","52":"52/unity-webapps-outlook.png","64":"64/unity-webapps-outlook.png"},"domain":"mail.live.com","homepage":"http://mail.live.com", "license": "GPL-3"}