diff --git a/camino/BrowserWindow.nib/info.nib b/camino/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/camino/BrowserWindow.nib/info.nib
+++ b/camino/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/camino/BrowserWindow.nib/objects.nib and b/camino/BrowserWindow.nib/objects.nib differ
diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj
index 89a85859c84b..3c5d9f42a1cb 100644
--- a/camino/Chimera.pbproj/project.pbxproj
+++ b/camino/Chimera.pbproj/project.pbxproj
@@ -466,6 +466,7 @@
 				F541496502714F9A01A80166,
 				F5DA444B027DD5AA01A80166,
 				F5179420027F3F2901A967DF,
+				F5179423028275B901A967DF,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -967,6 +968,17 @@
 			settings = {
 			};
 		};
+		F5179422028275B801A967DF = {
+			isa = PBXFileReference;
+			path = globe_ico.tif;
+			refType = 4;
+		};
+		F5179423028275B901A967DF = {
+			fileRef = F5179422028275B801A967DF;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F51842F30206168101A966FE = {
 			children = (
 				F5DE10E60209DC0601A967DF,
@@ -2139,6 +2151,7 @@
 				F5DAB15402698D5401A80166,
 				F541496202714F9A01A80166,
 				F541496302714F9A01A80166,
+				F5179422028275B801A967DF,
 			);
 			isa = PBXGroup;
 			name = Sidebar;
diff --git a/camino/English.lproj/BrowserWindow.nib/info.nib b/camino/English.lproj/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/camino/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/English.lproj/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/camino/English.lproj/BrowserWindow.nib/objects.nib and b/camino/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/English.lproj/MainMenu.nib/objects.nib b/camino/English.lproj/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/camino/English.lproj/MainMenu.nib/objects.nib and b/camino/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/camino/MainController.mm b/camino/MainController.mm
index 510fa98e0f97..b236f381296e 100644
--- a/camino/MainController.mm
+++ b/camino/MainController.mm
@@ -108,7 +108,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   // Now open the new window.
   BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
-  [controller focusURLBar];
+  if ([[mPreferenceManager homePage] isEqualToString: @"about:blank"])
+    [controller focusURLBar];
+  else
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
 }	
 
 -(IBAction)newTab:(id)aSender
diff --git a/camino/MainMenu.nib/objects.nib b/camino/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/camino/MainMenu.nib/objects.nib and b/camino/MainMenu.nib/objects.nib differ
diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj
index 89a85859c84b..3c5d9f42a1cb 100644
--- a/camino/projects/Chimera.pbproj/project.pbxproj
+++ b/camino/projects/Chimera.pbproj/project.pbxproj
@@ -466,6 +466,7 @@
 				F541496502714F9A01A80166,
 				F5DA444B027DD5AA01A80166,
 				F5179420027F3F2901A967DF,
+				F5179423028275B901A967DF,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -967,6 +968,17 @@
 			settings = {
 			};
 		};
+		F5179422028275B801A967DF = {
+			isa = PBXFileReference;
+			path = globe_ico.tif;
+			refType = 4;
+		};
+		F5179423028275B901A967DF = {
+			fileRef = F5179422028275B801A967DF;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F51842F30206168101A966FE = {
 			children = (
 				F5DE10E60209DC0601A967DF,
@@ -2139,6 +2151,7 @@
 				F5DAB15402698D5401A80166,
 				F541496202714F9A01A80166,
 				F541496302714F9A01A80166,
+				F5179422028275B801A967DF,
 			);
 			isa = PBXGroup;
 			name = Sidebar;
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/camino/src/application/MainController.mm b/camino/src/application/MainController.mm
index 510fa98e0f97..b236f381296e 100644
--- a/camino/src/application/MainController.mm
+++ b/camino/src/application/MainController.mm
@@ -108,7 +108,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   // Now open the new window.
   BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
-  [controller focusURLBar];
+  if ([[mPreferenceManager homePage] isEqualToString: @"about:blank"])
+    [controller focusURLBar];
+  else
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
 }	
 
 -(IBAction)newTab:(id)aSender
diff --git a/chimera/BrowserWindow.nib/info.nib b/chimera/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/chimera/BrowserWindow.nib/info.nib
+++ b/chimera/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/chimera/BrowserWindow.nib/objects.nib and b/chimera/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj
index 89a85859c84b..3c5d9f42a1cb 100644
--- a/chimera/Chimera.pbproj/project.pbxproj
+++ b/chimera/Chimera.pbproj/project.pbxproj
@@ -466,6 +466,7 @@
 				F541496502714F9A01A80166,
 				F5DA444B027DD5AA01A80166,
 				F5179420027F3F2901A967DF,
+				F5179423028275B901A967DF,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -967,6 +968,17 @@
 			settings = {
 			};
 		};
