--- a/browser/components/preferences/preferences.xul
+++ b/browser/components/preferences/preferences.xul
@@ -79,22 +79,22 @@
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
             title="&prefWindow.titleGNOME;"
 #endif
 #endif
 #endif
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 #ifdef USE_WIN_TITLE_STYLE
-            style="&prefWin.styleWin2;">
+            style="&prefWinMinSize.styleWin;">
 #else
 #ifdef XP_MACOSX
-            style="&prefWin.styleMac2;">
+            style="&prefWinMinSize.styleMac;">
 #else
-            style="&prefWin.styleGNOME2;">
+            style="&prefWinMinSize.styleGNOME;">
 #endif
 #endif
 
     <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundlePreferences"
                   src="chrome://browser/locale/preferences/preferences.properties"/>

--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -1,16 +1,16 @@
 
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
-<!ENTITY  prefWin.styleWin2       "width: 42em; min-height: 39em;">
-<!ENTITY  prefWin.styleMac2       "width: 47em; min-height: 40em;">
-<!ENTITY  prefWin.styleGNOME2     "width: 42em; min-height: 39.5em;">
+<!ENTITY  prefWinMinSize.styleWin       "width: 42em; min-height: 39em;">
+<!ENTITY  prefWinMinSize.styleMac       "width: 47em; min-height: 40em;">
+<!ENTITY  prefWinMinSize.styleGNOME     "width: 45.5em; min-height: 40.5em;">
 
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneTabs.title          "Tabs">
 <!ENTITY  paneContent.title       "Content">
 <!ENTITY  paneApplications.title  "Applications">
 <!ENTITY  panePrivacy.title       "Privacy">
 <!ENTITY  paneSecurity.title      "Security">
 <!ENTITY  paneAdvanced.title      "Advanced">