--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -9,17 +9,22 @@
 <?xml-stylesheet href="chrome://global/skin/"?>
 
 <prefwindow id="ConnectionsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&connectionsDialog.title;"
             dlgbuttons="accept,cancel,help"
             onbeforeaccept="return gConnectionsDialog.beforeAccept();"
             onload="gConnectionsDialog.checkForSystemProxy();"
-            ondialoghelp="openPrefsHelp()">
+            ondialoghelp="openPrefsHelp()"
+#ifdef XP_MACOSX
+            style="width: &window.macWidth2; !important;">
+#else
+            style="width: &window.width2; !important;">
+#endif
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
   <prefpane id="ConnectionsDialogPane"
             class="largeDialogContainer"
             helpTopic="prefs-connection-settings">
 
     <preferences>

--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -5,17 +5,17 @@
 browser.jar:
     content/browser/preferences/applicationManager.xul
     content/browser/preferences/applicationManager.js
     content/browser/preferences/blocklists.xul
     content/browser/preferences/blocklists.js
 *   content/browser/preferences/colors.xul
 *   content/browser/preferences/cookies.xul
     content/browser/preferences/cookies.js
-    content/browser/preferences/connection.xul
+*   content/browser/preferences/connection.xul
     content/browser/preferences/connection.js
     content/browser/preferences/donottrack.xul
 *   content/browser/preferences/fonts.xul
     content/browser/preferences/fonts.js
     content/browser/preferences/handlers.xml
     content/browser/preferences/handlers.css
 *   content/browser/preferences/languages.xul
     content/browser/preferences/languages.js

--- a/browser/locales/en-US/chrome/browser/preferences/connection.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/connection.dtd
@@ -1,14 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY  connectionsDialog.title       "Connection Settings">
+<!ENTITY  window.width2                 "49em">
+<!ENTITY  window.macWidth2              "44em">
 
 <!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
 <!ENTITY  noProxyTypeRadio.label        "No proxy">
 <!ENTITY  noProxyTypeRadio.accesskey    "y">
 <!ENTITY  systemTypeRadio.label         "Use system proxy settings">
 <!ENTITY  systemTypeRadio.accesskey     "u">
 <!ENTITY  WPADTypeRadio.label           "Auto-detect proxy settings for this network">
 <!ENTITY  WPADTypeRadio.accesskey       "w">

--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -23,19 +23,21 @@ this.Preferences = {
       ["paneApplications", null],
       ["panePrivacy", null],
       ["panePrivacy", null, DNTDialog],
       ["paneSecurity", null],
       ["paneSync", null],
       ["paneAdvanced", "generalTab"],
       ["paneAdvanced", "dataChoicesTab"],
       ["paneAdvanced", "networkTab"],
+      ["paneAdvanced", "networkTab", connectionDialog],
       ["paneAdvanced", "updateTab"],
       ["paneAdvanced", "encryptionTab"],
       ["paneAdvanced", "encryptionTab", certManager],
+      ["paneAdvanced", "encryptionTab", deviceManager],
     ];
     for (let [primary, advanced, customFn] of panes) {
       let configName = primary.replace(/^pane/, "prefs") + (advanced ? "-" + advanced : "");
       if (customFn) {
         configName += "-" + customFn.name;
       }
       this.configurations[configName] = {};
       this.configurations[configName].applyConfig = prefHelper.bind(null, primary, advanced, customFn);
@@ -94,13 +96,25 @@ function paintPromise(browserWindow) {
 }
 
 function* DNTDialog(aBrowser) {
   yield ContentTask.spawn(aBrowser, null, function* () {
     content.document.getElementById("doNotTrackSettings").click();
   });
 }
 
+function* connectionDialog(aBrowser) {
+  yield ContentTask.spawn(aBrowser, null, function* () {
+    content.document.getElementById("connectionSettings").click();
+  });
+}
+
 function* certManager(aBrowser) {
   yield ContentTask.spawn(aBrowser, null, function* () {
     content.document.getElementById("viewCertificatesButton").click();
   });
 }
+
+function* deviceManager(aBrowser) {
+  yield ContentTask.spawn(aBrowser, null, function* () {
+    content.document.getElementById("viewSecurityDevicesButton").click();
+  });
+}

--- a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY devmgr.title                           "Device Manager">
-<!-- LOCALIZATION NOTE (devmgr.style): This is CSS style for Device Manager
+<!-- LOCALIZATION NOTE (devmgr.style2): This is CSS style for Device Manager
      window size. Don't translate "width" nor "height". Adjust the numbers
      to make window contents fit. -->
-<!ENTITY devmgr.style                           "width: 52em; height: 32em;">
+<!ENTITY devmgr.style2                          "width: 67em; height: 32em;">
 
 <!ENTITY devmgr.devlist.label                   "Security Modules and Devices">
 <!ENTITY devmgr.details.title                   "Details">
 <!ENTITY devmgr.details.title2                  "Value">
 
 <!ENTITY devmgr.button.login.label              "Log In">
 <!ENTITY devmgr.button.login.accesskey          "n">
 <!ENTITY devmgr.button.logout.label             "Log Out">

--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -9,81 +9,81 @@
 <!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
 %deviceManangerDTD;
 <!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
 %pippkiDTD;
 ]>
 
 <dialog id="devicemanager"
 	windowtype="mozilla:devicemanager"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&devmgr.title;"
