diff --git a/mozilla/camino/PreferencePanes/Downloads/English.lproj/Downloads.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Downloads/English.lproj/Downloads.nib/keyedobjects.nib
index 7c5febf2b91..0f9c6cf4f2e 100644
Binary files a/mozilla/camino/PreferencePanes/Downloads/English.lproj/Downloads.nib/keyedobjects.nib and b/mozilla/camino/PreferencePanes/Downloads/English.lproj/Downloads.nib/keyedobjects.nib differ
diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib
index ea2833cf95c..dd2acd223f6 100644
--- a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib
+++ b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib
@@ -14,10 +14,8 @@
         }, 
         {
             ACTIONS = {
-                checkboxClicked = id; 
                 checkboxStartPageClicked = id; 
                 checkboxUseSystemHomePageClicked = id; 
-                chooseDownloadFolder = id; 
                 clearDiskCache = id; 
                 clearGlobalHistory = id; 
                 historyDaysModified = id; 
@@ -28,8 +26,6 @@
                 checkboxNewTabBlank = NSButton; 
                 checkboxNewWindowBlank = NSButton; 
                 checkboxUseSystemHomePage = NSButton; 
-                mDownloadFolder = NSPopUpButton; 
-                mEnableHelperApps = NSButton; 
                 textFieldHistoryDays = NSTextField; 
                 textFieldHomePage = NSTextField; 
             }; 
diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib
index 63b0dcd6b07..1e137a1f35e 100644
--- a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib
+++ b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib
@@ -8,15 +8,15 @@
 	<string>364.0</string>
 	<key>IBGroupedObjects</key>
 	<dict>
-		<key>5</key>
+		<key>8</key>
 		<array>
-			<string>12</string>
-			<string>24</string>
-			<string>56</string>
+			<string>331</string>
+			<string>321</string>
+			<string>334</string>
 		</array>
 	</dict>
 	<key>IBLastGroupID</key>
-	<string>8</string>
+	<string>9</string>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>5</integer>
diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib
index 7c1e90c5823..3cc155fb281 100644
Binary files a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib and b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib differ
diff --git a/mozilla/camino/PreferencePanes/Tabs/English.lproj/Tabs.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Tabs/English.lproj/Tabs.nib/keyedobjects.nib
index d16dd612d1e..00ad8757bb4 100644
Binary files a/mozilla/camino/PreferencePanes/Tabs/English.lproj/Tabs.nib/keyedobjects.nib and b/mozilla/camino/PreferencePanes/Tabs/English.lproj/Tabs.nib/keyedobjects.nib differ
diff --git a/mozilla/camino/PreferencePanes/Tabs/Tabs.mm b/mozilla/camino/PreferencePanes/Tabs/Tabs.mm
index a8de6c5048b..650cfc4ab4b 100644
--- a/mozilla/camino/PreferencePanes/Tabs/Tabs.mm
+++ b/mozilla/camino/PreferencePanes/Tabs/Tabs.mm
@@ -51,7 +51,6 @@
 
 - (IBAction)checkboxClicked:(id)sender
 {
-  NSLog(@"called mofo");
   if (!mPrefService)
     return;