diff --git a/CHANGELOG b/CHANGELOG
index 27c4558e..9b3a63f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v 2.5.0
+  - unread count is now displayed in a favicon badge when supported
+
 v 2.4.0
   - users were not able to change password or delete account
   - fix api key generation
@@ -51,4 +54,4 @@ v2.0.0
   - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
     See the README on how to build CommaFeed from now on.
   - CommaFeed should no longer fetch the same feed multiple times in a row  
-  - Users can use their username or email to log in  
\ No newline at end of file
+  - Users can use their username or email to log in  
diff --git a/bower.json b/bower.json
index 7b2fb50a..49db3f0c 100644
--- a/bower.json
+++ b/bower.json
@@ -28,7 +28,8 @@
     "devicejs": "0.2.4",
     "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
     "zocial-less": "1.0.0",
-	"swagger-ui": "2.1.0"
+	"swagger-ui": "2.1.0",
+	"tinycon": "0.6.5"
   },
   "resolutions": {
     "angular": "1.3.14",
diff --git a/src/main/app/index.html b/src/main/app/index.html
index 2ffbe649..9da12ba3 100644
--- a/src/main/app/index.html
+++ b/src/main/app/index.html
@@ -70,6 +70,7 @@
 	<script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script>
 	<script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script>
 	<script type="text/javascript" src="lib/devicejs/lib/device.js"></script>
+	<script type="text/javascript" src="lib/tinycon/tinycon.js"></script>
 	
 	<script type="text/javascript" src="js/controllers.js"></script>
 	<script type="text/javascript" src="js/directives.js"></script>
diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js
index 6e7c16c8..c14e54d7 100644
--- a/src/main/app/js/controllers.js
+++ b/src/main/app/js/controllers.js
@@ -194,11 +194,7 @@ module.controller('CategoryTreeCtrl', [
 			};
 
 			$scope.$watch(rootUnreadCount, function(value) {
-				var label = 'CommaFeed';
-				if (value > 0) {
-					label = '(' + value + ') ' + label;
-				}
-				$window.document.title = label;
+				Tinycon.setBubble(value);
 			});
 
 			var mark = function(node, entry) {