diff --git a/sphinx/themes/basic/static/comment-bright.png b/sphinx/themes/basic/static/comment-bright.png
new file mode 100644
index 000000000..551517b8c
Binary files /dev/null and b/sphinx/themes/basic/static/comment-bright.png differ
diff --git a/sphinx/themes/basic/static/websupport.js b/sphinx/themes/basic/static/websupport.js
index c4fa57555..99d1a2217 100644
--- a/sphinx/themes/basic/static/websupport.js
+++ b/sphinx/themes/basic/static/websupport.js
@@ -617,9 +617,14 @@
    */
   $.fn.comment = function() {
     return this.each(function() {
+      var id = $(this).attr('id').substring(1);
+      var count = COMMENT_METADATA[id]
+      var title = count + ' comment' + (count == 1 ? '' : 's');
+      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
       $(this).append(
 	$('<a href="#" class="sphinx_comment"></a>')
-	  .html('<img src="' + opts.commentImage + '" alt="comment" />')
+	  .html('<img src="' + image + '" alt="comment" />')
+	  .attr('title', title)
 	  .click(function(event) {
 	    event.preventDefault();
 	    show($(this).parent().attr('id'));
@@ -727,6 +732,7 @@
     rejectCommentURL: '/reject_comment',
     rejectCommentURL: '/delete_comment',
     commentImage: '/static/_static/comment.png',
+    commentBrightImage: '/static/_static/comment-bright.png',
     upArrow: '/static/_static/up.png',
     downArrow: '/static/_static/down.png',
     upArrowPressed: '/static/_static/up-pressed.png',
diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py
index 090fee1ad..76715d14a 100644
--- a/sphinx/websupport/__init__.py
+++ b/sphinx/websupport/__init__.py
@@ -371,6 +371,8 @@ class WebSupport(object):
         if self.staticdir != 'static':
             p = lambda file: '%s/_static/%s' % (self.staticdir, file)
             parts.append('commentImage: "/%s",' % p('comment.png') )
+            parts.append(
+                'commentBrightImage: "/%s",' % p('comment-bright.png') )
             parts.append('upArrow: "/%s",' % p('up.png'))
             parts.append('downArrow: "/%s",' % p('down.png'))
             parts.append('upArrowPressed: "/%s",' % p('up-pressed.png'))