-        style="&devmgr.style;"
+        style="&devmgr.style2;"
         persist="screenX screenY width height"
         onload="LoadModules();"
         onunload="DeregisterSmartCardObservers();"
         buttons="accept">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
   <stringbundle id="pipnss_bundle" src="chrome://pipnss/locale/pipnss.properties"/>
 </stringbundleset>
 
 <script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
 <grid flex="1" style="margin:5px">
   <columns>
-    <column flex="1"/> 
-    <column flex="3"/> 
+    <column flex="1"/>
+    <column flex="3"/>
     <column/>
   </columns>
   <rows>
     <row flex="1">
       <vbox> <!-- List of devices -->
         <tree id="device_tree" seltype="single"
               onselect="enableButtons();" hidecolumnpicker="true"
               flex="1" style="min-width: 15em">
-          <treecols> 
+          <treecols>
             <treecol id="deviceCol" flex="1" primary="true" label="&devmgr.devlist.label;"/>
           </treecols>
           <treechildren id="device_list"/>
         </tree>
       </vbox> <!-- / List of devices -->
       <vbox> <!-- Device status -->
         <tree id="info_tree" seltype="single" hidecolumnpicker="true"
               flex="1" style="min-width: 10em">
-          <treecols> 
-            <treecol id="title1Col" flex="5" primary="true" label="&devmgr.details.title;"/> 
-            <treecol id="title2Col" flex="7" label="&devmgr.details.title2;"/> 
+          <treecols>
+            <treecol id="title1Col" flex="5" primary="true" label="&devmgr.details.title;"/>
+            <treecol id="title2Col" flex="7" label="&devmgr.details.title2;"/>
           </treecols>
           <treechildren id="info_list"/>
         </tree>
       </vbox> <!-- / Device status -->
       <vbox> <!-- Buttons for manipulating devices -->
-        <button id="login_button" 
+        <button id="login_button"
                 label="&devmgr.button.login.label;"
                 accesskey="&devmgr.button.login.accesskey;"
-                oncommand="doLogin();" disabled="true"/> 
-        <button id="logout_button" 
+                oncommand="doLogin();" disabled="true"/>
+        <button id="logout_button"
                 label="&devmgr.button.logout.label;"
                 accesskey="&devmgr.button.logout.accesskey;"
-                oncommand="doLogout();" disabled="true"/> 
-        <button id="change_pw_button" 
+                oncommand="doLogout();" disabled="true"/>
+        <button id="change_pw_button"
                 label="&devmgr.button.changepw.label;"
                 accesskey="&devmgr.button.changepw.accesskey;"
-                oncommand="changePassword();" disabled="true"/> 
-        <button id="load_button" 
+                oncommand="changePassword();" disabled="true"/>
+        <button id="load_button"
                 label="&devmgr.button.load.label;"
                 accesskey="&devmgr.button.load.accesskey;"
-                oncommand="doLoad();"/> 
-        <button id="unload_button" 
+                oncommand="doLoad();"/>
+        <button id="unload_button"
                 label="&devmgr.button.unload.label;"
                 accesskey="&devmgr.button.unload.accesskey;"
-                oncommand="doUnload();" disabled="true"/> 
-        <button id="fipsbutton" 
+                oncommand="doUnload();" disabled="true"/>
+        <button id="fipsbutton"
                 label=""
                 accesskey="&devmgr.button.fips.accesskey;"
                 oncommand="toggleFIPS();"/>
       </vbox> <!-- / Buttons for manipulating devices -->
     </row>
   </rows>
 </grid>