diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 9ef087011..6c2efd2dd 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -59,6 +59,7 @@
         {
             ACTIONS = {
                 folderSheetShow = id; 
+                setBadge = id; 
                 setDownloadLocation = id; 
                 setLimitUploadCheck = id; 
                 setPort = id; 
@@ -69,6 +70,9 @@
             CLASS = PrefsController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                fBadgeCompletedCheck = NSButton; 
+                fBadgeDownloadRateCheck = NSButton; 
+                fBadgeUploadRateCheck = NSButton; 
                 fBlankView = NSView; 
                 fFolderPopUp = NSPopUpButton; 
                 fGeneralView = NSView; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 51dd74185..8a256cea8 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -15,25 +15,16 @@
 		<key>589</key>
 		<string>54 521 112 118 0 0 1152 842 </string>
 		<key>783</key>
-		<string>410 477 420 155 0 0 1280 832 </string>
+		<string>386 439 470 231 0 0 1280 832 </string>
 		<key>796</key>
-		<string>410 490 420 129 0 0 1280 832 </string>
+		<string>412 490 470 129 0 0 1280 832 </string>
 		<key>825</key>
-		<string>543 501 155 107 0 0 1280 832 </string>
+		<string>544 501 155 107 0 0 1280 832 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>443.0</string>
 	<key>IBOldestOS</key>
 	<integer>3</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>29</integer>
-		<integer>825</integer>
-		<integer>796</integer>
-		<integer>781</integer>
-		<integer>21</integer>
-		<integer>783</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>8G32</string>
 </dict>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index f79a2fa28..ade233f17 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 3f895ec43..6aa89108c 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -35,11 +35,15 @@
     IBOutlet NSView         * fBlankView;
     
     IBOutlet NSPopUpButton  * fFolderPopUp;
+    IBOutlet NSButton       * fQuitCheck;
+    IBOutlet NSButton       * fRemoveCheck;
+    IBOutlet NSButton       * fBadgeCompletedCheck;
+    IBOutlet NSButton       * fBadgeDownloadRateCheck;
+    IBOutlet NSButton       * fBadgeUploadRateCheck;                            
+
     IBOutlet NSTextField    * fPortField;
     IBOutlet NSButton       * fUploadCheck;
     IBOutlet NSTextField    * fUploadField;
-    IBOutlet NSButton       * fQuitCheck;
-    IBOutlet NSButton       * fRemoveCheck;
     
     IBOutlet NSWindow       * fWindow;
 
@@ -49,12 +53,14 @@
 
 - (void) setPrefsWindow: (tr_handle_t *) handle;
 
-- (void) setLimitUploadCheck:   (id) sender;
-- (void) setPort:               (id) sender;
-- (void) setUploadLimit:        (id) sender;
 - (void) setQuitMessage:        (id) sender;
-- (void) setRemoveMessage:  (id) sender;
+- (void) setRemoveMessage:      (id) sender;
+- (void) setBadge:              (id) sender;
 - (void) setDownloadLocation:   (id) sender;
 - (void) folderSheetShow:       (id) sender;
 
+- (void) setLimitUploadCheck:   (id) sender;
+- (void) setPort:               (id) sender;
+- (void) setUploadLimit:        (id) sender;
+
 @end
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 56817fd23..d52fa8d43 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -123,6 +123,11 @@
         NSOnState : NSOffState];
     [fRemoveCheck setState: [fDefaults boolForKey: @"CheckRemove"] ?
         NSOnState : NSOffState];
+
+    //set dock badging
+    [fBadgeCompletedCheck setState: [fDefaults boolForKey: @"BadgeCompleted"]];
+    [fBadgeDownloadRateCheck setState: [fDefaults boolForKey: @"BadgeDownloadRate"]];
+    [fBadgeUploadRateCheck setState: [fDefaults boolForKey: @"BadgeUploadRate"]];
 }
 
 - (NSToolbarItem *) toolbar: (NSToolbar *) t itemForItemIdentifier:
@@ -238,6 +243,19 @@
         forKey: @"CheckRemove"];
 }
 
+- (void) setBadge: (id) sender
+{   
+    BOOL state = [sender state];
+    
+    if (sender == fBadgeCompletedCheck)
+        [fDefaults setBool: state forKey: @"BadgeCompleted"];
+    else if (sender == fBadgeDownloadRateCheck)
+        [fDefaults setBool: state forKey: @"BadgeDownloadRate"];
+    else if (sender == fBadgeUploadRateCheck)
+        [fDefaults setBool: state forKey: @"BadgeUploadRate"];
+    else;
+}
+
 - (void) setDownloadLocation: (id) sender
 {
     //Download folder