diff --git a/AUTHORS b/AUTHORS
index bb33aa1a8..1d244af8b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,8 +10,7 @@ Lead Developers <transmission-dev@m0k.org>
 
 Project Contributors
         Nick Pucius  (Mac OS X Help documentation)
-        Hugo van Heuven, madebysofa  (Icon design, Mac toolbar icons)
-        Anthony Ryan  (Redesigned icon, Mac inspector icons)
+	Hugo van Heuven, madebysofa  (Main icon design)
 
 Translators
 Mac OS X, current release:
@@ -44,9 +43,9 @@ GTK+:
 Special Thanks
 
 Image Contributors
-        FOOOD
-        Martin Stadtmueller  (Icon tweaking)
+	Anthony Ryan  (Mac inspector icons)
 	Rick Patrick  (Toolbar icons)
+	FOOOD
         Mike Matas <http://www.mikematas.com/>  (Previous toolbar icons)
         Jonas Rask  (Globe icon)
         George Tsotsos
diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m
index a7b91ad68..707d7ea3e 100644
--- a/macosx/BadgeView.m
+++ b/macosx/BadgeView.m
@@ -64,7 +64,7 @@
     if (fQuitting)
     {
         #warning make better
-        [self badge: [NSImage imageNamed: @"UploadBadge"] string: @"Quitting" atHeight: 0.0];
+        //[self badge: [NSImage imageNamed: @"UploadBadge"] string: @"Quitting" atHeight: 0.0];
         return;
     }
     
@@ -72,9 +72,6 @@
         checkUpload = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"];
     if (checkDownload || checkUpload)
     {
-        //set upload and download rate badges
-        NSString * downloadRateString = nil, * uploadRateString = nil;
-        
         float downloadRate, uploadRate;
         tr_torrentRates(fLib, &downloadRate, &uploadRate);
         
diff --git a/macosx/Credits.rtf b/macosx/Credits.rtf
index 553cdedff..4a89cc11f 100644
--- a/macosx/Credits.rtf
+++ b/macosx/Credits.rtf
@@ -39,10 +39,7 @@ Lead Developers
 \fs20 \cf2   (Mac OS X Help documentation)\
 
 \fs24 \cf0 	Hugo van Heuven, madebysofa
-\fs20 \cf2   (Icon design, Mac toolbar icons)\
-
-\fs24 \cf0 	Anthony Ryan 
-\fs20 \cf2  (Redesigned icon, Mac inspector icons)
+\fs20 \cf2   (Main icon design)
 \fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
@@ -83,13 +80,19 @@ Lead Developers
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
 \fs24 \cf0 \
-Image Contributors\
+Image Contributors
+\b0\fs20 \cf2 \
 
-\b0 	FOOOD\
+\fs24 \cf0 	Anthony Ryan 
+\fs20 \cf2  (Mac inspector icons)
+\fs24 \cf0 \
 	Rick Patrick 
 \fs20 \cf2  (Toolbar icons)
 \b\fs24 \cf0 \
 
+\b0 	FOOOD
+\b \
+
 \b0 	Martin Stadtmueller 
 \fs20 \cf2  (Icon tweaking)
 \b\fs24 \cf0 \
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index ea20e7542..42a45cbbd 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,9 +9,7 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array>
-		<integer>1480</integer>
-	</array>
+	<array/>
 	<key>IBSystem Version</key>
 	<string>9B18</string>
 	<key>targetFramework</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index f8e202de5..9b2ae0d1f 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