+		F5179422028275B801A967DF = {
+			isa = PBXFileReference;
+			path = globe_ico.tif;
+			refType = 4;
+		};
+		F5179423028275B901A967DF = {
+			fileRef = F5179422028275B801A967DF;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F51842F30206168101A966FE = {
 			children = (
 				F5DE10E60209DC0601A967DF,
@@ -2139,6 +2151,7 @@
 				F5DAB15402698D5401A80166,
 				F541496202714F9A01A80166,
 				F541496302714F9A01A80166,
+				F5179422028275B801A967DF,
 			);
 			isa = PBXGroup;
 			name = Sidebar;
diff --git a/chimera/English.lproj/BrowserWindow.nib/info.nib b/chimera/English.lproj/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/chimera/English.lproj/BrowserWindow.nib/info.nib
+++ b/chimera/English.lproj/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/English.lproj/MainMenu.nib/objects.nib b/chimera/English.lproj/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/chimera/English.lproj/MainMenu.nib/objects.nib and b/chimera/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/chimera/MainController.mm b/chimera/MainController.mm
index 510fa98e0f97..b236f381296e 100644
--- a/chimera/MainController.mm
+++ b/chimera/MainController.mm
@@ -108,7 +108,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   // Now open the new window.
   BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
-  [controller focusURLBar];
+  if ([[mPreferenceManager homePage] isEqualToString: @"about:blank"])
+    [controller focusURLBar];
+  else
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
 }	
 
 -(IBAction)newTab:(id)aSender
diff --git a/chimera/MainMenu.nib/objects.nib b/chimera/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/chimera/MainMenu.nib/objects.nib and b/chimera/MainMenu.nib/objects.nib differ
diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj
index 89a85859c84b..3c5d9f42a1cb 100644
--- a/chimera/projects/Chimera.pbproj/project.pbxproj
+++ b/chimera/projects/Chimera.pbproj/project.pbxproj
@@ -466,6 +466,7 @@
 				F541496502714F9A01A80166,
 				F5DA444B027DD5AA01A80166,
 				F5179420027F3F2901A967DF,
+				F5179423028275B901A967DF,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -967,6 +968,17 @@
 			settings = {
 			};
 		};
+		F5179422028275B801A967DF = {
+			isa = PBXFileReference;
+			path = globe_ico.tif;
+			refType = 4;
+		};
+		F5179423028275B901A967DF = {
+			fileRef = F5179422028275B801A967DF;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F51842F30206168101A966FE = {
 			children = (
 				F5DE10E60209DC0601A967DF,
@@ -2139,6 +2151,7 @@
 				F5DAB15402698D5401A80166,
 				F541496202714F9A01A80166,
 				F541496302714F9A01A80166,
+				F5179422028275B801A967DF,
 			);
 			isa = PBXGroup;
 			name = Sidebar;
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 1581fb684c7d..037de0015849 100644
--- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>124</key>
 		<string>431 537 170 180 0 0 1152 746 </string>
 		<key>160</key>
-		<string>454 70 195 666 0 0 1152 746 </string>
+		<string>478 70 195 666 0 0 1152 746 </string>
 		<key>28</key>
 		<string>454 268 195 457 0 0 1152 746 </string>
 		<key>297</key>
@@ -25,7 +25,7 @@
 		<key>475</key>
 		<string>493 338 207 230 0 0 1152 746 </string>
 		<key>56</key>
-		<string>380 463 343 68 0 0 1152 746 </string>
+		<string>404 484 343 68 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
@@ -45,8 +45,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>297</integer>
 		<integer>160</integer>
+		<integer>56</integer>
+		<integer>297</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index cb1a721b71c5..420c8380135e 100644
Binary files a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib
index f6bc61273734..92699d39a290 100644
Binary files a/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/chimera/src/application/MainController.mm b/chimera/src/application/MainController.mm
index 510fa98e0f97..b236f381296e 100644
--- a/chimera/src/application/MainController.mm
+++ b/chimera/src/application/MainController.mm
@@ -108,7 +108,10 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
 
   // Now open the new window.
   BrowserWindowController* controller = [self openBrowserWindowWithURLString: [mPreferenceManager homePage]];
-  [controller focusURLBar];
+  if ([[mPreferenceManager homePage] isEqualToString: @"about:blank"])
+    [controller focusURLBar];
+  else
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
 }	
 
 -(IBAction)newTab:(id)aSender