--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -259,16 +259,25 @@ var gPrivacyPane = {
     let pkiBundle = document.getElementById("pkiBundle");
     appendSearchKeywords("passwordExceptions", [
       bundlePrefs.getString("savedLoginsExceptions_title"),
       bundlePrefs.getString("savedLoginsExceptions_desc2"),
     ]);
     appendSearchKeywords("showPasswords", [
       signonBundle.getString("loginsDescriptionAll2"),
     ]);
+    appendSearchKeywords("cookieExceptions", [
+      bundlePrefs.getString("cookiepermissionstext"),
+    ]);
+    appendSearchKeywords("showCookiesButton", [
+      bundlePrefs.getString("cookiesAll"),
+      bundlePrefs.getString("removeAllCookies.label"),
+      bundlePrefs.getString("removeAllShownCookies.label"),
+      bundlePrefs.getString("removeSelectedCookies.label"),
+    ]);
     appendSearchKeywords("trackingProtectionExceptions", [
       bundlePrefs.getString("trackingprotectionpermissionstitle"),
       bundlePrefs.getString("trackingprotectionpermissionstext2"),
     ]);
     appendSearchKeywords("changeBlockList", [
       bundlePrefs.getString("blockliststitle"),
       bundlePrefs.getString("blockliststext"),
     ]);

--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -310,35 +310,49 @@
                     preference="browser.formfill.enable"/>
           <hbox id="cookiesBox">
             <checkbox id="acceptCookies" label="&acceptCookies2.label;"
                       preference="network.cookie.cookieBehavior"
                       accesskey="&acceptCookies2.accesskey;"
                       onsyncfrompreference="return gPrivacyPane.readAcceptCookies();"
                       onsynctopreference="return gPrivacyPane.writeAcceptCookies();"
                       flex="1" />
-            <button id="cookieExceptions"
-                    class="accessory-button"
-                    label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
-                    preference="pref.privacy.disable_button.cookie_exceptions"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="cookieExceptions"
+                      class="accessory-button"
+                      label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
+                      preference="pref.privacy.disable_button.cookie_exceptions"
+                      searchkeywords="&address2.label;
+                                      &block.label;
+                                      &session.label;
+                                      &allow.label;
+                                      &removepermission2.label;
+                                      &removeallpermissions2.label;
+                                      &button.cancel.label;
+                                      &button.ok.label;"/>
+            </hbox>
           </hbox>
           <hbox id="acceptThirdPartyRow"
                 class="indent"
                 align="center">
             <label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
                    accesskey="&acceptThirdParty2.pre.accesskey;">&acceptThirdParty2.pre.label;</label>
-            <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
-            onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
-            onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
-              <menupopup>
-                <menuitem label="&acceptThirdParty.always.label;" value="always"/>
-                <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
-                <menuitem label="&acceptThirdParty.never.label;" value="never"/>
-              </menupopup>
-            </menulist>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
+              onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
+              onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
+                <menupopup>
+                  <menuitem label="&acceptThirdParty.always.label;" value="always"/>
+                  <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
+                  <menuitem label="&acceptThirdParty.never.label;" value="never"/>
+                </menupopup>
+              </menulist>
+            </hbox>
           </hbox>
           <hbox id="keepRow"
                 class="indent"
                 align="center">
             <label id="keepUntil"
                    control="keepCookiesUntil"
                    accesskey="&keepUntil2.accesskey;">&keepUntil2.label;</label>
             <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
@@ -347,32 +361,49 @@
                         preference="network.cookie.lifetimePolicy">
                 <menupopup>
                   <menuitem label="&expire.label;" value="0"/>
                   <menuitem label="&close.label;" value="2"/>
                 </menupopup>
               </menulist>
             </hbox>
             <spacer flex="1"/>
-            <button id="showCookiesButton"
-                    class="accessory-button"
-                    label="&showCookies.label;" accesskey="&showCookies.accesskey;"
-                    preference="pref.privacy.disable_button.view_cookies"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="showCookiesButton"
+                      class="accessory-button"
+                      label="&showCookies.label;"
+                      accesskey="&showCookies.accesskey;"
+                      preference="pref.privacy.disable_button.view_cookies"/>
+            </hbox>
           </hbox>
           <hbox id="clearDataBox"
                 align="center">
             <checkbox id="alwaysClear"
                       preference="privacy.sanitize.sanitizeOnShutdown"
                       label="&clearOnClose.label;"
                       accesskey="&clearOnClose.accesskey;"
                       flex="1" />
-            <button id="clearDataSettings"
-                    class="accessory-button"
-                    label="&clearOnCloseSettings.label;"
-                    accesskey="&clearOnCloseSettings.accesskey;"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="clearDataSettings"
+                      class="accessory-button"
+                      label="&clearOnCloseSettings.label;"
+                      accesskey="&clearOnCloseSettings.accesskey;"
+                      searchkeywords="&clearDataSettings2.label;
+                                      &historySection.label;
+                                      &itemHistoryAndDownloads.label;
+                                      &itemCookies.label;
+                                      &itemActiveLogins.label;
+                                      &itemCache.label;
+                                      &itemFormSearchHistory.label;
+                                      &dataSection.label;
+                                      &itemSitePreferences.label;
+                                      &itemOfflineApps.label;"/>
+            </hbox>
           </hbox>
         </vbox>
       </vbox>
     </vbox>
   </deck>
 </groupbox>
 
 <!-- Address Bar -->