diff --git a/NEWS b/NEWS
index a6bcdbb56..a7dc46593 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ NEWS file for Transmission <http://transmission.m0k.org/>
 
 1.00 (zzzz/xx/yy)
 - All Platforms:
-   + UPnP now performed with MiniUPnP
+   + UPnP now performed by MiniUPnP
 - OS X:
    + Leopard: Time Machine will ignore incomplete downloads
    + Pieces Bar (return of Advanced Bar)
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9307e1a93..2cede3e42 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1856,11 +1856,15 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         [tempTorrents setArray: fTorrents];
     
     //set buttons with counts
-    #warning reimplement
-    /*[fNoFilterButton setCount: [fTorrents count]];
-    [fDownloadFilterButton setCount: downloading];
-    [fSeedFilterButton setCount: seeding];
-    [fPauseFilterButton setCount: paused];*/
+    #warning make better
+    [fNoFilterButton setToolTip: [fTorrents count] == 1 ? NSLocalizedString(@"1 Transfer", "Filter Button -> tool tip")
+        : [NSString stringWithFormat: NSLocalizedString(@"%d Transfers", "Filter Bar Button -> tool tip"), [fTorrents count]]];
+    [fDownloadFilterButton setToolTip: downloading == 1 ? NSLocalizedString(@"1 Transfer", "Filter Button -> tool tip")
+        : [NSString stringWithFormat: NSLocalizedString(@"%d Transfers", "Filter Bar Button -> tool tip"), downloading]];
+    [fSeedFilterButton setToolTip: seeding == 1 ? NSLocalizedString(@"1 Transfer", "Filter Button -> tool tip")
+        : [NSString stringWithFormat: NSLocalizedString(@"%d Transfers", "Filter Bar Button -> tool tip"), seeding]];
+    [fPauseFilterButton setToolTip: paused == 1 ? NSLocalizedString(@"1 Transfer", "Filter Button -> tool tip")
+        : [NSString stringWithFormat: NSLocalizedString(@"%d Transfers", "Filter Bar Button -> tool tip"), paused]];
     
     NSString * searchString = [fSearchFilterField stringValue];
     if ([searchString length] > 0)