diff --git a/macosx/Controller.m b/macosx/Controller.m
index 97fdfd81d..976c9d82f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1590,8 +1590,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     
     [self setWindowSizeToFit];
     
-    //resize for larger min height
-    if (!makeSmall && contentSize.height < contentMinSize.height)
+    //resize for larger min height if not set to auto size
+    if (!makeSmall && ![fDefaults boolForKey: @"AutoSize"] && contentSize.height < contentMinSize.height)
     {
         NSRect frame = [fWindow frame];
         float heightChange = contentMinSize.height - contentSize.height;
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 91184950e..415d22dd4 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -7,7 +7,7 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1041</key>
-		<string>344 478 208 130 0 0 1152 842 </string>
+		<string>439 418 208 130 0 0 1152 842 </string>
 		<key>1480</key>
 		<string>366 546 420 63 0 0 1152 842 </string>
 		<key>1603</key>
@@ -31,9 +31,9 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1041</integer>
-		<integer>21</integer>
+		<integer>1480</integer>
 		<integer>29</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8J135</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 2ca77f867..c19183d3c 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/Transmission Help/gfx/TransIcon.gif b/macosx/Transmission Help/gfx/TransIcon.gif
index 75137b77f..48be78681 100644
Binary files a/macosx/Transmission Help/gfx/TransIcon.gif and b/macosx/Transmission Help/gfx/TransIcon.gif differ