--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -161,42 +161,55 @@
             </hbox>
           </deck>
         </groupbox>
         <groupbox id="syncOptions">
           <caption><label>&signedIn.settings.label;</label></caption>
           <description>&signedIn.settings.description;</description>
           <hbox id="fxaSyncEngines">
             <vbox flex="1">
-              <checkbox label="&engine.tabs.label2;"
-                        accesskey="&engine.tabs.accesskey;"
-                        preference="engine.tabs"/>
+              <!-- by design, no tooltip for bookmarks or history -->
               <checkbox label="&engine.bookmarks.label;"
                         accesskey="&engine.bookmarks.accesskey;"
                         preference="engine.bookmarks"/>
-              <checkbox label="&engine.logins.label;"
-                        accesskey="&engine.logins.accesskey;"
-                        preference="engine.passwords"/>
               <checkbox label="&engine.history.label;"
                         accesskey="&engine.history.accesskey;"
                         preference="engine.history"/>
+              <checkbox label="&engine.tabs.label2;"
+                        tooltiptext="&engine.tabs.title;"
+                        accesskey="&engine.tabs.accesskey;"
+                        preference="engine.tabs"/>
+              <checkbox label="&engine.logins.label;"
+                        tooltiptext="&engine.logins.title;"
+                        accesskey="&engine.logins.accesskey;"
+                        preference="engine.passwords"/>
             </vbox>
             <vbox flex="1">
+              <checkbox label="&engine.addresses.label;"
+                        accesskey="&engine.addresses.accesskey;"
+                        tooltiptext="&engine.addresses.title;"
+                        preference="engine.addresses"/>
+              <checkbox label="&engine.creditcards.label;"
+                        tooltiptext="&engine.creditcards.title;"
+                        accesskey="&engine.creditcards.accesskey;"
+                        preference="engine.creditcards"/>
               <checkbox label="&engine.addons.label;"
+                        tooltiptext="&engine.addons.title;"
                         accesskey="&engine.addons.accesskey;"
                         preference="engine.addons"/>
-              <checkbox label="&engine.prefs.label;"
+              <checkbox
+#ifdef XP_WIN
+                        label="&engine.prefsWin.label;"
+                        accesskey="&engine.prefsWin.accesskey;"
+#else
+                        label="&engine.prefs.label;"
                         accesskey="&engine.prefs.accesskey;"
+#endif
+                        tooltiptext="&engine.prefs.title;"
                         preference="engine.prefs"/>
-              <checkbox label="&engine.addresses.label;"
-                        accesskey="&engine.addresses.accesskey;"
-                        preference="engine.addresses"/>
-              <checkbox label="&engine.creditcards.label;"
-                        accesskey="&engine.creditcards.accesskey;"
-                        preference="engine.creditcards"/>
             </vbox>
             <spacer/>
           </hbox>
         </groupbox>
       </vbox>
     </hbox>
     <groupbox>
       <caption>

--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -1,29 +1,41 @@
 <!-- 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/. -->
 
 <!-- The page shown when logged in... -->
 
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
-<!ENTITY engine.tabs.label2         "Open Tabs">
+<!ENTITY engine.tabs.label2         "Open tabs">
+<!ENTITY engine.tabs.title          "A list of what’s open on all synced devices">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "History">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.logins.label        "Logins">
+<!ENTITY engine.logins.title        "Usernames and passwords you’ve saved">
 <!ENTITY engine.logins.accesskey    "L">
+<!-- On Windows we use the term "Options" to describe settings, but
+     on Linux and Mac OS X we use "Preferences" - carry that distinction
+     over into this string, used as the checkbox which indicates if prefs are synced
+-->
+<!ENTITY engine.prefsWin.label      "Options">
+<!ENTITY engine.prefsWin.accesskey  "S">
 <!ENTITY engine.prefs.label         "Preferences">
 <!ENTITY engine.prefs.accesskey     "S">
+<!ENTITY engine.prefs.title         "General, Privacy, and Security settings you’ve changed">
 <!ENTITY engine.addons.label        "Add-ons">
+<!ENTITY engine.addons.title        "Extensions and themes for Firefox desktop">
 <!ENTITY engine.addons.accesskey    "A">
 <!ENTITY engine.addresses.label     "Addresses">
+<!ENTITY engine.addresses.title     "Postal addresses you’ve saved (desktop only)">
 <!ENTITY engine.addresses.accesskey "e">
 <!ENTITY engine.creditcards.label   "Credit cards">
+<!ENTITY engine.creditcards.title   "Names, numbers and expiry dates (desktop only)">
 <!ENTITY engine.creditcards.accesskey "C">
 
 <!-- Device Settings -->
 <!ENTITY fxaSyncDeviceName.label       "Device Name">
 <!ENTITY changeSyncDeviceName2.label "Change Device Name…">
 <!ENTITY changeSyncDeviceName2.accesskey "h">
 <!ENTITY cancelChangeSyncDeviceName.label "Cancel">
 <!ENTITY cancelChangeSyncDeviceName.accesskey "n">