diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 6f74cf94..de2394fa 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -463,10 +463,10 @@ var showUnreadBadgeWindows = function(unreadCount, mentionCount) {
 
   if (mentionCount > 0) {
     const dataURL = badge.createDataURL(mentionCount.toString(), "#FF1744", "#580817"); // Material Red A400
-    sendBadge(dataURL, 'You have unread mention (' + mentionCount + ')');
+    sendBadge(dataURL, 'You have unread mentions (' + mentionCount + ')');
   } else if (unreadCount > 0) {
     const dataURL = badge.createDataURL('•', "#00e5ff", "#06545D"); // Material Cyan A400
-    sendBadge(dataURL, 'You have unread channels');
+    sendBadge(dataURL, 'You have unread channels (' + unreadCount + ')');
   } else {
     sendBadge(null, 'You have no unread messages');
   }
diff --git a/src/main.js b/src/main.js
index 2efb71f0..baa80e49 100644
--- a/src/main.js
+++ b/src/main.js
@@ -201,12 +201,15 @@ app.on('ready', function() {
 
       if (arg.mentionCount > 0) {
         trayIcon.setImage(trayImages.mention);
+        trayIcon.setToolTip(arg.mentionCount + ' unread mentions');
       }
       else if (arg.unreadCount > 0) {
         trayIcon.setImage(trayImages.unread);
+        trayIcon.setToolTip(arg.unreadCount + ' unread channels');
       }
       else {
         trayIcon.setImage(trayImages.normal);
+        trayIcon.setToolTip(app.getName());
       }
     });
   }