diff --git a/.cargo/config.in b/.cargo/config.in
index d60f3c36cc9c..7fa81e05b905 100644
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -9,7 +9,7 @@ replace-with = 'vendored-sources'
 
 [source."https://github.com/gankro/serde"]
 git = "https://github.com/gankro/serde"
-branch = "deserialize_from_enums3"
+branch = "deserialize_from_enums4"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 00b907106880..ca5cb32cdd01 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1114,11 +1114,6 @@ BrowserGlue.prototype = {
     // early, so we use a maximum timeout for it.
     Services.tm.idleDispatchToMainThread(() => {
       SafeBrowsing.init();
-
-      // Login reputation depends on the Safe Browsing API.
-      let reputationService = Cc["@mozilla.org/reputationservice/login-reputation-service;1"]
-        .getService(Ci.nsILoginReputationService);
-      reputationService.init();
     }, 5000);
 
     if (AppConstants.MOZ_CRASHREPORTER) {
diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_addFolderDefaultButton.js b/browser/components/places/tests/browser/browser_bookmarkProperties_addFolderDefaultButton.js
index feaca6209019..880b78646c8f 100644
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_addFolderDefaultButton.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_addFolderDefaultButton.js
@@ -17,7 +17,7 @@ add_task(async function() {
   await withSidebarTree("bookmarks", async function(tree) {
     // Select the new bookmark in the sidebar.
     tree.selectItems([newBookmark.guid]);
-    ok(tree.controller.isCommandEnabled("placesCmd_new:folder"),
+    Assert.ok(tree.controller.isCommandEnabled("placesCmd_new:folder"),
        "'placesCmd_new:folder' on current selected node is enabled");
 
     // Create a new folder.  Since the new bookmark is selected, and new items
diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js b/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js
index 812baa73c2bd..0e93e7de92ce 100644
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js
@@ -18,14 +18,14 @@ add_task(async function() {
 
     await withBookmarksDialog(true, AddKeywordForSearchField, async function(dialogWin) {
       let acceptBtn = dialogWin.document.documentElement.getButton("accept");
-      ok(acceptBtn.disabled, "Accept button is disabled");
+      Assert.ok(acceptBtn.disabled, "Accept button is disabled");
 
       let promiseKeywordNotification = PlacesTestUtils.waitForNotification(
         "onItemChanged", (itemId, prop, isAnno, val) => prop == "keyword" && val == "kw");
 
       fillBookmarkTextField("editBMPanel_keywordField", "kw", dialogWin);
 
-      ok(!acceptBtn.disabled, "Accept button is enabled");
+      Assert.ok(!acceptBtn.disabled, "Accept button is enabled");
 
       // The dialog is instant apply.
       await promiseKeywordNotification;
@@ -37,18 +37,18 @@ add_task(async function() {
         entry = await PlacesUtils.keywords.fetch("kw");
         return !!entry;
       }, "Unable to find the expected keyword");
-      is(entry.keyword, "kw", "keyword is correct");
-      is(entry.url.href, TEST_URL, "URL is correct");
-      is(entry.postData, "accenti%3D%E0%E8%EC%F2%F9&search%3D%25s", "POST data is correct");
+      Assert.equal(entry.keyword, "kw", "keyword is correct");
+      Assert.equal(entry.url.href, TEST_URL, "URL is correct");
+      Assert.equal(entry.postData, "accenti%3D%E0%E8%EC%F2%F9&search%3D%25s", "POST data is correct");
 
       info("Check the charset has been saved");
       let charset = await PlacesUtils.getCharsetForURI(NetUtil.newURI(TEST_URL));
-      is(charset, "windows-1252", "charset is correct");
+      Assert.equal(charset, "windows-1252", "charset is correct");
 
       // Now check getShortcutOrURI.
       let data = await getShortcutOrURIAndPostData("kw test");
-      is(getPostDataString(data.postData), "accenti=\u00E0\u00E8\u00EC\u00F2\u00F9&search=test", "getShortcutOrURI POST data is correct");
-      is(data.url, TEST_URL, "getShortcutOrURI URL is correct");
+      Assert.equal(getPostDataString(data.postData), "accenti=\u00E0\u00E8\u00EC\u00F2\u00F9&search=test", "getShortcutOrURI POST data is correct");
+      Assert.equal(data.url, TEST_URL, "getShortcutOrURI URL is correct");
     }, closeHandler);
   });
 });
diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_addLivemark.js b/browser/components/places/tests/browser/browser_bookmarkProperties_addLivemark.js
index 9af6dbbb9620..b60c6413be21 100644
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_addLivemark.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_addLivemark.js
@@ -4,8 +4,7 @@ add_task(async function() {
   info("Add a live bookmark editing its data");
 
   await withSidebarTree("bookmarks", async function(tree) {
-    let itemId = PlacesUIUtils.leftPaneQueries.UnfiledBookmarks;
-    tree.selectItems([itemId]);
+    tree.selectItems([PlacesUtils.bookmarks.unfiledGuid]);
 
     await withBookmarksDialog(
       true,
@@ -26,13 +25,13 @@ add_task(async function() {
           index: PlacesUtils.bookmarks.DEFAULT_INDEX
         });
 
-        is(bookmark.title, "modified", "folder name has been edited");
+        Assert.equal(bookmark.title, "modified", "folder name has been edited");
 
         let livemark = await PlacesUtils.livemarks.getLivemark({
           guid: bookmark.guid
         });
-        is(livemark.feedURI.spec, "http://livemark.com/", "livemark has the correct url");
-        is(livemark.title, "modified", "livemark has the correct title");
+        Assert.equal(livemark.feedURI.spec, "http://livemark.com/", "livemark has the correct url");
+        Assert.equal(livemark.title, "modified", "livemark has the correct title");
       }
     );
   });
diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js b/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
index 63f87a340362..0ee4e4a07b2a 100644
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js
@@ -22,7 +22,7 @@ add_task(async function() {
     },
     async dialog => {
       let acceptBtn = dialog.document.documentElement.getButton("accept");
-      ok(!acceptBtn.disabled, "Accept button is enabled");
+      Assert.ok(!acceptBtn.disabled, "Accept button is enabled");
 
       let namepicker = dialog.document.getElementById("editBMPanel_namePicker");
       Assert.ok(!namepicker.readOnly, "Name field is writable");
@@ -36,7 +36,7 @@ add_task(async function() {
     },
     dialog => {
       let savedItemId = dialog.gEditItemOverlay.itemId;
-      ok(savedItemId > 0, "Found the itemId");
+      Assert.ok(savedItemId > 0, "Found the itemId");
       return PlacesTestUtils.waitForNotification("onItemRemoved",
                                                  id => id === savedItemId);
     }
diff --git a/browser/components/places/tests/browser/browser_bookmarkProperties_readOnlyRoot.js b/browser/components/places/tests/browser/browser_bookmarkProperties_readOnlyRoot.js
index 18d0472eb67a..71a648f5826f 100644
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_readOnlyRoot.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_readOnlyRoot.js
@@ -4,10 +4,9 @@ add_task(async function() {
   info("Bug 479348 - Properties on a root should be read-only.");
 
   await withSidebarTree("bookmarks", async function(tree) {
-    let itemId = PlacesUIUtils.leftPaneQueries.UnfiledBookmarks;
-    tree.selectItems([itemId]);
-    ok(tree.controller.isCommandEnabled("placesCmd_show:info"),
-       "'placesCmd_show:info' on current selected node is enabled");
+    tree.selectItems([PlacesUtils.bookmarks.unfiledGuid]);
+    Assert.ok(tree.controller.isCommandEnabled("placesCmd_show:info"),
+              "'placesCmd_show:info' on current selected node is enabled");
 
     await withBookmarksDialog(
       true,
@@ -16,26 +15,24 @@ add_task(async function() {
       },
       async function test(dialogWin) {
         // Check that the dialog is read-only.
-        ok(dialogWin.gEditItemOverlay.readOnly, "Dialog is read-only");
+        Assert.ok(dialogWin.gEditItemOverlay.readOnly, "Dialog is read-only");
         // Check that accept button is disabled
         let acceptButton = dialogWin.document.documentElement.getButton("accept");
-        ok(acceptButton.disabled, "Accept button is disabled");
+        Assert.ok(acceptButton.disabled, "Accept button is disabled");
 
         // Check that name picker is read only
         let namepicker = dialogWin.document.getElementById("editBMPanel_namePicker");
-        ok(namepicker.readOnly, "Name field is read-only");
-        is(namepicker.value,
-           PlacesUtils.bookmarks.getItemTitle(PlacesUtils.unfiledBookmarksFolderId),
-           "Node title is correct");
+        Assert.ok(namepicker.readOnly, "Name field is read-only");
+        let bookmark = await PlacesUtils.bookmarks.fetch(PlacesUtils.bookmarks.unfiledGuid);
+        Assert.equal(namepicker.value, bookmark.title, "Node title is correct");
         // Blur the field and ensure root's name has not been changed.
         namepicker.blur();
-        is(namepicker.value,
-           PlacesUtils.bookmarks.getItemTitle(PlacesUtils.unfiledBookmarksFolderId),
-           "Root title is correct");
+        bookmark = await PlacesUtils.bookmarks.fetch(PlacesUtils.bookmarks.unfiledGuid);
+        Assert.equal(namepicker.value, bookmark.title, "Root title is correct");
         // Check the shortcut's title.
-        let bookmark = await PlacesUtils.bookmarks.fetch(tree.selectedNode.bookmarkGuid);
-        is(bookmark.title, "",
-           "Shortcut title is null");
+        info(tree.selectedNode.bookmarkGuid);
+        bookmark = await PlacesUtils.bookmarks.fetch(tree.selectedNode.bookmarkGuid);
+        Assert.equal(bookmark.title, "", "Shortcut title is null");
       }
     );
   });
diff --git a/browser/extensions/activity-stream/css/activity-stream-linux.css b/browser/extensions/activity-stream/css/activity-stream-linux.css
index 03192a28a0e3..54edcb10fc0a 100644
--- a/browser/extensions/activity-stream/css/activity-stream-linux.css
+++ b/browser/extensions/activity-stream/css/activity-stream-linux.css
@@ -407,6 +407,8 @@ main {
         white-space: nowrap; }
       .top-sites-list .top-site-outer .title.pinned span {
         padding: 0 13px; }
+    .top-sites-list .top-site-outer .edit-button {
+      background-image: url("../data/content/assets/glyph-edit-16.svg"); }
     .top-sites-list .top-site-outer .edit-menu {
       background: #FFF;
       border: 1px solid #B1B1B3;
diff --git a/browser/extensions/activity-stream/css/activity-stream-mac.css b/browser/extensions/activity-stream/css/activity-stream-mac.css
index 4f8412e290e6..1f53de25f865 100644
--- a/browser/extensions/activity-stream/css/activity-stream-mac.css
+++ b/browser/extensions/activity-stream/css/activity-stream-mac.css
@@ -407,6 +407,8 @@ main {
         white-space: nowrap; }
       .top-sites-list .top-site-outer .title.pinned span {
         padding: 0 13px; }
+    .top-sites-list .top-site-outer .edit-button {
+      background-image: url("../data/content/assets/glyph-edit-16.svg"); }
     .top-sites-list .top-site-outer .edit-menu {
       background: #FFF;
       border: 1px solid #B1B1B3;
diff --git a/browser/extensions/activity-stream/css/activity-stream-windows.css b/browser/extensions/activity-stream/css/activity-stream-windows.css
index bbacd187592d..9769b10af9bc 100644
--- a/browser/extensions/activity-stream/css/activity-stream-windows.css
+++ b/browser/extensions/activity-stream/css/activity-stream-windows.css
@@ -407,6 +407,8 @@ main {
         white-space: nowrap; }
       .top-sites-list .top-site-outer .title.pinned span {
         padding: 0 13px; }
+    .top-sites-list .top-site-outer .edit-button {
+      background-image: url("../data/content/assets/glyph-edit-16.svg"); }
     .top-sites-list .top-site-outer .edit-menu {
       background: #FFF;
       border: 1px solid #B1B1B3;
diff --git a/browser/extensions/activity-stream/data/content/activity-stream.bundle.js b/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
index 71e007e6213b..b6bf653b1fe4 100644
--- a/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
+++ b/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
@@ -2513,13 +2513,10 @@ class TopSite_TopSiteLink extends external__React__default.a.PureComponent {
    * Helper to determine whether the drop zone should allow a drop. We only allow
    * dropping top sites for now.
    */
-  _allowDrop(e, index) {
-    let draggedIndex = parseInt(e.dataTransfer.getData("text/topsite-index"), 10);
-    if (!isNaN(draggedIndex) && draggedIndex !== index) {
-      return true;
-    }
-    return false;
+  _allowDrop(e) {
+    return e.dataTransfer.types.includes("text/topsite-index");
   }
+
   onDragEvent(event) {
     switch (event.type) {
       case "dragstart":
@@ -2531,11 +2528,10 @@ class TopSite_TopSiteLink extends external__React__default.a.PureComponent {
       case "dragend":
         this.props.onDragEvent(event);
         break;
-      case "dragover":
       case "dragenter":
-      case "dragleave":
+      case "dragover":
       case "drop":
-        if (this._allowDrop(event, this.props.index)) {
+        if (this._allowDrop(event)) {
           event.preventDefault();
           this.props.onDragEvent(event, this.props.index);
         }
@@ -2585,7 +2581,7 @@ class TopSite_TopSiteLink extends external__React__default.a.PureComponent {
     }
     return external__React__default.a.createElement(
       "li",
-      _extends({ className: topSiteOuterClassName, key: link.guid || link.url, onDrop: this.onDragEvent, onDragOver: this.onDragEvent, onDragEnter: this.onDragEvent, onDragLeave: this.onDragEvent }, draggableProps),
+      _extends({ className: topSiteOuterClassName, onDrop: this.onDragEvent, onDragOver: this.onDragEvent, onDragEnter: this.onDragEvent, onDragLeave: this.onDragEvent }, draggableProps),
       external__React__default.a.createElement(
         "div",
         { className: "top-site-inner" },
@@ -2773,14 +2769,9 @@ class TopSite_TopSitePlaceholder extends external__React__default.a.PureComponen
     return external__React__default.a.createElement(
       TopSite_TopSiteLink,
       _extends({ className: "placeholder", isDraggable: false }, this.props),
-      external__React__default.a.createElement(
-        "div",
-        { className: "edit-menu" },
-        external__React__default.a.createElement("button", {
-          className: "icon icon-edit",
-          title: this.props.intl.formatMessage({ id: "edit_topsites_edit_button" }),
-          onClick: this.onEditButtonClick })
-      )
+      external__React__default.a.createElement("button", { className: "context-menu-button edit-button icon",
+        title: this.props.intl.formatMessage({ id: "edit_topsites_edit_button" }),
+        onClick: this.onEditButtonClick })
     );
   }
 }
@@ -2827,19 +2818,20 @@ class TopSite__TopSiteList extends external__React__default.a.PureComponent {
         this.setState(this.DEFAULT_STATE);
         break;
       case "dragenter":
-        this.setState({ topSitesPreview: this._makeTopSitesPreview(index) });
-        break;
-      case "dragleave":
-        this.setState({ topSitesPreview: null });
+        if (index === this.state.draggedIndex) {
+          this.setState({ topSitesPreview: null });
+        } else {
+          this.setState({ topSitesPreview: this._makeTopSitesPreview(index) });
+        }
         break;
       case "drop":
-        this.props.dispatch(Actions["actionCreators"].SendToMain({
-          type: Actions["actionTypes"].TOP_SITES_INSERT,
-          data: { site: { url: this.state.draggedSite.url, label: this.state.draggedTitle }, index }
-        }));
-        this.userEvent("DROP", index);
-        break;
-      default:
+        if (index !== this.state.draggedIndex) {
+          this.props.dispatch(Actions["actionCreators"].SendToMain({
+            type: Actions["actionTypes"].TOP_SITES_INSERT,
+            data: { site: { url: this.state.draggedSite.url, label: this.state.draggedTitle }, index }
+          }));
+          this.userEvent("DROP", index);
+        }
         break;
     }
   }
@@ -2907,10 +2899,15 @@ class TopSite__TopSiteList extends external__React__default.a.PureComponent {
       dispatch: props.dispatch,
       intl: props.intl
     };
+    // We assign a key to each placeholder slot. We need it to be independent
+    // of the slot index (i below) so that the keys used stay the same during
+    // drag and drop reordering and the underlying DOM nodes are reused.
+    // This mostly (only?) affects linux so be sure to test on linux before changing.
+    let holeIndex = 0;
     for (let i = 0, l = props.TopSitesCount; i < l; i++) {
       const link = topSites[i];
       const slotProps = {
-        key: i,
+        key: link ? link.url : holeIndex++,
         index: i
       };
       topSitesUI.push(!link ? external__React__default.a.createElement(TopSite_TopSitePlaceholder, _extends({}, slotProps, commonProps)) : external__React__default.a.createElement(TopSite_TopSite, _extends({
diff --git a/browser/extensions/activity-stream/install.rdf.in b/browser/extensions/activity-stream/install.rdf.in
index bd078f5ca248..73528c34d197 100644
--- a/browser/extensions/activity-stream/install.rdf.in
+++ b/browser/extensions/activity-stream/install.rdf.in
@@ -8,7 +8,7 @@
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:unpack>false</em:unpack>
-    <em:version>2017.12.22.0055-8fe1055e</em:version>
+    <em:version>2018.01.05.1410-84fd2871</em:version>
     <em:name>Activity Stream</em:name>
     <em:description>A rich visual history feed and a reimagined home page make it easier than ever to find exactly what you're looking for in Firefox.</em:description>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html
index 80c48fa030a1..77744e666a6e 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1517555363"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Yeny kakube</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Yeny kakube" title="Yeny kakube" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Yeny" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Yeny</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Kakube maloyo</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ngec" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Kakube ma gi loyo</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Nong kakube ma ilimo loyo.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Ter me dirica matidi manyen</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Yub kakube man" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Yub kakube man" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Yub kakube man" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Yub kakube man" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Yub kakube man" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Yub kakube man" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Yub kakube man" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Yub kakube man" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Yub kakube man" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Yub kakube man" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Yub kakube man" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Yub kakube man" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Yub bute pi kakubi ni ma giloyo" data-reactid="141"><span data-reactid="142">Yubi</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Lami tam obedo Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Lok macuk gi lamal:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Wiye madito</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-808280736"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Yeny kakube</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Yeny kakube" title="Yeny kakube" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Yeny" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Yeny</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Kakube maloyo</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ngec" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Kakube ma gi loyo</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Nong kakube ma ilimo loyo.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Ter me dirica matidi manyen</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Yub kakube man" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Yub bute pi kakubi ni ma giloyo" data-reactid="129"><span data-reactid="130">Yubi</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Lami tam obedo Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Lok macuk gi lamal:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Wiye madito</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html
index bb9f30838aa1..c0beeb605ab3 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1164963522"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ابحث في الوِب</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ابحث في الوِب" title="ابحث في الوِب" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ابحث" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ابحث</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">المواقع الأكثر زيارة</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="المعلومات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">المواقع الأكثر زيارة</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">وصول للمواقع التي تزورها أكثر.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">تفضيلات صفحة اللسان الجديد</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="حرّر هذا الموقع" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="خصص قسم المواقع الأكثر زيارة" data-reactid="141"><span data-reactid="142">حرِّر</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">ينصح به Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">المواضيع الشائعة:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">أهم الأحداث</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="746035909"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ابحث في الوِب</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ابحث في الوِب" title="ابحث في الوِب" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ابحث" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ابحث</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">المواقع الأكثر زيارة</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="المعلومات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">المواقع الأكثر زيارة</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">وصول للمواقع التي تزورها أكثر.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">تفضيلات صفحة اللسان الجديد</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="حرّر هذا الموقع" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="خصص قسم المواقع الأكثر زيارة" data-reactid="129"><span data-reactid="130">حرِّر</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">ينصح به Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">المواضيع الشائعة:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">أهم الأحداث</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html
index 5a393fd64848..87875769db04 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-702475606"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Guetar na web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Guetar na web" title="Guetar na web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Guetar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Guetar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Más visitaos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Más visitaos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder a les webs que más visites.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencies de Llingüeta nueva</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar esti sitiu" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar la seición de Más visitaos" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendáu por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temes populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacaos</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="906411678"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Guetar na web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Guetar na web" title="Guetar na web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Guetar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Guetar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Más visitaos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Más visitaos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder a les webs que más visites.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencies de Llingüeta nueva</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar esti sitiu" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar la seición de Más visitaos" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendáu por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temes populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacaos</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html
index e9a58e42d924..09988b4ab329 100644
--- a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-489659458"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">İnternetdə Axtar</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="İnternetdə Axtar" title="İnternetdə Axtar" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Axtar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Axtar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Qabaqcıl Saytlar</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Məlumat" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Qabaqcıl Saytlar</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ən çox ziyarət etdiyiniz saytları görün.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Yeni Vərəq Nizamlamaları</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Bu saytı düzəlt" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Qabaqcıl Saytlar bölümünüzü fərdiləşdirin" data-reactid="141"><span data-reactid="142">Redaktə et</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket məsləhət görür</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Məşhur Mövzular:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Seçilmişlər</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1330114623"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">İnternetdə Axtar</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="İnternetdə Axtar" title="İnternetdə Axtar" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Axtar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Axtar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Qabaqcıl Saytlar</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Məlumat" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Qabaqcıl Saytlar</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ən çox ziyarət etdiyiniz saytları görün.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Yeni Vərəq Nizamlamaları</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Bu saytı düzəlt" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Qabaqcıl Saytlar bölümünüzü fərdiləşdirin" data-reactid="129"><span data-reactid="130">Redaktə et</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket məsləhət görür</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Məşhur Mövzular:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Seçilmişlər</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js
index eedc408c35ac..424c34696e8f 100644
--- a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js
@@ -38,9 +38,9 @@ window.gActivityStreamStrings = {
   "section_info_option": "Məlumat",
   "section_info_send_feedback": "Əks-əlaqə göndər",
   "section_info_privacy_notice": "Məxfilik Bildirişi",
-  "section_disclaimer_topstories": "The most interesting stories on the web, selected based on what you read. From Pocket, now part of Mozilla.",
-  "section_disclaimer_topstories_linktext": "Learn how it works.",
-  "section_disclaimer_topstories_buttontext": "Okay, got it",
+  "section_disclaimer_topstories": "Nələr oxuduğunuza əsasən seçilmiş internetin ən maraqlı hekayələri. Pocket-dən, artıq Mozillanın bir hissəsi.",
+  "section_disclaimer_topstories_linktext": "Necə işlədiyini öyrənin.",
+  "section_disclaimer_topstories_buttontext": "Tamam, başa düşdüm",
   "welcome_title": "Yeni vərəqə xoş gəldiniz",
   "welcome_body": "Firefox bu səhifədə ən uyğun əlfəcin, məqalə, video və son ziyarət etdiyiniz səhifələri göstərərək onları rahat tapmağınıza kömək edəcək.",
   "welcome_label": "Seçilmişləriniz təyin edilir",
@@ -67,7 +67,7 @@ window.gActivityStreamStrings = {
   "settings_pane_snippets_header": "Hissələr",
   "settings_pane_snippets_body": "Mozilladan Firefox, internet mədəniyyəti və digər yeniliklər haqqında qısa bildirişlər oxuyun.",
   "settings_pane_done_button": "Oldu",
-  "settings_pane_topstories_options_sponsored": "Show Sponsored Stories",
+  "settings_pane_topstories_options_sponsored": "Sponsor Hekayələrini Göstər",
   "edit_topsites_button_text": "Redaktə et",
   "edit_topsites_button_label": "Qabaqcıl Saytlar bölümünüzü fərdiləşdirin",
   "edit_topsites_showmore_button": "Daha çox göstər",
diff --git a/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html
index 5f925c1c6f23..3018639bbe57 100644
--- a/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2001118941"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пошук у Інтэрнэце</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пошук у Інтэрнэце" title="Пошук у Інтэрнэце" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Шукаць" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Шукаць</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Папулярныя сайты</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Звесткі" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Папулярныя сайты</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Доступ да сайтаў, якія вы часцей наведваеце.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Налады новай карткі</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Рэдагаваць гэты сайт" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Наладзіць раздзел папулярных сайтаў" data-reactid="141"><span data-reactid="142">Правіць</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Рэкамендавана Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Папулярныя тэмы:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Выбранае</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="58282720"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пошук у Інтэрнэце</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пошук у Інтэрнэце" title="Пошук у Інтэрнэце" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Шукаць" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Шукаць</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Папулярныя сайты</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Звесткі" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Папулярныя сайты</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Доступ да сайтаў, якія вы часцей наведваеце.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Налады новай карткі</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Рэдагаваць гэты сайт" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Наладзіць раздзел папулярных сайтаў" data-reactid="129"><span data-reactid="130">Правіць</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Рэкамендавана Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Папулярныя тэмы:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Выбранае</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html
index 7bafae4c9baa..2aea66e62237 100644
--- a/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1863017142"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Търсене в интернет</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Търсене в интернет" title="Търсене в интернет" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Търсене" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Търсене</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Най-посещавани</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Информация" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Най-посещавани</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Достъп до сайтовете, които посещавате най-често.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Настройки на новия раздел</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Редактиране" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Редактиране" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Редактиране" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Редактиране" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Редактиране" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Редактиране" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Редактиране" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Редактиране" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Редактиране" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Редактиране" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Редактиране" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Редактиране" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Настройки на най-посещаваните" data-reactid="141"><span data-reactid="142">Редактиране</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Препоръчано от Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Популярни теми:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Акценти</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1603997369"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Търсене в интернет</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Търсене в интернет" title="Търсене в интернет" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Търсене" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Търсене</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Най-посещавани</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Информация" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Най-посещавани</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Достъп до сайтовете, които посещавате най-често.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Настройки на новия раздел</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Редактиране" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Настройки на най-посещаваните" data-reactid="129"><span data-reactid="130">Редактиране</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Препоръчано от Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Популярни теми:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Акценти</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream-prerendered.html
index 63dc1c4b450b..1bf0f93caf1d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/bn-BD/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="529060171"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ওয়েবে সন্ধান করুন</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ওয়েবে সন্ধান করুন" title="ওয়েবে সন্ধান করুন" data-reactid="7"/><button id="searchSubmit" class="search-button" title="অনুসন্ধান" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">অনুসন্ধান</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">শীর্ঘ সাইট</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="তথ্য" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">শীর্ষ সাইট</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">আপনি যেসব সাইটে বেশি যান সেসব সাইটে প্রবেশ করুন।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">নতুন ট্যাব পছন্দসমূহ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="আপনার টপ সাইট সেকশন কাস্টমাইজ করুন" data-reactid="141"><span data-reactid="142">সম্পাদনা</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket দ্বারা সুপারিশকৃত</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">জনপ্রিয় বিষয়:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">হাইলাইটস</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1248690866"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ওয়েবে সন্ধান করুন</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ওয়েবে সন্ধান করুন" title="ওয়েবে সন্ধান করুন" data-reactid="7"/><button id="searchSubmit" class="search-button" title="অনুসন্ধান" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">অনুসন্ধান</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">শীর্ঘ সাইট</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="তথ্য" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">শীর্ষ সাইট</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">আপনি যেসব সাইটে বেশি যান সেসব সাইটে প্রবেশ করুন।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">নতুন ট্যাব পছন্দসমূহ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="আপনার টপ সাইট সেকশন কাস্টমাইজ করুন" data-reactid="129"><span data-reactid="130">সম্পাদনা</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket দ্বারা সুপারিশকৃত</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">জনপ্রিয় বিষয়:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">হাইলাইটস</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream-prerendered.html
index 79b21074aa98..5c382186e4a5 100644
--- a/browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/bn-IN/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="815011235"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ওয়েবে সন্ধান করুন</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ওয়েবে সন্ধান করুন" title="ওয়েবে সন্ধান করুন" data-reactid="7"/><button id="searchSubmit" class="search-button" title="অনুসন্ধান" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">অনুসন্ধান</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">শীর্ষ সাইটগুলি</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="তথ্য" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">শীর্ষ সাইট</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">আপনি যেসব সাইটে বেশি যান সেসব সাইটে প্রবেশ করুন।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">নতুন ট্যাব পছন্দসমূহ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="সাইটটি সম্পাদনা করুন" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="আপনার শীর্ষ সাইট সেকশন কাস্টমাইজ করুন" data-reactid="141"><span data-reactid="142">সম্পাদনা</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket দ্বারা সুপারিশকৃত</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">জনপ্রিয় বিষয়:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">হাইলাইটস</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1557709207"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ওয়েবে সন্ধান করুন</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ওয়েবে সন্ধান করুন" title="ওয়েবে সন্ধান করুন" data-reactid="7"/><button id="searchSubmit" class="search-button" title="অনুসন্ধান" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">অনুসন্ধান</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">শীর্ষ সাইটগুলি</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="তথ্য" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">শীর্ষ সাইট</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">আপনি যেসব সাইটে বেশি যান সেসব সাইটে প্রবেশ করুন।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">নতুন ট্যাব পছন্দসমূহ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="সাইটটি সম্পাদনা করুন" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="আপনার শীর্ষ সাইট সেকশন কাস্টমাইজ করুন" data-reactid="129"><span data-reactid="130">সম্পাদনা</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket দ্বারা সুপারিশকৃত</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">জনপ্রিয় বিষয়:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">হাইলাইটস</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/br/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/br/activity-stream-prerendered.html
index 5b654457b30c..c59bd27d13f3 100644
--- a/browser/extensions/activity-stream/prerendered/locales/br/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/br/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-400059473"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Klask er web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Klask er web" title="Klask er web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Klask" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Klask</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lec&#x27;hiennoù pennañ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Titouroù" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Lec&#x27;hiennoù gwellañ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Kit war al lec&#x27;hiennoù gweladennet ar muiañ ganeoc&#x27;h.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Gwellvezioù an ivinell nevez</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Embann al lec&#x27;hienn-mañ" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personelaat ar gevrenn “lec&#x27;hiennoù gweladennet ar muiañ”" data-reactid="141"><span data-reactid="142">Embann</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Erbedet gant Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Danvezioù brudet:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Mareoù pouezus</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1179172942"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Klask er web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Klask er web" title="Klask er web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Klask" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Klask</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lec&#x27;hiennoù pennañ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Titouroù" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Lec&#x27;hiennoù gwellañ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Kit war al lec&#x27;hiennoù gweladennet ar muiañ ganeoc&#x27;h.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Gwellvezioù an ivinell nevez</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Embann al lec&#x27;hienn-mañ" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personelaat ar gevrenn “lec&#x27;hiennoù gweladennet ar muiañ”" data-reactid="129"><span data-reactid="130">Embann</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Erbedet gant Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Danvezioù brudet:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Mareoù pouezus</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/bs/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/bs/activity-stream-prerendered.html
index ecb4d7213fef..0b3d74f73a1b 100644
--- a/browser/extensions/activity-stream/prerendered/locales/bs/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/bs/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-439146466"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pretraži web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pretraži web" title="Pretraži web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Traži" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Traži</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najposjećenije stranice</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacije" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najposjećenije stranice</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pristupite stranicama koje najčešće posjećujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Postavke novog taba</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Prilagodite odjel s najboljim stranicama" data-reactid="141"><span data-reactid="142">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Preporučeno od Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popularne teme:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Istaknuto</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="727569426"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pretraži web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pretraži web" title="Pretraži web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Traži" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Traži</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najposjećenije stranice</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacije" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najposjećenije stranice</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pristupite stranicama koje najčešće posjećujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Postavke novog taba</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Prilagodite odjel s najboljim stranicama" data-reactid="129"><span data-reactid="130">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Preporučeno od Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popularne teme:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Istaknuto</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ca/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ca/activity-stream-prerendered.html
index 9c55c12576d9..a9bcfd78f2ee 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ca/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ca/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2147020156"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cerca al web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cerca al web" title="Cerca al web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Llocs principals</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informació" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Llocs principals</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accediu als llocs web que visiteu més sovint.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferències de pestanya nova</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edita aquest lloc" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalitzeu la secció Llocs principals" data-reactid="141"><span data-reactid="142">Edita</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomanat per Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temes populars:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacats</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="613924472"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cerca al web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cerca al web" title="Cerca al web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Llocs principals</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informació" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Llocs principals</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accediu als llocs web que visiteu més sovint.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferències de pestanya nova</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edita aquest lloc" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalitzeu la secció Llocs principals" data-reactid="129"><span data-reactid="130">Edita</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomanat per Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temes populars:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacats</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/cak/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/cak/activity-stream-prerendered.html
index c6178a04b7d1..9ba2296fc611 100644
--- a/browser/extensions/activity-stream/prerendered/locales/cak/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/cak/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-915950071"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tikanöx pa Ajk&#x27;amaya&#x27;l</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tikanöx pa Ajk&#x27;amaya&#x27;l" title="Tikanöx pa Ajk&#x27;amaya&#x27;l" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tikanöx" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tikanöx</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Utziläj taq Ruxaq K&#x27;amaya&#x27;l</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Rutzijol" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Utziläj taq ruxaq K&#x27;amaya&#x27;l</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Katok pa ri taq ajk&#x27;amaya&#x27;l yalan ye&#x27;atz&#x27;ët.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">K&#x27;ak&#x27;a&#x27; Ruwi&#x27; Taq Ajowab&#x27;äl</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Tab&#x27;ana&#x27; runuk&#x27;ulem ri kitanaj Nimaläj taq Ruxaq K&#x27;amaya&#x27;l" data-reactid="141"><span data-reactid="142">Tinuk&#x27;</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Chilab&#x27;en ruma Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Nima&#x27;q taq Na&#x27;oj:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Taq k&#x27;ewachinïk</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1040424436"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tikanöx pa Ajk&#x27;amaya&#x27;l</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tikanöx pa Ajk&#x27;amaya&#x27;l" title="Tikanöx pa Ajk&#x27;amaya&#x27;l" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tikanöx" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tikanöx</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Utziläj taq Ruxaq K&#x27;amaya&#x27;l</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Rutzijol" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Utziläj taq ruxaq K&#x27;amaya&#x27;l</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Katok pa ri taq ajk&#x27;amaya&#x27;l yalan ye&#x27;atz&#x27;ët.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">K&#x27;ak&#x27;a&#x27; Ruwi&#x27; Taq Ajowab&#x27;äl</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Tinuk&#x27; re ruxaq k&#x27;amaya&#x27;l re&#x27;" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Tab&#x27;ana&#x27; runuk&#x27;ulem ri kitanaj Nimaläj taq Ruxaq K&#x27;amaya&#x27;l" data-reactid="129"><span data-reactid="130">Tinuk&#x27;</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Chilab&#x27;en ruma Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Nima&#x27;q taq Na&#x27;oj:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Taq k&#x27;ewachinïk</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-prerendered.html
index b218e5fc8254..8c076a86bb71 100644
--- a/browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="25703805"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Hledat na webu</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Hledat na webu" title="Hledat na webu" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hledat" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hledat</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top stránky</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informace" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top stránky</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Přístup ke stránkám, které nejčastěji navštěvujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Předvolby nového panelu</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Upravit tuto stránku" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Upravit oddíl Top stránek" data-reactid="141"><span data-reactid="142">Upravit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Doporučení ze služby Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populární témata:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Vybrané</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="166322545"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Hledat na webu</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Hledat na webu" title="Hledat na webu" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hledat" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hledat</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top stránky</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informace" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top stránky</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Přístup ke stránkám, které nejčastěji navštěvujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Předvolby nového panelu</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Upravit tuto stránku" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Upravit oddíl Top stránek" data-reactid="129"><span data-reactid="130">Upravit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Doporučení ze služby Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populární témata:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Vybrané</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/cy/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/cy/activity-stream-prerendered.html
index 3d5cd7a637b4..34c9cceaffe8 100644
--- a/browser/extensions/activity-stream/prerendered/locales/cy/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/cy/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1893668283"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Chwilio&#x27;r We</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Chwilio&#x27;r We" title="Chwilio&#x27;r We" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Chwilio" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Chwilio</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Hoff Wefannau</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Gwybodaeth" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Hoff Wefannau</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Cael mynediad at y gwefannau rydych yn ymweld â nhw amlaf.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Dewisiadau Tab Newydd</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Golygu&#x27;r wefan" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Cyfaddasu eich adran Hoff Wefannau" data-reactid="141"><span data-reactid="142">Golygu</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Argymhellwyd gan Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Pynciau Poblogaidd:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Goreuon</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1478770257"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Chwilio&#x27;r We</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Chwilio&#x27;r We" title="Chwilio&#x27;r We" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Chwilio" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Chwilio</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Hoff Wefannau</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Gwybodaeth" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Hoff Wefannau</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Cael mynediad at y gwefannau rydych yn ymweld â nhw amlaf.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Dewisiadau Tab Newydd</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Golygu&#x27;r wefan" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Cyfaddasu eich adran Hoff Wefannau" data-reactid="129"><span data-reactid="130">Golygu</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Argymhellwyd gan Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Pynciau Poblogaidd:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Goreuon</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/da/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/da/activity-stream-prerendered.html
index 20f8c2eb5449..d514f1ea8567 100644
--- a/browser/extensions/activity-stream/prerendered/locales/da/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/da/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1929130206"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søg på internettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søg på internettet" title="Søg på internettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søg" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søg</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøgte websider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøgte websider</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Adgang til de websider, du besøger oftest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Indstillinger for Nyt faneblad</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Rediger denne webside" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Tilpas afsnittet Mest besøgte websider" data-reactid="141"><span data-reactid="142">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Anbefalet af Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populære emner:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Fremhævede</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2021729070"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søg på internettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søg på internettet" title="Søg på internettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søg" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søg</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøgte websider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøgte websider</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Adgang til de websider, du besøger oftest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Indstillinger for Nyt faneblad</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne webside" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Tilpas afsnittet Mest besøgte websider" data-reactid="129"><span data-reactid="130">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Anbefalet af Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populære emner:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Fremhævede</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/de/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/de/activity-stream-prerendered.html
index 867597a9d65c..1d088074d0c1 100644
--- a/browser/extensions/activity-stream/prerendered/locales/de/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/de/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1445381833"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Das Web durchsuchen</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Das Web durchsuchen" title="Das Web durchsuchen" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Suchen" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Suchen</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Wichtige Seiten</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Meistbesuchte Seiten</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Schneller Zugriff auf Ihre meistbesuchten Websites.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Einstellungen für neue Tabs</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Diese Website bearbeiten" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Anpassen der wichtigen Seiten" data-reactid="141"><span data-reactid="142">Bearbeiten</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Empfohlen von Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Beliebte Themen:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Überblick</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-777722581"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Das Web durchsuchen</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Das Web durchsuchen" title="Das Web durchsuchen" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Suchen" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Suchen</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Wichtige Seiten</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Meistbesuchte Seiten</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Schneller Zugriff auf Ihre meistbesuchten Websites.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Einstellungen für neue Tabs</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Diese Website bearbeiten" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Anpassen der wichtigen Seiten" data-reactid="129"><span data-reactid="130">Bearbeiten</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Empfohlen von Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Beliebte Themen:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Überblick</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream-prerendered.html
index 6a995e92675e..807c587e2cfb 100644
--- a/browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/dsb/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1989514664"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web pśepytaś</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web pśepytaś" title="Web pśepytaś" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pytaś" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pytaś</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Nejcesćej woglědane sedła</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Nejcesćej woglědane sedła</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Wócyńśo websedła, kótarež sćo se nejcesćej woglědał.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastajenja nowego rejtarka składowaś</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Toś to sedło wobźěłaś" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Pśiměrśo wótrězk swójich nejcesćej woglědanych sedłow" data-reactid="141"><span data-reactid="142">Wobźěłaś</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Wót Pocket dopórucony</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Woblubowane temy:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Wjerški</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1680490923"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web pśepytaś</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web pśepytaś" title="Web pśepytaś" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pytaś" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pytaś</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Nejcesćej woglědane sedła</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Nejcesćej woglědane sedła</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Wócyńśo websedła, kótarež sćo se nejcesćej woglědał.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastajenja nowego rejtarka składowaś</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Toś to sedło wobźěłaś" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Pśiměrśo wótrězk swójich nejcesćej woglědanych sedłow" data-reactid="129"><span data-reactid="130">Wobźěłaś</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Wót Pocket dopórucony</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Woblubowane temy:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Wjerški</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/el/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/el/activity-stream-prerendered.html
index 17240ed0d6a7..34e7d3b92c6e 100644
--- a/browser/extensions/activity-stream/prerendered/locales/el/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/el/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1045653264"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Αναζήτηση στον ιστό</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Αναζήτηση στον ιστό" title="Αναζήτηση στον ιστό" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Αναζήτηση" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Αναζήτηση</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Κορυφαίες ιστοσελίδες</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Πληροφορίες" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Κορυφαίες ιστοσελίδες</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Πρόσβαση στις ιστοσελίδες που επισκέπτεστε περισσότερο.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Προτιμήσεις νέας καρτέλας</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Επεξεργασία ιστοσελίδας" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Προσαρμογή της ενότητας Κορυφαίες Ιστοσελίδες" data-reactid="141"><span data-reactid="142">Επεξεργασία</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Προτεινόμενο από τον πάροχο Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Δημοφιλή θέματα:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Κορυφαίες στιγμές</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="392971507"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Αναζήτηση στον ιστό</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Αναζήτηση στον ιστό" title="Αναζήτηση στον ιστό" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Αναζήτηση" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Αναζήτηση</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Κορυφαίες ιστοσελίδες</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Πληροφορίες" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Κορυφαίες ιστοσελίδες</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Πρόσβαση στις ιστοσελίδες που επισκέπτεστε περισσότερο.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Προτιμήσεις νέας καρτέλας</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Επεξεργασία ιστοσελίδας" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Προσαρμογή της ενότητας Κορυφαίες Ιστοσελίδες" data-reactid="129"><span data-reactid="130">Επεξεργασία</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Προτεινόμενο από τον πάροχο Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Δημοφιλή θέματα:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Κορυφαίες στιγμές</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream-prerendered.html
index dbccb8f72f26..26576163ebec 100644
--- a/browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/en-GB/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1647119717"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the web sites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customise your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1516871326"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the web sites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customise your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream-prerendered.html
index a00e963fa8bf..168d7f771757 100644
--- a/browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/en-US/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-656674174"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1133339003"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/eo/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/eo/activity-stream-prerendered.html
index 4a7654ac4ab6..5bcb58369dc9 100644
--- a/browser/extensions/activity-stream/prerendered/locales/eo/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/eo/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1503147293"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Serĉi la reton</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Serĉi la reton" title="Serĉi la reton" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Serĉi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Serĉi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Plej vizititaj</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informo" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Plej vizitaj</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Aliri la plej ofte vizitajn retejojn.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferoj pri nova langeto</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Redakti ĉi tiun retejon" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personecigi la sekcion &#x27;plej vizititaj&#x27;" data-reactid="141"><span data-reactid="142">Redakti</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Rekomendita de Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Ĉefaj temoj:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Elstaraĵoj</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1221664495"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Serĉi la reton</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Serĉi la reton" title="Serĉi la reton" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Serĉi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Serĉi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Plej vizititaj</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informo" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Plej vizitaj</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Aliri la plej ofte vizitajn retejojn.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferoj pri nova langeto</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Redakti ĉi tiun retejon" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personecigi la sekcion &#x27;plej vizititaj&#x27;" data-reactid="129"><span data-reactid="130">Redakti</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Rekomendita de Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Ĉefaj temoj:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Elstaraĵoj</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream-prerendered.html
index 689dd8656945..28db190e701f 100644
--- a/browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/es-AR/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-8578295"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la web" title="Buscar en la web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Más visitados</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Más visitados</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder a los sitios web más visitados.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencia de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este sitio" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este sitio" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este sitio" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este sitio" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este sitio" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este sitio" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este sitio" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este sitio" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este sitio" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este sitio" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este sitio" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este sitio" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar la sección de sitios más visitados" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Tópicos populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-505362691"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la web" title="Buscar en la web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Más visitados</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Más visitados</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder a los sitios web más visitados.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencia de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar la sección de sitios más visitados" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Tópicos populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream-prerendered.html
index 84f46873f09d..add8cede016b 100644
--- a/browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/es-CL/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1734808963"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios frecuentes</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios frecuentes</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a los sitios que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de Nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este sitio" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este sitio" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este sitio" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este sitio" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este sitio" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este sitio" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este sitio" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este sitio" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este sitio" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este sitio" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este sitio" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este sitio" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personaliza tu sección de sitios frecuentes" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temas populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="56476023"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios frecuentes</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios frecuentes</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a los sitios que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de Nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personaliza tu sección de sitios frecuentes" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temas populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream-prerendered.html
index 1e75ae45563b..e2222b7c6340 100644
--- a/browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/es-ES/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-674490998"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios populares</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a las páginas que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este sitio" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este sitio" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este sitio" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este sitio" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este sitio" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este sitio" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este sitio" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este sitio" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este sitio" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este sitio" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este sitio" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este sitio" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar la sección de Sitios populares" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temas populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1083359614"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios populares</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a las páginas que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar la sección de Sitios populares" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temas populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream-prerendered.html
index f839ebf0773e..195104997bfe 100644
--- a/browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/es-MX/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1871701105"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios populares</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a los sitios web que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este sitio" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este sitio" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este sitio" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este sitio" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este sitio" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este sitio" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este sitio" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este sitio" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este sitio" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este sitio" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este sitio" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este sitio" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar la sección de tus sitios preferidos" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temas populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1606141827"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar en la Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar en la Web" title="Buscar en la Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios populares</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accede a los sitios web que más visitas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nueva pestaña</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar la sección de tus sitios preferidos" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temas populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/et/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/et/activity-stream-prerendered.html
index 751337acaeec..c3d8cfefae69 100644
--- a/browser/extensions/activity-stream/prerendered/locales/et/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/et/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-766575474"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Otsi veebist</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Otsi veebist" title="Otsi veebist" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Otsi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Otsi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top saidid</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Teave" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top saidid</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ligipääs enim külastatud veebilehtedele.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Uue kaardi sätted</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Muuda seda saiti" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Kohanda top saitide osa" data-reactid="141"><span data-reactid="142">Muuda</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket soovitab</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populaarsed teemad:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Esiletõstetud</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1253550225"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Otsi veebist</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Otsi veebist" title="Otsi veebist" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Otsi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Otsi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top saidid</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Teave" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top saidid</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ligipääs enim külastatud veebilehtedele.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Uue kaardi sätted</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Muuda seda saiti" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Kohanda top saitide osa" data-reactid="129"><span data-reactid="130">Muuda</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket soovitab</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populaarsed teemad:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Esiletõstetud</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-prerendered.html
index 3bdcadf05ca1..fd4f849502e1 100644
--- a/browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1352734194"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Bilatu webean</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Bilatu webean" title="Bilatu webean" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Bilatu" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Bilatu</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Gune erabilienak</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informazioa" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Gune erabilienak</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Sartu gehien bisitatzen dituzun webguneetara.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Fitxa berriaren hobespenak</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editatu gune hau" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Pertsonalizatu gune erabilienen atala" data-reactid="141"><span data-reactid="142">Editatu</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket hornitzaileak gomendatuta</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Gai ezagunak:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Nabarmendutakoak</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1466089958"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Bilatu webean</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Bilatu webean" title="Bilatu webean" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Bilatu" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Bilatu</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Gune erabilienak</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informazioa" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Gune erabilienak</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Sartu gehien bisitatzen dituzun webguneetara.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Fitxa berriaren hobespenak</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editatu gune hau" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Pertsonalizatu gune erabilienen atala" data-reactid="129"><span data-reactid="130">Editatu</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket hornitzaileak gomendatuta</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Gai ezagunak:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Nabarmendutakoak</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/fa/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/fa/activity-stream-prerendered.html
index d91307e27b3e..2e739ff2a4b6 100644
--- a/browser/extensions/activity-stream/prerendered/locales/fa/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/fa/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1040118378"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">جست‌وجوی وب</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="جست‌وجوی وب" title="جست‌وجوی وب" data-reactid="7"/><button id="searchSubmit" class="search-button" title="جست‌وجو" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">جست‌وجو</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">سایت‌های برتر</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="اطلاعات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">سایت‌های برتر</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">به وب‌سایت‌هایی که بیشترین بازدید از آنها را داشتید دسترسی داشته باشید.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">تنظیمات زبانه جدید</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ویرایش این سایت" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="قسمت سایت‌های برتر را سفارشی کنید" data-reactid="141"><span data-reactid="142">ويرايش</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">پیشنهاد شده توسط Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">موضوع‌های محبوب:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">برجسته‌ها</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-272458131"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">جست‌وجوی وب</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="جست‌وجوی وب" title="جست‌وجوی وب" data-reactid="7"/><button id="searchSubmit" class="search-button" title="جست‌وجو" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">جست‌وجو</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">سایت‌های برتر</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="اطلاعات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">سایت‌های برتر</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">به وب‌سایت‌هایی که بیشترین بازدید از آنها را داشتید دسترسی داشته باشید.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">تنظیمات زبانه جدید</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ویرایش این سایت" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="قسمت سایت‌های برتر را سفارشی کنید" data-reactid="129"><span data-reactid="130">ويرايش</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">پیشنهاد شده توسط Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">موضوع‌های محبوب:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">برجسته‌ها</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-prerendered.html
index d7c38bce0597..69fa95ac7947 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1031932612"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Yiylo geese</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Yiylo geese" title="Yiylo geese" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Yiylo" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Yiylo</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lowe dowrowe</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Kabaruuji" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Loowdiiji lolluɗi:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Jalbine</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1528389313"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Yiylo geese</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Yiylo geese" title="Yiylo geese" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Yiylo" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Yiylo</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lowe dowrowe</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Kabaruuji" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Loowdiiji lolluɗi:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Jalbine</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-strings.js
index cd89c77da2e7..0b374f952def 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/ff/activity-stream-strings.js
@@ -45,7 +45,7 @@ window.gActivityStreamStrings = {
   "welcome_body": "Firefox will use this space to show your most relevant bookmarks, articles, videos, and pages you’ve recently visited, so you can get back to them easily.",
   "welcome_label": "Heɓtinde Jalbine maa",
   "time_label_less_than_minute": "<1m",
-  "time_label_minute": "{number}m",
+  "time_label_minute": "{number} m",
   "time_label_hour": "{number}h",
   "time_label_day": "{number}d",
   "settings_pane_button_label": "Customize your New Tab page",
diff --git a/browser/extensions/activity-stream/prerendered/locales/fi/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/fi/activity-stream-prerendered.html
index 6589f2cedb2c..0ec77ecbe740 100644
--- a/browser/extensions/activity-stream/prerendered/locales/fi/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/fi/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-701354753"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Verkkohaku</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Verkkohaku" title="Verkkohaku" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Haku" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Haku</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ykkössivustot</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Tietoa" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Ykkössivustot</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Näe eniten vierailemasi sivustot.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Uuden välilehden asetukset</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Muokkaa tätä sivustoa" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Muokkaa Ykkössivustot-osiota" data-reactid="141"><span data-reactid="142">Muokkaa</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Suositukset lähteestä Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Suositut aiheet:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Nostot</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1964038387"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Verkkohaku</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Verkkohaku" title="Verkkohaku" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Haku" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Haku</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ykkössivustot</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Tietoa" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Ykkössivustot</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Näe eniten vierailemasi sivustot.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Uuden välilehden asetukset</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Muokkaa tätä sivustoa" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Muokkaa Ykkössivustot-osiota" data-reactid="129"><span data-reactid="130">Muokkaa</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Suositukset lähteestä Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Suositut aiheet:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Nostot</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/fr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/fr/activity-stream-prerendered.html
index 368110e84996..a7a87685bb70 100644
--- a/browser/extensions/activity-stream/prerendered/locales/fr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/fr/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1541352432"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Rechercher sur le Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Rechercher sur le Web" title="Rechercher sur le Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Rechercher" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Rechercher</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites les plus visités</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informations" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites les plus visités</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accédez aux sites que vous consultez le plus.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Préférences Nouvel onglet</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Modifier ce site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Modifier ce site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Modifier ce site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Modifier ce site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Modifier ce site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Modifier ce site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Modifier ce site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Modifier ce site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Modifier ce site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Modifier ce site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Modifier ce site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Modifier ce site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personnaliser la section Sites les plus visités" data-reactid="141"><span data-reactid="142">Modifier</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommandations par Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Sujets populaires :</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Éléments-clés</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1784993764"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Rechercher sur le Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Rechercher sur le Web" title="Rechercher sur le Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Rechercher" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Rechercher</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites les plus visités</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informations" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites les plus visités</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accédez aux sites que vous consultez le plus.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Préférences Nouvel onglet</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Modifier ce site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personnaliser la section Sites les plus visités" data-reactid="129"><span data-reactid="130">Modifier</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommandations par Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Sujets populaires :</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Éléments-clés</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream-prerendered.html
index 4dd4a73f567d..dfdbc0291838 100644
--- a/browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/fy-NL/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1980948586"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Sykje op it web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Sykje op it web" title="Sykje op it web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Sykje" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Sykje</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Topwebsites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ynfo" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Topwebsites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Benaderje de websites dy&#x27;t jo it meast besykje.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nij ljepblêdfoarkarren</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Dizze side bewurkje" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Jo seksje Topwebsites oanpasse" data-reactid="141"><span data-reactid="142">Bewurkje</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Oanrekommandearre troch Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populêre ûnderwerpen:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Hichtepunten</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1562364810"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Sykje op it web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Sykje op it web" title="Sykje op it web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Sykje" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Sykje</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Topwebsites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ynfo" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Topwebsites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Benaderje de websites dy&#x27;t jo it meast besykje.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nij ljepblêdfoarkarren</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Dizze side bewurkje" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Jo seksje Topwebsites oanpasse" data-reactid="129"><span data-reactid="130">Bewurkje</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Oanrekommandearre troch Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populêre ûnderwerpen:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Hichtepunten</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream-prerendered.html
index 482bdab817ec..3a280b15e327 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ga-IE/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-174502745"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cuardaigh an Gréasán</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cuardaigh an Gréasán" title="Cuardaigh an Gréasán" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cuardach" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cuardach</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Barrshuímh</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Barrshuímh</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Na suímh Ghréasáin a dtugann tú cuairt orthu is minice.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Sainroghanna do Chluaisín Nua</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Cuir an suíomh seo in eagar" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Saincheap na Barrshuímh" data-reactid="141"><span data-reactid="142">Eagar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Topaicí i mbéal an phobail:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-411830117"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cuardaigh an Gréasán</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cuardaigh an Gréasán" title="Cuardaigh an Gréasán" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cuardach" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cuardach</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Barrshuímh</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Barrshuímh</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Na suímh Ghréasáin a dtugann tú cuairt orthu is minice.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Sainroghanna do Chluaisín Nua</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Cuir an suíomh seo in eagar" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Saincheap na Barrshuímh" data-reactid="129"><span data-reactid="130">Eagar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Topaicí i mbéal an phobail:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/gd/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/gd/activity-stream-prerendered.html
index 4659920a2c3e..7c6147f8ac9d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/gd/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/gd/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-601139019"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Lorg air an lìon</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Lorg air an lìon" title="Lorg air an lìon" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Lorg" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Lorg</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Brod nan làrach</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Fiosrachadh" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Brod nan làrach</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Faigh cothrom air na làraichean air an tadhail thu gu tric.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Roghainnean nan tabaichean ùra</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Deasaich an làrach seo" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Gnàthaich earrann brod nan làrach agad" data-reactid="141"><span data-reactid="142">Deasaich</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">’Ga mholadh le Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Cuspairean fèillmhor:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Sàr-roghainn</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-822344520"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Lorg air an lìon</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Lorg air an lìon" title="Lorg air an lìon" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Lorg" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Lorg</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Brod nan làrach</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Fiosrachadh" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Brod nan làrach</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Faigh cothrom air na làraichean air an tadhail thu gu tric.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Roghainnean nan tabaichean ùra</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Deasaich an làrach seo" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Gnàthaich earrann brod nan làrach agad" data-reactid="129"><span data-reactid="130">Deasaich</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">’Ga mholadh le Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Cuspairean fèillmhor:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Sàr-roghainn</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/gl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/gl/activity-stream-prerendered.html
index fe8fb6a3a497..e01d98035905 100644
--- a/browser/extensions/activity-stream/prerendered/locales/gl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/gl/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1894716539"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar na Web" title="Buscar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios favoritos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceda aos sitios web que máis visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nova lapela</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este sitio" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este sitio" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este sitio" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este sitio" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este sitio" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este sitio" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este sitio" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este sitio" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este sitio" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este sitio" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este sitio" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este sitio" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar a sección de sitios favoritos" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temas populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="502186095"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Buscar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Buscar na Web" title="Buscar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Buscar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Buscar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitios favoritos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Información" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitios favoritos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceda aos sitios web que máis visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencias de nova lapela</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este sitio" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar a sección de sitios favoritos" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temas populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destacados</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/gn/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/gn/activity-stream-prerendered.html
index fc78bc985988..9c2fc2a663a6 100644
--- a/browser/extensions/activity-stream/prerendered/locales/gn/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/gn/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="480079125"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Ñandutivevépe Jeheka</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Ñandutivevépe Jeheka" title="Ñandutivevépe Jeheka" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Eheka" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Eheka</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Tenda Ojehechavéva</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Kuaarã" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Tenda Ojeikevéva</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Eike ñandutirenda rehechajepivévape.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Tendayke Pyahu Jeguererohoryrã</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Embosako&#x27;i ko tenda" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Eñemomba&#x27;e Tendáre ojehechaukahápe Togue Ojehechavéva" data-reactid="141"><span data-reactid="142">Mbosako&#x27;i</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket he&#x27;i ndéve reike hag̃ua</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Ñe&#x27;ẽmbyrã Ojehayhuvéva:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Mba&#x27;eporãitéva</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="663886104"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Ñandutivevépe Jeheka</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Ñandutivevépe Jeheka" title="Ñandutivevépe Jeheka" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Eheka" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Eheka</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Tenda Ojehechavéva</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Kuaarã" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Tenda Ojeikevéva</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Eike ñandutirenda rehechajepivévape.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Tendayke Pyahu Jeguererohoryrã</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Embosako&#x27;i ko tenda" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Eñemomba&#x27;e Tendáre ojehechaukahápe Togue Ojehechavéva" data-reactid="129"><span data-reactid="130">Mbosako&#x27;i</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket he&#x27;i ndéve reike hag̃ua</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Ñe&#x27;ẽmbyrã Ojehayhuvéva:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Mba&#x27;eporãitéva</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream-prerendered.html
index 177c743b27d0..556f97671569 100644
--- a/browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1945433737"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">વેબ પર શોધો</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="વેબ પર શોધો" title="વેબ પર શોધો" data-reactid="7"/><button id="searchSubmit" class="search-button" title="શોધો" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">શોધો</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ટોપ સાઇટ્સ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="માહિતી" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ટોચની સાઇટ્સ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">તમે સૌથી વધુ મુલાકાત લો છો તે વેબસાઇટ્સને ઍક્સેસ કરો.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">નવી ટેબ પસંદગીઓ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="આ સાઇટને સંપાદિત કરો" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="તમારા ટોચના સાઇટ્સ વિભાગને કસ્ટમાઇઝ કરો" data-reactid="141"><span data-reactid="142">ફેરફાર કરો</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">દ્વારા ભલામણ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">લોકપ્રિય વિષયો:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">વીતી ગયેલું</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="871150955"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">વેબ પર શોધો</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="વેબ પર શોધો" title="વેબ પર શોધો" data-reactid="7"/><button id="searchSubmit" class="search-button" title="શોધો" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">શોધો</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ટોપ સાઇટ્સ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="માહિતી" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ટોચની સાઇટ્સ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">તમે સૌથી વધુ મુલાકાત લો છો તે વેબસાઇટ્સને ઍક્સેસ કરો.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">નવી ટેબ પસંદગીઓ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="આ સાઇટને સંપાદિત કરો" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="તમારા ટોચના સાઇટ્સ વિભાગને કસ્ટમાઇઝ કરો" data-reactid="129"><span data-reactid="130">ફેરફાર કરો</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">દ્વારા ભલામણ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">લોકપ્રિય વિષયો:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">વીતી ગયેલું</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/he/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/he/activity-stream-prerendered.html
index 6a25404f71f7..ec9420786cd9 100644
--- a/browser/extensions/activity-stream/prerendered/locales/he/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/he/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="729745085"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">חיפוש ברשת</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="חיפוש ברשת" title="חיפוש ברשת" data-reactid="7"/><button id="searchSubmit" class="search-button" title="חיפוש" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">חיפוש</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">אתרים מובילים</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="מידע" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">אתרים מובילים</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">גישה לאתרים בהם ביקרת הכי הרבה.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">העדפות לשונית חדשה</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="עריכת אתר זה" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="התאמת אגף האתרים המובילים שלך" data-reactid="141"><span data-reactid="142">עריכה</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">מומלץ על ידי Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">נושאים פופולריים:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">מומלצים</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-919489871"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">חיפוש ברשת</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="חיפוש ברשת" title="חיפוש ברשת" data-reactid="7"/><button id="searchSubmit" class="search-button" title="חיפוש" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">חיפוש</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">אתרים מובילים</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="מידע" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">אתרים מובילים</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">גישה לאתרים בהם ביקרת הכי הרבה.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">העדפות לשונית חדשה</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="עריכת אתר זה" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="התאמת אגף האתרים המובילים שלך" data-reactid="129"><span data-reactid="130">עריכה</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">מומלץ על ידי Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">נושאים פופולריים:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">מומלצים</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/hi-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/hi-IN/activity-stream-prerendered.html
index 4db403cb40a7..0fcc805d4301 100644
--- a/browser/extensions/activity-stream/prerendered/locales/hi-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/hi-IN/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2025910400"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेब पर खोजें</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेब पर खोजें" title="वेब पर खोजें" data-reactid="7"/><button id="searchSubmit" class="search-button" title="खोज" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">खोज</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">सर्वोच्च साइटें</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="सूचना" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">सर्वोच्च साइटें</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">आपके द्वारा सबसे ज्यादा खोजी जाने वाली वेबसाइट्स देखें.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नयी टैब वरीयताएँ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="इस साइट को संपादित करें" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="अपने शीर्ष साइट्स अनुभाग को अनुकूलित करें" data-reactid="141"><span data-reactid="142">संपादित करें</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket द्वारा अनुशंसित</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">लोकप्रिय विषय:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">झलकियाँ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1584678028"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेब पर खोजें</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेब पर खोजें" title="वेब पर खोजें" data-reactid="7"/><button id="searchSubmit" class="search-button" title="खोज" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">खोज</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">सर्वोच्च साइटें</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="सूचना" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">सर्वोच्च साइटें</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">आपके द्वारा सबसे ज्यादा खोजी जाने वाली वेबसाइट्स देखें.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नयी टैब वरीयताएँ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="इस साइट को संपादित करें" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="अपने शीर्ष साइट्स अनुभाग को अनुकूलित करें" data-reactid="129"><span data-reactid="130">संपादित करें</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket द्वारा अनुशंसित</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">लोकप्रिय विषय:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">झलकियाँ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/hr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/hr/activity-stream-prerendered.html
index 85367f78e4f1..45768ca5e026 100644
--- a/browser/extensions/activity-stream/prerendered/locales/hr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/hr/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1829576655"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pretraži web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pretraži web" title="Pretraži web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Traži" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Traži</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najbolje stranice</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najbolje stranice</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pristupite stranicama koje najčešće posjećujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Postavke nove kartice</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Uredi ovu stranicu" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Prilagodite odjel s najboljim stranicama" data-reactid="141"><span data-reactid="142">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Preporučeno od Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popularne teme:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Istaknuto</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-748237885"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pretraži web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pretraži web" title="Pretraži web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Traži" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Traži</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najbolje stranice</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najbolje stranice</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pristupite stranicama koje najčešće posjećujete.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Postavke nove kartice</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi ovu stranicu" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Prilagodite odjel s najboljim stranicama" data-reactid="129"><span data-reactid="130">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Preporučeno od Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popularne teme:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Istaknuto</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/hsb/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/hsb/activity-stream-prerendered.html
index d287f39b78cd..78f6e4d80ed9 100644
--- a/browser/extensions/activity-stream/prerendered/locales/hsb/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/hsb/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1682406537"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web přepytać</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web přepytać" title="Web přepytać" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pytać" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pytać</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najhusćišo wopytane sydła</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najhusćišo wopytane sydła</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Wočińće websydła, kotrež sće najhusćišo wopytał.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastajenja noweho rajtarka</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Tute sydło wobdźěłać" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Přiměrće wotrězk swojich najhusćišo wopytanych sydłow" data-reactid="141"><span data-reactid="142">Wobdźěłać</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Wot Pocket doporučeny</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Woblubowane temy:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Wjerški</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="242952332"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web přepytać</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web přepytać" title="Web přepytać" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pytać" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pytać</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Najhusćišo wopytane sydła</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Najhusćišo wopytane sydła</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Wočińće websydła, kotrež sće najhusćišo wopytał.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastajenja noweho rajtarka</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Tute sydło wobdźěłać" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Přiměrće wotrězk swojich najhusćišo wopytanych sydłow" data-reactid="129"><span data-reactid="130">Wobdźěłać</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Wot Pocket doporučeny</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Woblubowane temy:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Wjerški</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/hu/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/hu/activity-stream-prerendered.html
index c5770ac5a9cf..7c6b75215c72 100644
--- a/browser/extensions/activity-stream/prerendered/locales/hu/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/hu/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-13614590"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Keresés a weben</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Keresés a weben" title="Keresés a weben" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Keresés" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Keresés</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Népszerű oldalak</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Információ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Népszerű oldalak</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">A leggyakrabban látogatott webhelyek elérése.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Új lap beállításai</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Webhely szerkesztése" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="A Népszerű oldalak rész testreszabása" data-reactid="141"><span data-reactid="142">Szerkesztés</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">A(z) Pocket ajánlásával</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Népszerű témák:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Kiemelések</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="365161974"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Keresés a weben</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Keresés a weben" title="Keresés a weben" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Keresés" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Keresés</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Népszerű oldalak</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Információ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Népszerű oldalak</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">A leggyakrabban látogatott webhelyek elérése.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Új lap beállításai</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Webhely szerkesztése" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="A Népszerű oldalak rész testreszabása" data-reactid="129"><span data-reactid="130">Szerkesztés</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">A(z) Pocket ajánlásával</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Népszerű témák:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Kiemelések</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/hy-AM/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/hy-AM/activity-stream-prerendered.html
index d9650318a917..d4f14bdf8db4 100644
--- a/browser/extensions/activity-stream/prerendered/locales/hy-AM/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/hy-AM/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="313862243"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Որոնել առցանց</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Որոնել առցանց" title="Որոնել առցանց" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Լավագույն կայքեր</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Գունանշում</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1267608489"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Որոնել առցանց</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Որոնել առցանց" title="Որոնել առցանց" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Լավագույն կայքեր</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Գունանշում</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ia/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ia/activity-stream-prerendered.html
index 7389d5914287..064edca00bfc 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ia/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ia/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="987762986"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cercar in le Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cercar in le Web" title="Cercar in le Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cercar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cercar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitos popular</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informationes" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitos popular</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder al sitos web que tu plus visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferentias de nove scheda</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar iste sito" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar iste sito" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar iste sito" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar iste sito" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar iste sito" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar iste sito" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar iste sito" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar iste sito" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar iste sito" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar iste sito" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar iste sito" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar iste sito" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalisar tu section de sitos popular" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommendate per Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Subjectos popular:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">In evidentia</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-764494562"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cercar in le Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cercar in le Web" title="Cercar in le Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cercar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cercar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sitos popular</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informationes" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sitos popular</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder al sitos web que tu plus visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferentias de nove scheda</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar iste sito" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalisar tu section de sitos popular" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommendate per Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Subjectos popular:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">In evidentia</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/id/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/id/activity-stream-prerendered.html
index aa805f16c59f..1750b472fda5 100644
--- a/browser/extensions/activity-stream/prerendered/locales/id/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/id/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="988612748"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cari di Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cari di Web" title="Cari di Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cari" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cari</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Situs Teratas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Situs Teratas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Mengakses situs web yang paling sering Anda kunjungi.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferensi Tab Baru</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Sunting situs ini" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Ubahsuai bagian Situs Teratas Anda" data-reactid="141"><span data-reactid="142">Sunting</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Disarankan oleh Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Topik Populer:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Sorotan</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-691096448"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cari di Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cari di Web" title="Cari di Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cari" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cari</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Situs Teratas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Situs Teratas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Mengakses situs web yang paling sering Anda kunjungi.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferensi Tab Baru</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Sunting situs ini" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Ubahsuai bagian Situs Teratas Anda" data-reactid="129"><span data-reactid="130">Sunting</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Disarankan oleh Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Topik Populer:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Sorotan</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/it/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/it/activity-stream-prerendered.html
index 540f2ca7a264..97c5a45acd79 100644
--- a/browser/extensions/activity-stream/prerendered/locales/it/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/it/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-761389879"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cerca sul Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cerca sul Web" title="Cerca sul Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Siti principali</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Siti principali</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accedi ai siti che visiti più spesso.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferenze Nuova scheda</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Modifica questo sito" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizza la sezione Siti principali" data-reactid="141"><span data-reactid="142">Modifica</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Consigliati da Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Argomenti popolari:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">In evidenza</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2104936637"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cerca sul Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cerca sul Web" title="Cerca sul Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Siti principali</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Siti principali</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accedi ai siti che visiti più spesso.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferenze Nuova scheda</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Modifica questo sito" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizza la sezione Siti principali" data-reactid="129"><span data-reactid="130">Modifica</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Consigliati da Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Argomenti popolari:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">In evidenza</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ja/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ja/activity-stream-prerendered.html
index b18f7fe75155..8ea8f0d526e6 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ja/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ja/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-747538807"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ウェブを検索</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ウェブを検索" title="ウェブを検索" data-reactid="7"/><button id="searchSubmit" class="search-button" title="検索" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">検索</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">トップサイト</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="情報" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">トップサイト</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">よく訪れるサイトへアクセス。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新しいタブの設定</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="このサイトを編集" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="このサイトを編集" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="このサイトを編集" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="このサイトを編集" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="このサイトを編集" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="このサイトを編集" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="このサイトを編集" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="このサイトを編集" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="このサイトを編集" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="このサイトを編集" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="このサイトを編集" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="このサイトを編集" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="トップサイトの項目をカスタマイズ" data-reactid="141"><span data-reactid="142">編集</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket のおすすめ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">人気のトピック:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ハイライト</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1400561012"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ウェブを検索</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ウェブを検索" title="ウェブを検索" data-reactid="7"/><button id="searchSubmit" class="search-button" title="検索" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">検索</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">トップサイト</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="情報" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">トップサイト</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">よく訪れるサイトへアクセス。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新しいタブの設定</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="このサイトを編集" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="トップサイトの項目をカスタマイズ" data-reactid="129"><span data-reactid="130">編集</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket のおすすめ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">人気のトピック:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ハイライト</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ka/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ka/activity-stream-prerendered.html
index 250e6ce65d5a..051b352aa305 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ka/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ka/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2017372346"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ინტერნეტში ძიება</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ინტერნეტში ძიება" title="ინტერნეტში ძიება" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ძიება" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ძიება</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">რჩეული საიტები</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ინფორმაცია" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">რჩეული საიტები</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">წვდომა ხშირად მონახულებულ საიტებთან.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ახალი ჩანართის პარამეტრები</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="საიტის ჩასწორება" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="მოირგეთ რჩეული საიტების განყოფილება" data-reactid="141"><span data-reactid="142">ჩასწორება</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">რეკომენდებულია Pocket-ის მიერ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">პოპულარული თემები:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">მნიშვნელოვანი საიტები</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="566952777"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ინტერნეტში ძიება</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ინტერნეტში ძიება" title="ინტერნეტში ძიება" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ძიება" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ძიება</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">რჩეული საიტები</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ინფორმაცია" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">რჩეული საიტები</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">წვდომა ხშირად მონახულებულ საიტებთან.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ახალი ჩანართის პარამეტრები</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="საიტის ჩასწორება" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="მოირგეთ რჩეული საიტების განყოფილება" data-reactid="129"><span data-reactid="130">ჩასწორება</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">რეკომენდებულია Pocket-ის მიერ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">პოპულარული თემები:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">მნიშვნელოვანი საიტები</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/kab/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/kab/activity-stream-prerendered.html
index 481640f29d76..8a051a52fec8 100644
--- a/browser/extensions/activity-stream/prerendered/locales/kab/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/kab/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-704718782"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Nadi di Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Nadi di Web" title="Nadi di Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Nadi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Nadi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ismal ifazen</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Talɣut" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Ismal ifazen</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Kcem ar yesmal web i trezzuḍ s waṭas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Ismenyifen n yiccer amaynut</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Ẓreg asmel-agi" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Sagen tigezmi n ismal ifazen" data-reactid="141"><span data-reactid="142">Ẓreg</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Iwelleh-it-id Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Isental ittwasnen aṭas:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Asebrureq</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1982692283"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Nadi di Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Nadi di Web" title="Nadi di Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Nadi" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Nadi</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ismal ifazen</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Talɣut" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Ismal ifazen</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Kcem ar yesmal web i trezzuḍ s waṭas.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Ismenyifen n yiccer amaynut</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Ẓreg asmel-agi" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Sagen tigezmi n ismal ifazen" data-reactid="129"><span data-reactid="130">Ẓreg</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Iwelleh-it-id Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Isental ittwasnen aṭas:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Asebrureq</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/kk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/kk/activity-stream-prerendered.html
index 957d10d0a3ce..c41ae864ab6a 100644
--- a/browser/extensions/activity-stream/prerendered/locales/kk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/kk/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1340026533"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Интернетте іздеу</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Интернетте іздеу" title="Интернетте іздеу" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Іздеу" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Іздеу</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Үздік сайттар</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ақпарат" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Үздік сайттар</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Көбірек қаралатын сайттарға қатынау.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Жаңа бет баптаулары</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Бұл сайтты түзету" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Топ сайттар санатын баптау" data-reactid="141"><span data-reactid="142">Түзету</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Ұсынушы Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Әйгілі тақырыптар:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Ерекше жаңалықтар</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1510112606"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Интернетте іздеу</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Интернетте іздеу" title="Интернетте іздеу" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Іздеу" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Іздеу</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Үздік сайттар</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Ақпарат" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Үздік сайттар</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Көбірек қаралатын сайттарға қатынау.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Жаңа бет баптаулары</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Бұл сайтты түзету" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Топ сайттар санатын баптау" data-reactid="129"><span data-reactid="130">Түзету</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Ұсынушы Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Әйгілі тақырыптар:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Ерекше жаңалықтар</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/km/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/km/activity-stream-prerendered.html
index 225b6815aa8c..02c57e6b8ac8 100644
--- a/browser/extensions/activity-stream/prerendered/locales/km/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/km/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1063045806"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ស្វែងរក​បណ្ដាញ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ស្វែងរក​បណ្ដាញ" title="ស្វែងរក​បណ្ដាញ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ស្វែងរក" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ស្វែងរក</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">វិបសាយ​លើ​គេ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ព័ត៌មាន" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">សាយកំពូល</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ចូលវេបសាយដែលអ្នកទស្សនាច្រើនបំផុត។</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ចំណង់ចំណូលចិត្ត ផ្ទាំងថ្មី</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="កែសម្រួលសាយនេះ" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">កែសម្រួល</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">បានណែនាំដោយ Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ប្រធានបទកំពុងពេញនិយម៖</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">រឿងសំខាន់ៗ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="487421617"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ស្វែងរក​បណ្ដាញ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ស្វែងរក​បណ្ដាញ" title="ស្វែងរក​បណ្ដាញ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ស្វែងរក" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ស្វែងរក</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">វិបសាយ​លើ​គេ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ព័ត៌មាន" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">សាយកំពូល</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ចូលវេបសាយដែលអ្នកទស្សនាច្រើនបំផុត។</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ចំណង់ចំណូលចិត្ត ផ្ទាំងថ្មី</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="កែសម្រួលសាយនេះ" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">កែសម្រួល</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">បានណែនាំដោយ Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ប្រធានបទកំពុងពេញនិយម៖</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">រឿងសំខាន់ៗ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/kn/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/kn/activity-stream-prerendered.html
index 4d76a1d8b59f..069b6bb009d1 100644
--- a/browser/extensions/activity-stream/prerendered/locales/kn/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/kn/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1798974404"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ" title="ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ಹುಡುಕು" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ಹುಡುಕು</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ಪ್ರಮುಖ ತಾಣಗಳು</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ಮಾಹಿತಿ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ಪ್ರಮುಖ ತಾಣಗಳು</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ನೀವು ಅತಿ ಹೆಚ್ಚು ನೋಡುವ ಜಾಲತಾಣಗಳಿಗೆ ಪ್ರವೇಶದ್ವಾರ.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ಹೊಸ ಹಾಳೆಯ ಆದ್ಯತೆಗಳು</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">‍ತಿದ್ದು</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket ರಿಂದ ಶಿಫಾರಸುಮಾಡುಲಾಗಿದೆ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ಜನಪ್ರಿಯವಾದ ವಿಷಯಗಳು:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ಮುಖ್ಯಾಂಶಗಳು</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-790636616"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ" title="ಅಂತರ್ಜಾಲವನ್ನು ಹುಡುಕಿ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ಹುಡುಕು" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ಹುಡುಕು</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ಪ್ರಮುಖ ತಾಣಗಳು</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ಮಾಹಿತಿ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ಪ್ರಮುಖ ತಾಣಗಳು</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ನೀವು ಅತಿ ಹೆಚ್ಚು ನೋಡುವ ಜಾಲತಾಣಗಳಿಗೆ ಪ್ರವೇಶದ್ವಾರ.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ಹೊಸ ಹಾಳೆಯ ಆದ್ಯತೆಗಳು</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ಈ ತಾಣವನ್ನು ಸಂಪಾದಿಸು" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">‍ತಿದ್ದು</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket ರಿಂದ ಶಿಫಾರಸುಮಾಡುಲಾಗಿದೆ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ಜನಪ್ರಿಯವಾದ ವಿಷಯಗಳು:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ಮುಖ್ಯಾಂಶಗಳು</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ko/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ko/activity-stream-prerendered.html
index 7778e5e0f337..62a6a9dd9a84 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ko/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ko/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1250624474"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">웹 검색</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="웹 검색" title="웹 검색" data-reactid="7"/><button id="searchSubmit" class="search-button" title="검색" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">검색</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">상위 사이트</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="정보" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">상위 사이트</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">가장 많이 방문한 웹 사이트에 접근하세요.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">새 탭 설정</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="이 사이트 수정" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="상위 사이트 영역 꾸미기" data-reactid="141"><span data-reactid="142">수정</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket 추천</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">인기 주제:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">하이라이트</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-715542578"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">웹 검색</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="웹 검색" title="웹 검색" data-reactid="7"/><button id="searchSubmit" class="search-button" title="검색" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">검색</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">상위 사이트</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="정보" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">상위 사이트</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">가장 많이 방문한 웹 사이트에 접근하세요.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">새 탭 설정</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="이 사이트 수정" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="상위 사이트 영역 꾸미기" data-reactid="129"><span data-reactid="130">수정</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket 추천</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">인기 주제:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">하이라이트</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/lij/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/lij/activity-stream-prerendered.html
index 3dea0e2b9171..3f16e3ec1c2d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/lij/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/lij/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1066403723"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Çerca inta Ræ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Çerca inta Ræ" title="Çerca inta Ræ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Çerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Çerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">I megio sciti</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">I megio sciti</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acedi a-i sciti che ti vixiti ciù de spesso.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferense neuvo feuggio</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Cangia sto scito" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizza a seçion I Megio Sciti" data-reactid="141"><span data-reactid="142">Cangia</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">In evidensa</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1510034561"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Çerca inta Ræ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Çerca inta Ræ" title="Çerca inta Ræ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Çerca" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Çerca</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">I megio sciti</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">I megio sciti</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acedi a-i sciti che ti vixiti ciù de spesso.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferense neuvo feuggio</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Cangia sto scito" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizza a seçion I Megio Sciti" data-reactid="129"><span data-reactid="130">Cangia</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">In evidensa</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/lo/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/lo/activity-stream-prerendered.html
index 9017abf0993c..279256f4f868 100644
--- a/browser/extensions/activity-stream/prerendered/locales/lo/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/lo/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="295696653"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ຄົ້ນຫາເວັບ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ຄົ້ນຫາເວັບ" title="ຄົ້ນຫາເວັບ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ຊອກ​ຫາ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ຊອກ​ຫາ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ເວັບໄຊຕ໌ຍອດນິຍົມ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ເວັບໄຊທ໌ຍອດນິຍົມ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ເຂົ້າເວັບໄຊທ໌ທີ່ທ່ານໄດ້ເຂົ້າໄປຫລາຍທີ່ສຸດ.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ການຕັ້ງຄ່າແທັບໃຫມ່</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="ປັບແຕ່ງພາກສ່ວນເວັບໄຊທ໌ຍອດນິຍົມຂອງທ່ານ" data-reactid="141"><span data-reactid="142">ແກ້ໄຂ</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ຫົວຂໍ້ຍອດນິຍົມ:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ລາຍການເດັ່ນ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1076648688"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ຄົ້ນຫາເວັບ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ຄົ້ນຫາເວັບ" title="ຄົ້ນຫາເວັບ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ຊອກ​ຫາ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ຊອກ​ຫາ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ເວັບໄຊຕ໌ຍອດນິຍົມ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ເວັບໄຊທ໌ຍອດນິຍົມ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ເຂົ້າເວັບໄຊທ໌ທີ່ທ່ານໄດ້ເຂົ້າໄປຫລາຍທີ່ສຸດ.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ການຕັ້ງຄ່າແທັບໃຫມ່</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ແກ້ໄຂເວັບໄຊທ໌ນີ້" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="ປັບແຕ່ງພາກສ່ວນເວັບໄຊທ໌ຍອດນິຍົມຂອງທ່ານ" data-reactid="129"><span data-reactid="130">ແກ້ໄຂ</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ຫົວຂໍ້ຍອດນິຍົມ:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ລາຍການເດັ່ນ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/lt/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/lt/activity-stream-prerendered.html
index d78995427d3d..f1ec753762bc 100644
--- a/browser/extensions/activity-stream/prerendered/locales/lt/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/lt/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1136614092"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Ieškokite saityne</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Ieškokite saityne" title="Ieškokite saityne" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Ieškoti" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Ieškoti</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lankomiausios svetainės</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacija" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Lankomiausios svetainės</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pasiekite jūsų dažniausiai lankomas svetaines.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Naujos kortelės nuostatos</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Redaguoti šią svetainę" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Tinkinkite savo lankomiausių svetainių skiltį" data-reactid="141"><span data-reactid="142">Keisti</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Rekomendavo „Pocket“</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populiarios temos:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Akcentai</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1524412105"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Ieškokite saityne</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Ieškokite saityne" title="Ieškokite saityne" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Ieškoti" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Ieškoti</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Lankomiausios svetainės</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacija" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Lankomiausios svetainės</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Pasiekite jūsų dažniausiai lankomas svetaines.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Naujos kortelės nuostatos</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Redaguoti šią svetainę" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Tinkinkite savo lankomiausių svetainių skiltį" data-reactid="129"><span data-reactid="130">Keisti</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Rekomendavo „Pocket“</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populiarios temos:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Akcentai</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ltg/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ltg/activity-stream-prerendered.html
index d6adc0d76410..550d77281910 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ltg/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ltg/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-248511650"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Mekleit teiklā</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Mekleit teiklā" title="Mekleit teiklā" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Mekleit" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Mekleit</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Popularōkōs lopys</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informaceja" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top lopys</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Sajam pīeju lopom, kuras apskoti vysvaira.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Jaunas cilnes īstatiejumi</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Maineit lopu" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Maineit lopu" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Maineit lopu" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Maineit lopu" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Maineit lopu" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Maineit lopu" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Maineit lopu" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Maineit lopu" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Maineit lopu" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Maineit lopu" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Maineit lopu" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Maineit lopu" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Īstoti sovu top lopu sadaļu" data-reactid="141"><span data-reactid="142">Redigeit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket īsaceitōs</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popularas tēmas:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Izraudzeitī</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1529786194"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Mekleit teiklā</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Mekleit teiklā" title="Mekleit teiklā" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Mekleit" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Mekleit</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Popularōkōs lopys</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informaceja" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top lopys</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Sajam pīeju lopom, kuras apskoti vysvaira.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Jaunas cilnes īstatiejumi</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Maineit lopu" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Īstoti sovu top lopu sadaļu" data-reactid="129"><span data-reactid="130">Redigeit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket īsaceitōs</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popularas tēmas:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Izraudzeitī</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/lv/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/lv/activity-stream-prerendered.html
index 266188b04e92..26e8929a821e 100644
--- a/browser/extensions/activity-stream/prerendered/locales/lv/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/lv/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2117287242"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Meklēt internetā</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Meklēt internetā" title="Meklēt internetā" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Meklēt" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Meklēt</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Populārākās lapas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informācija" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Populārākās lapas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ātri nokļūstiet biežāk apmeklētajās lapās.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Jaunas cilnes iestatījumi</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Rediģēt šo lapu" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Pielāgot populārāko lapu sadaļu" data-reactid="141"><span data-reactid="142">Rediģēt</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Iesaka Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populārās tēmas:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Aktualitātes</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="251849022"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Meklēt internetā</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Meklēt internetā" title="Meklēt internetā" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Meklēt" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Meklēt</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Populārākās lapas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informācija" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Populārākās lapas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ātri nokļūstiet biežāk apmeklētajās lapās.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Jaunas cilnes iestatījumi</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Rediģēt šo lapu" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Pielāgot populārāko lapu sadaļu" data-reactid="129"><span data-reactid="130">Rediģēt</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Iesaka Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populārās tēmas:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Aktualitātes</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/mk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/mk/activity-stream-prerendered.html
index b01115ae96ec..eca11aeb411c 100644
--- a/browser/extensions/activity-stream/prerendered/locales/mk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/mk/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1175733872"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пребарајте на Интернет</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пребарајте на Интернет" title="Пребарајте на Интернет" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Барај" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Барај</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Популарни мрежни места</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Инфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Популарни мрежни места</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Пристапете до мрежните места што ги посетувате најмногу.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Преференци за Ново јазиче</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Уреди го ова место" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Прилагодете ги вашите Популарни мрежни места" data-reactid="141"><span data-reactid="142">Уреди</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Препорачано од Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Популарни теми:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Интереси</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1438816877"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пребарајте на Интернет</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пребарајте на Интернет" title="Пребарајте на Интернет" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Барај" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Барај</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Популарни мрежни места</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Инфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Популарни мрежни места</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Пристапете до мрежните места што ги посетувате најмногу.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Преференци за Ново јазиче</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди го ова место" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Прилагодете ги вашите Популарни мрежни места" data-reactid="129"><span data-reactid="130">Уреди</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Препорачано од Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Популарни теми:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Интереси</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ml/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ml/activity-stream-prerendered.html
index fd8c293fcf3a..90281264faa5 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ml/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ml/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-129403969"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ഇൻറർനെറ്റിൽ തിരയുക</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ഇൻറർനെറ്റിൽ തിരയുക" title="ഇൻറർനെറ്റിൽ തിരയുക" data-reactid="7"/><button id="searchSubmit" class="search-button" title="തിരയുക" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">തിരയുക</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">മികച്ച സൈറ്റുകൾ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="വിവരം" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">മുന്നേറിയ സൈറ്റുകൾ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">നിങ്ങൾ കൂടുതൽ സന്ദർശിക്കുന്ന വെബ്‌സൈറ്റുകളിൽ പ്രവേശിക്കുക.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">പുതിയ ടാബിന്റെ മുൻഗണനകൾ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="നിങ്ങളുടെ മുന്നേറിയ സൈറ്റുകളുടെ വിഭാഗം ഇഷ്ടാനുസൃതമാക്കുക" data-reactid="141"><span data-reactid="142">തിരുത്തുക</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket ശുപാർശ ചെയ്തത്</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ജനപ്രിയ വിഷയങ്ങൾ:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ഹൈലൈറ്റുകൾ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1921195970"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ഇൻറർനെറ്റിൽ തിരയുക</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ഇൻറർനെറ്റിൽ തിരയുക" title="ഇൻറർനെറ്റിൽ തിരയുക" data-reactid="7"/><button id="searchSubmit" class="search-button" title="തിരയുക" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">തിരയുക</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">മികച്ച സൈറ്റുകൾ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="വിവരം" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">മുന്നേറിയ സൈറ്റുകൾ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">നിങ്ങൾ കൂടുതൽ സന്ദർശിക്കുന്ന വെബ്‌സൈറ്റുകളിൽ പ്രവേശിക്കുക.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">പുതിയ ടാബിന്റെ മുൻഗണനകൾ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ഈ സൈറ്റ് തിരുത്തുക" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="നിങ്ങളുടെ മുന്നേറിയ സൈറ്റുകളുടെ വിഭാഗം ഇഷ്ടാനുസൃതമാക്കുക" data-reactid="129"><span data-reactid="130">തിരുത്തുക</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket ശുപാർശ ചെയ്തത്</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ജനപ്രിയ വിഷയങ്ങൾ:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ഹൈലൈറ്റുകൾ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/mr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/mr/activity-stream-prerendered.html
index 325a762050c6..1b973949922e 100644
--- a/browser/extensions/activity-stream/prerendered/locales/mr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/mr/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1060839120"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेबवर शोधा</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेबवर शोधा" title="वेबवर शोधा" data-reactid="7"/><button id="searchSubmit" class="search-button" title="शोधा" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">शोधा</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">खास साईट्स</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नवीन टॅब प्राधान्ये</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ठळक</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-66598204"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेबवर शोधा</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेबवर शोधा" title="वेबवर शोधा" data-reactid="7"/><button id="searchSubmit" class="search-button" title="शोधा" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">शोधा</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">खास साईट्स</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नवीन टॅब प्राधान्ये</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ठळक</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ms/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ms/activity-stream-prerendered.html
index 2713db3f0362..54a74f43117a 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ms/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ms/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="738981019"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cari dalam Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cari dalam Web" title="Cari dalam Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cari" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cari</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Laman Teratas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Laman Teratas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Akses laman web yang paling banyak dilawati.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Keutamaan Tab Baru</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit laman ini" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit laman ini" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit laman ini" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit laman ini" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit laman ini" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit laman ini" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit laman ini" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit laman ini" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit laman ini" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit laman ini" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit laman ini" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit laman ini" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Sesuaikan bahagian Laman Teratas anda" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Disyorkan oleh Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Topik Popular:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Serlahan</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="176857246"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Cari dalam Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Cari dalam Web" title="Cari dalam Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Cari" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Cari</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Laman Teratas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Laman Teratas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Akses laman web yang paling banyak dilawati.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Keutamaan Tab Baru</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit laman ini" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Sesuaikan bahagian Laman Teratas anda" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Disyorkan oleh Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Topik Popular:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Serlahan</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/my/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/my/activity-stream-prerendered.html
index 7d8b1794beac..c8a78ff237d2 100644
--- a/browser/extensions/activity-stream/prerendered/locales/my/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/my/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2135032036"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း" title="ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ရှာ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ရှာ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">အများဆုံးသုံးဆိုက်များ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="အချက်အလက်" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ထိပ်တန်းဝတ်ဘ်ဆိုက်များ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">သင်အများဆုံးသွားလည်သော ဝတ်ဘ်ဆိုက်များကို ရယူပါ</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">စာတပ်ဗ်အသစ်အပြင်အဆင်များ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ဆိုက်အားပြင်မည်" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="သင့်ထိပ်တန်းဆိုက် အမြင်အားပြင်ဆင်ပါ" data-reactid="141"><span data-reactid="142">ပြင်ဆင်မည်</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket က အကြံပြုထားသည်</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">လူကြိုက်များခေါင်းစဉ်များ</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ဦးစားပေးအကြောင်းအရာများ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1671714017"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း" title="ဝတ်ဘ်ပေါ်တွင် ရှာဖွေခြင်း" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ရှာ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ရှာ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">အများဆုံးသုံးဆိုက်များ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="အချက်အလက်" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ထိပ်တန်းဝတ်ဘ်ဆိုက်များ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">သင်အများဆုံးသွားလည်သော ဝတ်ဘ်ဆိုက်များကို ရယူပါ</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">စာတပ်ဗ်အသစ်အပြင်အဆင်များ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ဆိုက်အားပြင်မည်" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="သင့်ထိပ်တန်းဆိုက် အမြင်အားပြင်ဆင်ပါ" data-reactid="129"><span data-reactid="130">ပြင်ဆင်မည်</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket က အကြံပြုထားသည်</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">လူကြိုက်များခေါင်းစဉ်များ</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ဦးစားပေးအကြောင်းအရာများ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/nb-NO/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/nb-NO/activity-stream-prerendered.html
index 732879ef2cd3..15e3c38dfbaa 100644
--- a/browser/extensions/activity-stream/prerendered/locales/nb-NO/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/nb-NO/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-157273908"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søk på nettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søk på nettet" title="Søk på nettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søk" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søk</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøkte nettsider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informasjon" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøkte</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Tilgang til nettsidene du besøker mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Innstillinger for Ny fane</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Rediger denne nettsiden" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Tilpass seksjonen Mest besøkte" data-reactid="141"><span data-reactid="142">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Anbefalt av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populære emner:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Høydepunkter</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-2113807168"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søk på nettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søk på nettet" title="Søk på nettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søk" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søk</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøkte nettsider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informasjon" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøkte</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Tilgang til nettsidene du besøker mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Innstillinger for Ny fane</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsiden" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Tilpass seksjonen Mest besøkte" data-reactid="129"><span data-reactid="130">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Anbefalt av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populære emner:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Høydepunkter</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-prerendered.html
index 5501afff8e35..2ecb6d70d1f0 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-753831803"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेबमा खोज्नुहोस्</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेबमा खोज्नुहोस्" title="वेबमा खोज्नुहोस्" data-reactid="7"/><button id="searchSubmit" class="search-button" title="खोजी गर्नुहोस्" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">खोजी गर्नुहोस्</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">शीर्ष साइटहरु</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="जानकारी" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">शीर्ष साइटहरू</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">तपाईले धेरै भ्रमण गर्नुभएका वेबसाइटहरूमा पहुँच गर्नुहोस् ।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नयाँ ट्याब प्राथमिकताहरू</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="तपाईंको शीर्ष साइट खण्ड अनुकूलन गर्नुहोस्" data-reactid="141"><span data-reactid="142">सम्पादन गर्नुहोस्</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket द्वारा सिफारिस गरिएको</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">विशेषताहरू</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1508265020"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">वेबमा खोज्नुहोस्</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="वेबमा खोज्नुहोस्" title="वेबमा खोज्नुहोस्" data-reactid="7"/><button id="searchSubmit" class="search-button" title="खोजी गर्नुहोस्" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">खोजी गर्नुहोस्</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">शीर्ष साइटहरु</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="जानकारी" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">शीर्ष साइटहरू</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">तपाईले धेरै भ्रमण गर्नुभएका वेबसाइटहरूमा पहुँच गर्नुहोस् ।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">नयाँ ट्याब प्राथमिकताहरू</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="यस साइटलाई सम्पादन गर्नुहोस्" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="तपाईंको शीर्ष साइट खण्ड अनुकूलन गर्नुहोस्" data-reactid="129"><span data-reactid="130">सम्पादन गर्नुहोस्</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket द्वारा सिफारिस गरिएको</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">लोकप्रिय शीर्षकहरू:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">विशेषताहरू</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-strings.js
index 8301f5dc78fe..266fac18cbf3 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/ne-NP/activity-stream-strings.js
@@ -38,9 +38,9 @@ window.gActivityStreamStrings = {
   "section_info_option": "जानकारी",
   "section_info_send_feedback": "प्रतिक्रिया पठाउनुहोस्",
   "section_info_privacy_notice": "गोपनीयता नीति",
-  "section_disclaimer_topstories": "The most interesting stories on the web, selected based on what you read. From Pocket, now part of Mozilla.",
-  "section_disclaimer_topstories_linktext": "Learn how it works.",
-  "section_disclaimer_topstories_buttontext": "Okay, got it",
+  "section_disclaimer_topstories": "वेबमा सबैभन्दा रोचक कथाहरू, तपाईंले पढ्नु भएको आधारमा Pocket बाट चयन गर्नुभएको छ।",
+  "section_disclaimer_topstories_linktext": "कसरी काम गर्छ हेर्नुहोस्।",
+  "section_disclaimer_topstories_buttontext": "बुझेँ",
   "welcome_title": "नयाँ ट्याबमा स्वागत छ",
   "welcome_body": "Firefoxले यस ठाउँको प्रयोग तपाईंको सबैभन्दा सान्दर्भिक पुस्तकचिनो, लेखहरू, भिडियोहरू, र तपाईंले हालै भ्रमण गर्नु भएको पृष्ठहरूलाई राख्न प्रयोग गर्दछ, जसले गर्दा तपाइँ तिनीहरूलाई सजिलै भेटाउन सक्नुहुनेछ ।",
   "welcome_label": "तपाईँका विशेषताहरु पत्ता लगाउँदै",
@@ -67,7 +67,7 @@ window.gActivityStreamStrings = {
   "settings_pane_snippets_header": "स्निप्पेटस्",
   "settings_pane_snippets_body": "Read short and sweet updates from Mozilla about Firefox, internet culture, and the occasional random meme.",
   "settings_pane_done_button": "सम्पन्न भयो",
-  "settings_pane_topstories_options_sponsored": "Show Sponsored Stories",
+  "settings_pane_topstories_options_sponsored": "प्रायोजित गरिएको कथाहरू देखाउनुहोस्",
   "edit_topsites_button_text": "सम्पादन गर्नुहोस्",
   "edit_topsites_button_label": "तपाईंको शीर्ष साइट खण्ड अनुकूलन गर्नुहोस्",
   "edit_topsites_showmore_button": "थप देखाउनुहोस्",
@@ -80,15 +80,15 @@ window.gActivityStreamStrings = {
   "edit_topsites_add_button": "थप्नुहोस्",
   "topsites_form_add_header": "नयाँ शीर्ष साइट",
   "topsites_form_edit_header": "शीर्ष साइट सम्पादन गर्नुहोस्",
-  "topsites_form_title_placeholder": "Enter a title",
-  "topsites_form_url_placeholder": "Type or paste a URL",
+  "topsites_form_title_placeholder": "शीर्षक प्रविष्ट गर्नुहोस्",
+  "topsites_form_url_placeholder": "URL लेख्नुहोस् ",
   "topsites_form_add_button": "थप्नुहोस्",
   "topsites_form_save_button": "सङ्ग्रह गर्नुहोस्",
   "topsites_form_cancel_button": "रद्द गर्नुहोस्",
-  "topsites_form_url_validation": "Valid URL required",
-  "pocket_read_more": "Popular Topics:",
-  "pocket_read_even_more": "View More Stories",
-  "pocket_feedback_header": "The best of the web, curated by over 25 million people.",
+  "topsites_form_url_validation": "मान्य URL चाहिन्छ",
+  "pocket_read_more": "लोकप्रिय शीर्षकहरू:",
+  "pocket_read_even_more": "अरू कथा देखाउनुहोस्",
+  "pocket_feedback_header": "वेबको सर्वोत्तम, 25 मिलियन भन्दा बढी व्यक्तिहरू द्वारा लिपिबद्ध।",
   "pocket_description": "Discover high-quality content you might otherwise miss, with help from Pocket, now part of Mozilla.",
   "highlights_empty_state": "Start browsing, and we’ll show some of the great articles, videos, and other pages you’ve recently visited or bookmarked here.",
   "topstories_empty_state": "You’ve caught up. Check back later for more top stories from {provider}. Can’t wait? Select a popular topic to find more great stories from around the web.",
diff --git a/browser/extensions/activity-stream/prerendered/locales/nl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/nl/activity-stream-prerendered.html
index a6cee22486fc..676ab484b4de 100644
--- a/browser/extensions/activity-stream/prerendered/locales/nl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/nl/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2102666854"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Zoeken op het web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Zoeken op het web" title="Zoeken op het web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Zoeken" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Zoeken</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Topwebsites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Topwebsites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">De websites benaderen die u het vaakst bezoekt.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nieuw-tabbladvoorkeuren</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Deze website bewerken" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Uw sectie Topwebsites aanpassen" data-reactid="141"><span data-reactid="142">Bewerken</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Aanbevolen door Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populaire onderwerpen:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-853880230"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Zoeken op het web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Zoeken op het web" title="Zoeken op het web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Zoeken" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Zoeken</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Topwebsites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Topwebsites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">De websites benaderen die u het vaakst bezoekt.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nieuw-tabbladvoorkeuren</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Deze website bewerken" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Uw sectie Topwebsites aanpassen" data-reactid="129"><span data-reactid="130">Bewerken</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Aanbevolen door Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populaire onderwerpen:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/nn-NO/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/nn-NO/activity-stream-prerendered.html
index 16a6940f26f5..d44e41676913 100644
--- a/browser/extensions/activity-stream/prerendered/locales/nn-NO/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/nn-NO/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="55912368"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søk på nettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søk på nettet" title="Søk på nettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søk" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søk</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøkte nettsider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøkte</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Tilgang til nettsidene du besøkjer mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Innstillingar for Ny fane</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Rediger denne nettsida" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Tilpass seksjonen Mest besøkte" data-reactid="141"><span data-reactid="142">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Tilrådd av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populære emne:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Høgdepunkt</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="892130212"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Søk på nettet</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Søk på nettet" title="Søk på nettet" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Søk" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Søk</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besøkte nettsider</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besøkte</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Tilgang til nettsidene du besøkjer mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Innstillingar for Ny fane</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Rediger denne nettsida" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Tilpass seksjonen Mest besøkte" data-reactid="129"><span data-reactid="130">Rediger</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Tilrådd av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populære emne:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Høgdepunkt</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/pa-IN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/pa-IN/activity-stream-prerendered.html
index d578a24df8c5..1276a964a0f8 100644
--- a/browser/extensions/activity-stream/prerendered/locales/pa-IN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/pa-IN/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1118348417"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ਵੈੱਬ ਨੂੰ ਖੋਜੋ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ਵੈੱਬ ਨੂੰ ਖੋਜੋ" title="ਵੈੱਬ ਨੂੰ ਖੋਜੋ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ਖੋਜੋ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ਖੋਜੋ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ਜਾਣਕਾਰੀ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ਵੈੱਬਸਾਈਟਾਂ, ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਸਭ ਤੋਂ ਵੱਧ ਖੋਲ੍ਹਿਆ ਹੈ, ਲਈ ਪਹੁੰਚ।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ਨਵੀਂ ਟੈਬ ਲਈ ਪਸੰਦਾਂ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="ਆਪਣੇ ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ ਭਾਗ ਨੂੰ ਲੋੜ ਮੁਤਾਬਕ ਢਾਲੋ" data-reactid="141"><span data-reactid="142">ਸੋਧੋ</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket ਵਲੋਂ ਸਿਫਾਰਸ਼ੀ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ਸੁਰਖੀਆਂ</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1048162172"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ਵੈੱਬ ਨੂੰ ਖੋਜੋ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ਵੈੱਬ ਨੂੰ ਖੋਜੋ" title="ਵੈੱਬ ਨੂੰ ਖੋਜੋ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ਖੋਜੋ" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ਖੋਜੋ</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ਜਾਣਕਾਰੀ" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ਵੈੱਬਸਾਈਟਾਂ, ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਸਭ ਤੋਂ ਵੱਧ ਖੋਲ੍ਹਿਆ ਹੈ, ਲਈ ਪਹੁੰਚ।</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ਨਵੀਂ ਟੈਬ ਲਈ ਪਸੰਦਾਂ</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ਇਹ ਸਾਈਟ ਨੂੰ ਸੋਧੋ" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="ਆਪਣੇ ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ ਭਾਗ ਨੂੰ ਲੋੜ ਮੁਤਾਬਕ ਢਾਲੋ" data-reactid="129"><span data-reactid="130">ਸੋਧੋ</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket ਵਲੋਂ ਸਿਫਾਰਸ਼ੀ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ਸੁਰਖੀਆਂ</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/pl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/pl/activity-stream-prerendered.html
index 33ba5d22b9be..e194e529c8f6 100644
--- a/browser/extensions/activity-stream/prerendered/locales/pl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/pl/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-470609126"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Szukaj</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Szukaj" title="Szukaj" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Szukaj" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Szukaj</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Popularne</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacja" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Popularne</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Otwieraj najczęściej odwiedzane strony.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencje nowej karty</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edytuj tę stronę" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Dostosuj często odwiedzane strony" data-reactid="141"><span data-reactid="142">Edytuj</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Poleca: Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popularne tematy:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Wyróżnione</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2090254094"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Szukaj</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Szukaj" title="Szukaj" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Szukaj" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Szukaj</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Popularne</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacja" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Popularne</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Otwieraj najczęściej odwiedzane strony.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferencje nowej karty</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edytuj tę stronę" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Dostosuj często odwiedzane strony" data-reactid="129"><span data-reactid="130">Edytuj</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Poleca: Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popularne tematy:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Wyróżnione</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/pt-BR/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/pt-BR/activity-stream-prerendered.html
index 13ede39d7200..43be3bf98f15 100644
--- a/browser/extensions/activity-stream/prerendered/locales/pt-BR/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/pt-BR/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-6745032"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pesquisar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pesquisar na Web" title="Pesquisar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pesquisar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pesquisar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites preferidos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites preferidos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acesse os sites que você mais visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferências de novas abas</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar a sua seção de sites preferidos" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Tópicos populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destaques</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="806469676"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pesquisar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pesquisar na Web" title="Pesquisar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pesquisar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pesquisar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites preferidos</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites preferidos</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acesse os sites que você mais visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferências de novas abas</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar a sua seção de sites preferidos" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Tópicos populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destaques</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-prerendered.html
index ebebbe6fbacd..a6017a1d36e8 100644
--- a/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="585440487"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pesquisar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pesquisar na Web" title="Pesquisar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pesquisar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pesquisar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites mais visitados</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informação" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites mais visitados</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Aceda aos websites que mais visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferências de novo separador</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editar este site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editar este site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editar este site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editar este site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editar este site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editar este site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editar este site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editar este site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editar este site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editar este site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editar este site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editar este site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizar a sua secção de sites mais visitados" data-reactid="141"><span data-reactid="142">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Tópicos populares:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Destaques</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1318504667"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Pesquisar na Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Pesquisar na Web" title="Pesquisar na Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Pesquisar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Pesquisar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sites mais visitados</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informação" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sites mais visitados</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Aceda aos websites que mais visita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferências de novo separador</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editar este site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizar a sua secção de sites mais visitados" data-reactid="129"><span data-reactid="130">Editar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomendado por Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Tópicos populares:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Destaques</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-strings.js
index 230440c275a5..47e925a0f030 100644
--- a/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/pt-PT/activity-stream-strings.js
@@ -52,7 +52,7 @@ window.gActivityStreamStrings = {
   "settings_pane_header": "Preferências de novo separador",
   "settings_pane_body2": "Escolha o que vê nesta página.",
   "settings_pane_search_header": "Pesquisa",
-  "settings_pane_search_body": "Pesquise na Web a partir do seu 'Novo separador'.",
+  "settings_pane_search_body": "Pesquise na Web a partir do seu novo separador.",
   "settings_pane_topsites_header": "Sites mais visitados",
   "settings_pane_topsites_body": "Aceda aos websites que mais visita.",
   "settings_pane_topsites_options_showmore": "Mostrar duas linhas",
diff --git a/browser/extensions/activity-stream/prerendered/locales/rm/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/rm/activity-stream-prerendered.html
index 1f4874540016..f4c0b5576bdb 100644
--- a/browser/extensions/activity-stream/prerendered/locales/rm/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/rm/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="72893166"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tschertgar en il Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tschertgar en il Web" title="Tschertgar en il Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tschertgar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tschertgar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Paginas preferidas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Paginas preferidas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder las websites che ti visitas il pli savens.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferenzas per novs tabs</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Modifitgar questa pagina" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Persunalisar la secziun da paginas preferidas" data-reactid="141"><span data-reactid="142">Modifitgar</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recumandà da Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Temas populars:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Accents</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-215159070"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tschertgar en il Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tschertgar en il Web" title="Tschertgar en il Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tschertgar" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tschertgar</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Paginas preferidas</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Paginas preferidas</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Acceder las websites che ti visitas il pli savens.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferenzas per novs tabs</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Modifitgar questa pagina" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Persunalisar la secziun da paginas preferidas" data-reactid="129"><span data-reactid="130">Modifitgar</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recumandà da Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Temas populars:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Accents</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ro/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ro/activity-stream-prerendered.html
index 1aa07fe20ac2..73d426d5a96d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ro/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ro/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="239415987"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Caută pe web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Caută pe web" title="Caută pe web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Caută" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Caută</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Site-uri de top</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informații" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Site-uri de top</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accesează site-urile pe care le vizitezi mai des.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferințe pentru filă nouă</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Editează acest site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Editează acest site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Editează acest site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Editează acest site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Editează acest site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Editează acest site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Editează acest site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Editează acest site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Editează acest site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Editează acest site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Editează acest site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Editează acest site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Particularizează secțiunea site-urilor de top" data-reactid="141"><span data-reactid="142">Editează</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recomandat de Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Subiecte populare:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Evidențieri</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="295493287"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Caută pe web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Caută pe web" title="Caută pe web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Caută" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Caută</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Site-uri de top</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informații" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Site-uri de top</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Accesează site-urile pe care le vizitezi mai des.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Preferințe pentru filă nouă</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Editează acest site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Particularizează secțiunea site-urilor de top" data-reactid="129"><span data-reactid="130">Editează</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recomandat de Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Subiecte populare:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Evidențieri</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ru/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ru/activity-stream-prerendered.html
index bcf9c9cc101c..0ca0b5259e2d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ru/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ru/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-770815725"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Искать в Интернете</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Искать в Интернете" title="Искать в Интернете" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Искать" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Искать</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Топ сайтов</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Информация" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Топ сайтов</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Получите доступ к сайтам, которые вы посещаете чаще всего.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Настройки новой вкладки</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Изменить этот сайт" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Настроить свой топ сайтов" data-reactid="141"><span data-reactid="142">Изменить</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Рекомендовано Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Популярные темы:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Избранное</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1256196857"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Искать в Интернете</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Искать в Интернете" title="Искать в Интернете" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Искать" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Искать</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Топ сайтов</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Информация" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Топ сайтов</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Получите доступ к сайтам, которые вы посещаете чаще всего.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Настройки новой вкладки</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Изменить этот сайт" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Настроить свой топ сайтов" data-reactid="129"><span data-reactid="130">Изменить</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Рекомендовано Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Популярные темы:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Избранное</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/si/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/si/activity-stream-prerendered.html
index ec62ccc51225..58ea1e5af964 100644
--- a/browser/extensions/activity-stream/prerendered/locales/si/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/si/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1261207662"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ජාලය තුළ සොයන්න</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ජාලය තුළ සොයන්න" title="ජාලය තුළ සොයන්න" data-reactid="7"/><button id="searchSubmit" class="search-button" title="සොයන්න" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">සොයන්න</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ප්‍රමුඛ අඩවි</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="තොරතුරු" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ප්‍රමුඛ අඩවි</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ඔබ නිරතුරුව පිවිසෙන වෙබ් අඩවි වෙත ප්‍රවේශය.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">නව ටැබ අභිප්‍රේත</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="මෙම අඩවිය සකසන්න" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">සැකසුම්</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket විසින් නිර්දේශිතයි</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ජනප්‍රිය මාතෘකා:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">ඉස්මතු කිරීම්</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1688874097"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ජාලය තුළ සොයන්න</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ජාලය තුළ සොයන්න" title="ජාලය තුළ සොයන්න" data-reactid="7"/><button id="searchSubmit" class="search-button" title="සොයන්න" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">සොයන්න</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ප්‍රමුඛ අඩවි</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="තොරතුරු" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ප්‍රමුඛ අඩවි</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">ඔබ නිරතුරුව පිවිසෙන වෙබ් අඩවි වෙත ප්‍රවේශය.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">නව ටැබ අභිප්‍රේත</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="මෙම අඩවිය සකසන්න" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">සැකසුම්</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket විසින් නිර්දේශිතයි</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ජනප්‍රිය මාතෘකා:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">ඉස්මතු කිරීම්</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/sk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/sk/activity-stream-prerendered.html
index 2a02850bca73..917f673fa9d5 100644
--- a/browser/extensions/activity-stream/prerendered/locales/sk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/sk/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="243160264"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Vyhľadávanie na webe</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Vyhľadávanie na webe" title="Vyhľadávanie na webe" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hľadať" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hľadať</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top stránky</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informácie" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top stránky</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Prístup k webovým stránkam, ktoré navštevujete najčastejšie.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastavenia Novej karty</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Upraviť túto stránku" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Upravte sekciu Top stránky" data-reactid="141"><span data-reactid="142">Upraviť</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Odporúča Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populárne témy:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Vybrané stránky</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1017773877"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Vyhľadávanie na webe</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Vyhľadávanie na webe" title="Vyhľadávanie na webe" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hľadať" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hľadať</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top stránky</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informácie" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top stránky</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Prístup k webovým stránkam, ktoré navštevujete najčastejšie.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastavenia Novej karty</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Upraviť túto stránku" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Upravte sekciu Top stránky" data-reactid="129"><span data-reactid="130">Upraviť</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Odporúča Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populárne témy:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Vybrané stránky</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/sl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/sl/activity-stream-prerendered.html
index f27012670f5c..bf6c2d66a970 100644
--- a/browser/extensions/activity-stream/prerendered/locales/sl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/sl/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-676592211"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Iskanje po spletu</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Iskanje po spletu" title="Iskanje po spletu" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Iskanje" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Iskanje</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Glavne strani</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacije" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Glavne strani</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Priročen dostop do najbolj obiskanih strani.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastavitve novega zavihka</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Uredi to stran" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Uredi to stran" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Uredi to stran" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Uredi to stran" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Uredi to stran" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Uredi to stran" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Uredi to stran" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Uredi to stran" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Uredi to stran" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Uredi to stran" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Uredi to stran" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Uredi to stran" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Prilagodite odsek Glavne strani" data-reactid="141"><span data-reactid="142">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Priporoča Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Priljubljene teme:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Poudarki</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1789873759"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Iskanje po spletu</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Iskanje po spletu" title="Iskanje po spletu" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Iskanje" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Iskanje</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Glavne strani</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Informacije" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Glavne strani</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Priročen dostop do najbolj obiskanih strani.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Nastavitve novega zavihka</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Uredi to stran" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Prilagodite odsek Glavne strani" data-reactid="129"><span data-reactid="130">Uredi</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Priporoča Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Priljubljene teme:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Poudarki</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/sq/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/sq/activity-stream-prerendered.html
index f93df6515d64..b1aa9ba0e5ba 100644
--- a/browser/extensions/activity-stream/prerendered/locales/sq/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/sq/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1411331737"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Kërkoni në Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Kërkoni në Web" title="Kërkoni në Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Kërko" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Kërko</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sajte Kryesues</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Të dhëna" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sajte Kryesues</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Hyni te sajtet që vizitoni më shpesh.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Parapëlqime për Skedë të Re</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Përpunoni këtë sajt" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Personalizoni ndarjen tuaj Sajte Kryesues" data-reactid="141"><span data-reactid="142">Përpunoni</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Rekomanduar nga Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Tema Popullore:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1845682829"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Kërkoni në Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Kërkoni në Web" title="Kërkoni në Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Kërko" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Kërko</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sajte Kryesues</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Të dhëna" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sajte Kryesues</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Hyni te sajtet që vizitoni më shpesh.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Parapëlqime për Skedë të Re</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Përpunoni këtë sajt" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Personalizoni ndarjen tuaj Sajte Kryesues" data-reactid="129"><span data-reactid="130">Përpunoni</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Rekomanduar nga Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Tema Popullore:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/sr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/sr/activity-stream-prerendered.html
index f6293c4c86bd..854062e50a55 100644
--- a/browser/extensions/activity-stream/prerendered/locales/sr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/sr/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="459564950"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Претражи веб</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Претражи веб" title="Претражи веб" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Претражи" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Претражи</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Омиљени сајтови</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Инфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Омиљени сајтови</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Приступите најпосећенијим веб сајтовима.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Поставке новог језичка</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Уреди овај сајт" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Прилагодите секцију омиљених сајтова" data-reactid="141"><span data-reactid="142">Уреди</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Предложио Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Популарне теме:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Истакнуто</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-451275879"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Претражи веб</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Претражи веб" title="Претражи веб" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Претражи" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Претражи</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Омиљени сајтови</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Инфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Омиљени сајтови</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Приступите најпосећенијим веб сајтовима.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Поставке новог језичка</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Уреди овај сајт" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Прилагодите секцију омиљених сајтова" data-reactid="129"><span data-reactid="130">Уреди</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Предложио Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Популарне теме:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Истакнуто</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/sv-SE/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/sv-SE/activity-stream-prerendered.html
index 73bf7cbad3bb..87b6f4ff747d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/sv-SE/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/sv-SE/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1995755293"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Sök på webben</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Sök på webben" title="Sök på webben" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Sök" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Sök</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besökta</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besökta</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Åtkomst till de webbplatser du besökt mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Inställningar Ny flik</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Redigera denna webbplats" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Anpassa avsnittet Mest besökta" data-reactid="141"><span data-reactid="142">Redigera</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Rekommenderas av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Populära ämnen:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Höjdpunkter</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-845620009"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Sök på webben</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Sök på webben" title="Sök på webben" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Sök" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Sök</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Mest besökta</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Mest besökta</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Åtkomst till de webbplatser du besökt mest.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Inställningar Ny flik</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Redigera denna webbplats" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Anpassa avsnittet Mest besökta" data-reactid="129"><span data-reactid="130">Redigera</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Rekommenderas av Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Populära ämnen:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Höjdpunkter</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ta/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ta/activity-stream-prerendered.html
index b117c903cbeb..a6353332c65a 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ta/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ta/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1598105259"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">இணையத்தில் தேடு</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="இணையத்தில் தேடு" title="இணையத்தில் தேடு" data-reactid="7"/><button id="searchSubmit" class="search-button" title="தேடு" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">தேடு</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">சிறந்த தளங்கள்</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="தகவல்" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">சிறந்த தளங்கள்</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">நீங்கள் அடிக்கடி பார்க்கும் தளங்களை அணுகவும்.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">புதிய கீற்றின் முன்னுரிமைகள்</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="இத்தளத்தை தொகு" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="உங்களின் சிறந்த தளங்களுக்கான தொகுதியை விருப்பமை" data-reactid="141"><span data-reactid="142">தொகு</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket என்பவரால் பரிந்துரைக்கப்பட்டது</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">பிரபலமான தலைப்புகள்:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">மிளிர்ப்புகள்</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1118448993"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">இணையத்தில் தேடு</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="இணையத்தில் தேடு" title="இணையத்தில் தேடு" data-reactid="7"/><button id="searchSubmit" class="search-button" title="தேடு" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">தேடு</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">சிறந்த தளங்கள்</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="தகவல்" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">சிறந்த தளங்கள்</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">நீங்கள் அடிக்கடி பார்க்கும் தளங்களை அணுகவும்.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">புதிய கீற்றின் முன்னுரிமைகள்</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="இத்தளத்தை தொகு" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="உங்களின் சிறந்த தளங்களுக்கான தொகுதியை விருப்பமை" data-reactid="129"><span data-reactid="130">தொகு</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket என்பவரால் பரிந்துரைக்கப்பட்டது</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">பிரபலமான தலைப்புகள்:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">மிளிர்ப்புகள்</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-prerendered.html
index 10a9c36e6aae..2c84873bfb27 100644
--- a/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1604117609"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">జాలంలో వెతకండి</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="జాలంలో వెతకండి" title="జాలంలో వెతకండి" data-reactid="7"/><button id="searchSubmit" class="search-button" title="వెతకండి" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">వెతకండి</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">మేటి సైట్లు</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="సమాచారం" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">మేటి సైట్లు</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">మీరు ఎక్కువగా చూసే వెబ్‌సైట్లను చూడండి.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">కొత్త ట్యాబు అభిరుచులు</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="ఈ సైటును మార్చు" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="మీ మేటి సైట్ల విభాగాన్ని మలచుకోండి" data-reactid="141"><span data-reactid="142">మార్చు</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocketచే సిఫార్సు చేయబడినది</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">ప్రముఖ అంశాలు:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">విశేషాలు</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1100124268"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">జాలంలో వెతకండి</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="జాలంలో వెతకండి" title="జాలంలో వెతకండి" data-reactid="7"/><button id="searchSubmit" class="search-button" title="వెతకండి" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">వెతకండి</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">మేటి సైట్లు</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="సమాచారం" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">మేటి సైట్లు</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">మీరు ఎక్కువగా చూసే వెబ్‌సైట్లను చూడండి.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">కొత్త ట్యాబు అభిరుచులు</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="ఈ సైటును మార్చు" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="మీ మేటి సైట్ల విభాగాన్ని మలచుకోండి" data-reactid="129"><span data-reactid="130">మార్చు</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocketచే సిఫార్సు చేయబడినది</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">ప్రముఖ అంశాలు:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">విశేషాలు</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-strings.js
index 3c621894f47a..6147454e32f6 100644
--- a/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/te/activity-stream-strings.js
@@ -38,9 +38,9 @@ window.gActivityStreamStrings = {
   "section_info_option": "సమాచారం",
   "section_info_send_feedback": "అభిప్రాయాన్ని పంపండి",
   "section_info_privacy_notice": "గోప్యతా విధానం",
-  "section_disclaimer_topstories": "The most interesting stories on the web, selected based on what you read. From Pocket, now part of Mozilla.",
-  "section_disclaimer_topstories_linktext": "Learn how it works.",
-  "section_disclaimer_topstories_buttontext": "Okay, got it",
+  "section_disclaimer_topstories": "జాలంలో అత్యంత ఆసక్తికరమైన కథనాలు, మీరు చదివేవాటి ఆధారంగా ఎంచుకున్నవి. ఇప్పుడు Mozillaలో భాగమైన Pocket నుండి.",
+  "section_disclaimer_topstories_linktext": "ఇది ఎలా పనిచేస్తుందో తెలుసుకోండి.",
+  "section_disclaimer_topstories_buttontext": "సరే, అర్థమయ్యింది",
   "welcome_title": "కొత్త ట్యాబుకు స్వాగతం",
   "welcome_body": "సముచితమైన మీ ఇష్టాంశాలను, వ్యాసాలను, వీడియోలను, ఇంకా మీరు ఇటీవలే చూసిన పేజీలను మీకు తేలిగ్గా అందుబాటులో ఉంచేందుకు Firefox ఈ జాగాని వాడుకుంటుంది.",
   "welcome_label": "మీ ముఖ్యాంశాలను గుర్తిస్తున్నది",
diff --git a/browser/extensions/activity-stream/prerendered/locales/th/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/th/activity-stream-prerendered.html
index e0c97c1799f0..1728ede46c5e 100644
--- a/browser/extensions/activity-stream/prerendered/locales/th/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/th/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-646836287"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ค้นหาเว็บ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ค้นหาเว็บ" title="ค้นหาเว็บ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ค้นหา" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ค้นหา</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ไซต์เด่น</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ข้อมูล" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ไซต์เด่น</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">เข้าถึงเว็บไซต์ที่คุณเยี่ยมชมมากที่สุด</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ค่ากำหนดแท็บใหม่</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="แก้ไขไซต์นี้" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="ปรับแต่งส่วนไซต์เด่นของคุณ" data-reactid="141"><span data-reactid="142">แก้ไข</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">แนะนำโดย Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">หัวข้อยอดนิยม:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">รายการเด่น</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="57981877"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ค้นหาเว็บ</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ค้นหาเว็บ" title="ค้นหาเว็บ" data-reactid="7"/><button id="searchSubmit" class="search-button" title="ค้นหา" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">ค้นหา</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">ไซต์เด่น</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="ข้อมูล" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">ไซต์เด่น</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">เข้าถึงเว็บไซต์ที่คุณเยี่ยมชมมากที่สุด</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">ค่ากำหนดแท็บใหม่</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="แก้ไขไซต์นี้" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="ปรับแต่งส่วนไซต์เด่นของคุณ" data-reactid="129"><span data-reactid="130">แก้ไข</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">แนะนำโดย Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">หัวข้อยอดนิยม:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">รายการเด่น</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/tl/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/tl/activity-stream-prerendered.html
index c4fee1030557..a5b5be25ce7c 100644
--- a/browser/extensions/activity-stream/prerendered/locales/tl/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/tl/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="249179067"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Hanapin sa Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Hanapin sa Web" title="Hanapin sa Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hanapin" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hanapin</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Tuktok na mga Site</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Impormasyon" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Tuktok na mga Site</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ma-access ang mga website na karamihang binibisita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Bagong Kagustuhan na Tab</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="I-edit ang site na ito" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="I-customize ang iyong Tuktok na mga seksyon ng Sites" data-reactid="141"><span data-reactid="142">I-edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Inirekomenda ni Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Tanyag na mga paksa:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Naka-highlight</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-859580497"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Hanapin sa Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Hanapin sa Web" title="Hanapin sa Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Hanapin" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Hanapin</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Tuktok na mga Site</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Impormasyon" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Tuktok na mga Site</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Ma-access ang mga website na karamihang binibisita.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Bagong Kagustuhan na Tab</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="I-edit ang site na ito" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="I-customize ang iyong Tuktok na mga seksyon ng Sites" data-reactid="129"><span data-reactid="130">I-edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Inirekomenda ni Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Tanyag na mga paksa:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Naka-highlight</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/tr/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/tr/activity-stream-prerendered.html
index d38bb057ab68..50c78a309331 100644
--- a/browser/extensions/activity-stream/prerendered/locales/tr/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/tr/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1675656024"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web’de ara</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web’de ara" title="Web’de ara" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Ara" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Ara</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sık Kullanılan Siteler</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Bilgi" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sık kullanılan siteler</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">En sık ziyaret ettiğiniz web sitelerine erişin.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Yeni Sekme Tercihleri</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Bu siteyi düzenle" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Sık Kullanılan Siteler bölümünü özelleştirin" data-reactid="141"><span data-reactid="142">Düzenle</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket öneriyor</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popüler konular:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Öne Çıkanlar</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="144650411"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Web’de ara</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Web’de ara" title="Web’de ara" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Ara" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Ara</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Sık Kullanılan Siteler</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Bilgi" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Sık kullanılan siteler</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">En sık ziyaret ettiğiniz web sitelerine erişin.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Yeni Sekme Tercihleri</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Bu siteyi düzenle" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Sık Kullanılan Siteler bölümünü özelleştirin" data-reactid="129"><span data-reactid="130">Düzenle</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket öneriyor</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popüler konular:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Öne Çıkanlar</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/uk/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/uk/activity-stream-prerendered.html
index 32830624eb49..0a95cf49cf0d 100644
--- a/browser/extensions/activity-stream/prerendered/locales/uk/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/uk/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1159733470"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пошук в Інтернеті</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пошук в Інтернеті" title="Пошук в Інтернеті" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Пошук" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Пошук</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Популярні сайти</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Інфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Популярні сайти</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Доступ до найчастіше відвідуваних веб-сайтів.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Налаштування нової вкладки</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Змінити цей сайт" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Налаштувати розділ популярних сайтів" data-reactid="141"><span data-reactid="142">Змінити</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Рекомендовано Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Популярні теми:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Обране</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="84773669"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Пошук в Інтернеті</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Пошук в Інтернеті" title="Пошук в Інтернеті" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Пошук" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Пошук</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Популярні сайти</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Інфо" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Популярні сайти</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Доступ до найчастіше відвідуваних веб-сайтів.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Налаштування нової вкладки</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Змінити цей сайт" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Налаштувати розділ популярних сайтів" data-reactid="129"><span data-reactid="130">Змінити</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Рекомендовано Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Популярні теми:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Обране</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/ur/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/ur/activity-stream-prerendered.html
index ac8d41927927..68921b6bf9a2 100644
--- a/browser/extensions/activity-stream/prerendered/locales/ur/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ur/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="381604211"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ويب پر تلاش کريں</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ويب پر تلاش کريں" title="ويب پر تلاش کريں" data-reactid="7"/><button id="searchSubmit" class="search-button" title="تلاش" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">تلاش</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">بہترین سائٹیں</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="معلومات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">بہترین سائٹیں</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">اپنی سب سے زیادہ دورہ کردہ ویب سائٹ تک رسائی حاصل کریں۔</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">نئے َٹیب کی ترجیحات</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="اس سائٹ کی تدوین کریں" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="اپنی بہترین سائٹس والے حصے کی تخصیص کریں" data-reactid="141"><span data-reactid="142">تدوین</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket کی جانب سے تجویز کردہ</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">مشہور مضامین:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">شہ سرخياں</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="2146205046"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">ويب پر تلاش کريں</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="ويب پر تلاش کريں" title="ويب پر تلاش کريں" data-reactid="7"/><button id="searchSubmit" class="search-button" title="تلاش" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">تلاش</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">بہترین سائٹیں</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="معلومات" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">بہترین سائٹیں</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">اپنی سب سے زیادہ دورہ کردہ ویب سائٹ تک رسائی حاصل کریں۔</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">نئے َٹیب کی ترجیحات</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="اس سائٹ کی تدوین کریں" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="اپنی بہترین سائٹس والے حصے کی تخصیص کریں" data-reactid="129"><span data-reactid="130">تدوین</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket کی جانب سے تجویز کردہ</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">مشہور مضامین:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">شہ سرخياں</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/uz/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/uz/activity-stream-prerendered.html
index cac8a4fba48b..656c79d7c46c 100644
--- a/browser/extensions/activity-stream/prerendered/locales/uz/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/uz/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1191965970"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ommabop saytlar</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="183869717"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Ommabop saytlar</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-prerendered.html
index c54ff5b358dc..63356e566279 100644
--- a/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1045842174"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tìm trên mạng</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tìm trên mạng" title="Tìm trên mạng" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tìm kiếm" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tìm kiếm</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Trang web hàng đầu</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Thông tin" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Truy cập vào các trang web mà bạn truy cập vào nhiều nhất.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Tùy chỉnh cho tab mới</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Chỉnh sửa trang web này" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Chỉnh sửa</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Được đề nghị bởi Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Các chủ đề phổ biến:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1774764633"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Tìm trên mạng</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Tìm trên mạng" title="Tìm trên mạng" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Tìm kiếm" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Tìm kiếm</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Trang web hàng đầu</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Thông tin" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Các trang Web hàng đầu</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Truy cập vào các trang web mà bạn truy cập vào nhiều nhất.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">Tùy chỉnh cho tab mới</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Chỉnh sửa trang web này" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Chỉnh sửa</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Được đề nghị bởi Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Các chủ đề phổ biến:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Nổi bật</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-strings.js b/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-strings.js
index 443eee0909dd..940b383e8f36 100644
--- a/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/vi/activity-stream-strings.js
@@ -4,7 +4,7 @@ window.gActivityStreamStrings = {
   "default_label_loading": "Đang tải…",
   "header_top_sites": "Trang web hàng đầu",
   "header_stories": "Câu chuyện hàng đầu",
-  "header_highlights": "Highlights",
+  "header_highlights": "Nổi bật",
   "header_visit_again": "Truy cập lại",
   "header_bookmarks": "Các bookmark gần đây",
   "header_recommended_by": "Được đề nghị bởi {provider}",
@@ -27,7 +27,7 @@ window.gActivityStreamStrings = {
   "menu_action_delete": "Xóa từ lịch xử",
   "menu_action_pin": "Ghim",
   "menu_action_unpin": "Bỏ ghim",
-  "confirm_history_delete_p1": "Are you sure you want to delete every instance of this page from your history?",
+  "confirm_history_delete_p1": "Bạn có chắc bạn muốn xóa bỏ mọi thứ của trang này từ lịch sử?",
   "confirm_history_delete_notice_p2": "Hành động này không thể hoàn tác.",
   "menu_action_save_to_pocket": "Lưu vào Pocket",
   "search_for_something_with": "Tìm {search_term} với:",
@@ -36,24 +36,24 @@ window.gActivityStreamStrings = {
   "search_web_placeholder": "Tìm trên mạng",
   "search_settings": "Thay đổi thiết lập tìm kiếm",
   "section_info_option": "Thông tin",
-  "section_info_send_feedback": "Send Feedback",
-  "section_info_privacy_notice": "Privacy Notice",
+  "section_info_send_feedback": "Gửi phản hồi",
+  "section_info_privacy_notice": "Chính sách riêng tư",
   "section_disclaimer_topstories": "The most interesting stories on the web, selected based on what you read. From Pocket, now part of Mozilla.",
   "section_disclaimer_topstories_linktext": "Learn how it works.",
-  "section_disclaimer_topstories_buttontext": "Okay, got it",
+  "section_disclaimer_topstories_buttontext": "Ok, đã hiểu",
   "welcome_title": "Chào mừng đến với tab mới",
-  "welcome_body": "Firefox will use this space to show your most relevant bookmarks, articles, videos, and pages you’ve recently visited, so you can get back to them easily.",
-  "welcome_label": "Identifying your Highlights",
+  "welcome_body": "Firefox sẽ sử dụng không gian này để hiển thị của bạn có liên quan nhất đánh dấu, bài viết, video và các trang bạn đã truy cập gần đây, do đó, bạn có thể quay lại công việc một cách dễ dàng.",
+  "welcome_label": "Đang xác định phần nổi bật của bạn",
   "time_label_less_than_minute": "<1phút",
   "time_label_minute": "{number}phút",
   "time_label_hour": "{number}giờ",
   "time_label_day": "{number}ngày",
   "settings_pane_button_label": "Tùy biến trang Tab mới",
   "settings_pane_header": "Tùy chỉnh cho tab mới",
-  "settings_pane_body2": "Choose what you see on this page.",
+  "settings_pane_body2": "Chọn những gì bạn thấy trên trang này.",
   "settings_pane_search_header": "Tìm kiếm",
   "settings_pane_search_body": "Search the Web from your new tab.",
-  "settings_pane_topsites_header": "Top Sites",
+  "settings_pane_topsites_header": "Các trang Web hàng đầu",
   "settings_pane_topsites_body": "Truy cập vào các trang web mà bạn truy cập vào nhiều nhất.",
   "settings_pane_topsites_options_showmore": "Hiển thị hai hàng",
   "settings_pane_bookmarks_header": "Recent Bookmarks",
@@ -81,20 +81,18 @@ window.gActivityStreamStrings = {
   "topsites_form_add_header": "New Top Site",
   "topsites_form_edit_header": "Edit Top Site",
   "topsites_form_title_placeholder": "Enter a title",
-  "topsites_form_url_placeholder": "Type or paste a URL",
+  "topsites_form_url_placeholder": "Nhập hoặc dán URL",
   "topsites_form_add_button": "Thêm",
   "topsites_form_save_button": "Lưu lại",
   "topsites_form_cancel_button": "Hủy bỏ",
-  "topsites_form_url_validation": "Valid URL required",
+  "topsites_form_url_validation": "Yêu cầu URL hợp lệ",
   "pocket_read_more": "Các chủ đề phổ biến:",
-  "pocket_read_even_more": "View More Stories",
-  "pocket_feedback_header": "The best of the web, curated by over 25 million people.",
+  "pocket_read_even_more": "Xem nhiều câu chuyện hơn",
+  "pocket_feedback_header": "Tốt nhất của web, được quản lý bởi hơn 25 triệu người.",
   "pocket_description": "Discover high-quality content you might otherwise miss, with help from Pocket, now part of Mozilla.",
   "highlights_empty_state": "Start browsing, and we’ll show some of the great articles, videos, and other pages you’ve recently visited or bookmarked here.",
   "topstories_empty_state": "You’ve caught up. Check back later for more top stories from {provider}. Can’t wait? Select a popular topic to find more great stories from around the web.",
-  "manual_migration_explanation2": "Try Firefox with the bookmarks, history and passwords from another browser.",
+  "manual_migration_explanation2": "Thử Firefox với trang đánh dấu, lịch sử và mật khẩu từ trình duyệt khác.",
   "manual_migration_cancel_button": "Không, cảm ơn",
-  "manual_migration_import_button": "Import Now",
-  "settings_pane_body": "Chọn cái bạn muốn tải khi một tab mới được mở ra.",
-  "pocket_send_feedback": "Gửi phản hồi"
+  "manual_migration_import_button": "Nhập ngay bây giờ"
 };
diff --git a/browser/extensions/activity-stream/prerendered/locales/zh-CN/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/zh-CN/activity-stream-prerendered.html
index f8f8959c73c1..f0b49a5bcfd9 100644
--- a/browser/extensions/activity-stream/prerendered/locales/zh-CN/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/zh-CN/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-440815869"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">在网络上搜索</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="在网络上搜索" title="在网络上搜索" data-reactid="7"/><button id="searchSubmit" class="search-button" title="搜索" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">搜索</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">常用网站</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="信息" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">常用网站</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">显示您经常访问的网站。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新标签页选项</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="编辑此网站" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="编辑此网站" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="编辑此网站" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="编辑此网站" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="编辑此网站" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="编辑此网站" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="编辑此网站" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="编辑此网站" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="编辑此网站" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="编辑此网站" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="编辑此网站" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="编辑此网站" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="定制您的“常用网站”区域" data-reactid="141"><span data-reactid="142">编辑</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket 推荐</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">热门主题：</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">集锦</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="798251782"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">在网络上搜索</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="在网络上搜索" title="在网络上搜索" data-reactid="7"/><button id="searchSubmit" class="search-button" title="搜索" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">搜索</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">常用网站</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="信息" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">常用网站</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">显示您经常访问的网站。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新标签页选项</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="编辑此网站" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="定制您的“常用网站”区域" data-reactid="129"><span data-reactid="130">编辑</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket 推荐</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">热门主题：</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">集锦</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/locales/zh-TW/activity-stream-prerendered.html b/browser/extensions/activity-stream/prerendered/locales/zh-TW/activity-stream-prerendered.html
index b63d4c39248f..3f87052ddd84 100644
--- a/browser/extensions/activity-stream/prerendered/locales/zh-TW/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/zh-TW/activity-stream-prerendered.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1810785604"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">搜尋 Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="搜尋 Web" title="搜尋 Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="搜尋" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">搜尋</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">熱門網站</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="更多資訊" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">熱門網站</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">前往您最常造訪的網站。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新分頁偏好設定</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="編輯此網站" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="編輯此網站" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="編輯此網站" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="編輯此網站" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="編輯此網站" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="編輯此網站" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="編輯此網站" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="編輯此網站" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="編輯此網站" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="編輯此網站" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="編輯此網站" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="編輯此網站" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="自訂您的「熱門網站」區塊" data-reactid="141"><span data-reactid="142">編輯</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Pocket 推薦</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">熱門主題:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">精選網站</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="808797887"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">搜尋 Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="搜尋 Web" title="搜尋 Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="搜尋" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">搜尋</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">熱門網站</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="更多資訊" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">熱門網站</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">前往您最常造訪的網站。</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">新分頁偏好設定</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="編輯此網站" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="自訂您的「熱門網站」區塊" data-reactid="129"><span data-reactid="130">編輯</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Pocket 推薦</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">熱門主題:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">精選網站</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/prerendered/static/activity-stream-prerendered-debug.html b/browser/extensions/activity-stream/prerendered/static/activity-stream-prerendered-debug.html
index da6fe7875b98..8887242cd6d9 100644
--- a/browser/extensions/activity-stream/prerendered/static/activity-stream-prerendered-debug.html
+++ b/browser/extensions/activity-stream/prerendered/static/activity-stream-prerendered-debug.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-656674174"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><div class="edit-menu" data-reactid="38"><button class="icon icon-edit" title="Edit this site" data-reactid="39"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="40"><div class="top-site-inner" data-reactid="41"><a data-reactid="42"><div class="tile" aria-hidden="true" data-reactid="43"><div class="screenshot" style="background-image:none;" data-reactid="44"></div></div><div class="title " data-reactid="45"><span dir="auto" data-reactid="46"></span></div></a><div class="edit-menu" data-reactid="47"><button class="icon icon-edit" title="Edit this site" data-reactid="48"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="49"><div class="top-site-inner" data-reactid="50"><a data-reactid="51"><div class="tile" aria-hidden="true" data-reactid="52"><div class="screenshot" style="background-image:none;" data-reactid="53"></div></div><div class="title " data-reactid="54"><span dir="auto" data-reactid="55"></span></div></a><div class="edit-menu" data-reactid="56"><button class="icon icon-edit" title="Edit this site" data-reactid="57"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="58"><div class="top-site-inner" data-reactid="59"><a data-reactid="60"><div class="tile" aria-hidden="true" data-reactid="61"><div class="screenshot" style="background-image:none;" data-reactid="62"></div></div><div class="title " data-reactid="63"><span dir="auto" data-reactid="64"></span></div></a><div class="edit-menu" data-reactid="65"><button class="icon icon-edit" title="Edit this site" data-reactid="66"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="67"><div class="top-site-inner" data-reactid="68"><a data-reactid="69"><div class="tile" aria-hidden="true" data-reactid="70"><div class="screenshot" style="background-image:none;" data-reactid="71"></div></div><div class="title " data-reactid="72"><span dir="auto" data-reactid="73"></span></div></a><div class="edit-menu" data-reactid="74"><button class="icon icon-edit" title="Edit this site" data-reactid="75"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="76"><div class="top-site-inner" data-reactid="77"><a data-reactid="78"><div class="tile" aria-hidden="true" data-reactid="79"><div class="screenshot" style="background-image:none;" data-reactid="80"></div></div><div class="title " data-reactid="81"><span dir="auto" data-reactid="82"></span></div></a><div class="edit-menu" data-reactid="83"><button class="icon icon-edit" title="Edit this site" data-reactid="84"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="85"><div class="top-site-inner" data-reactid="86"><a data-reactid="87"><div class="tile" aria-hidden="true" data-reactid="88"><div class="screenshot" style="background-image:none;" data-reactid="89"></div></div><div class="title " data-reactid="90"><span dir="auto" data-reactid="91"></span></div></a><div class="edit-menu" data-reactid="92"><button class="icon icon-edit" title="Edit this site" data-reactid="93"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="94"><div class="top-site-inner" data-reactid="95"><a data-reactid="96"><div class="tile" aria-hidden="true" data-reactid="97"><div class="screenshot" style="background-image:none;" data-reactid="98"></div></div><div class="title " data-reactid="99"><span dir="auto" data-reactid="100"></span></div></a><div class="edit-menu" data-reactid="101"><button class="icon icon-edit" title="Edit this site" data-reactid="102"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><div class="edit-menu" data-reactid="110"><button class="icon icon-edit" title="Edit this site" data-reactid="111"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="112"><div class="top-site-inner" data-reactid="113"><a data-reactid="114"><div class="tile" aria-hidden="true" data-reactid="115"><div class="screenshot" style="background-image:none;" data-reactid="116"></div></div><div class="title " data-reactid="117"><span dir="auto" data-reactid="118"></span></div></a><div class="edit-menu" data-reactid="119"><button class="icon icon-edit" title="Edit this site" data-reactid="120"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="121"><div class="top-site-inner" data-reactid="122"><a data-reactid="123"><div class="tile" aria-hidden="true" data-reactid="124"><div class="screenshot" style="background-image:none;" data-reactid="125"></div></div><div class="title " data-reactid="126"><span dir="auto" data-reactid="127"></span></div></a><div class="edit-menu" data-reactid="128"><button class="icon icon-edit" title="Edit this site" data-reactid="129"></button></div></div></li><li class="top-site-outer placeholder" data-reactid="130"><div class="top-site-inner" data-reactid="131"><a data-reactid="132"><div class="tile" aria-hidden="true" data-reactid="133"><div class="screenshot" style="background-image:none;" data-reactid="134"></div></div><div class="title " data-reactid="135"><span dir="auto" data-reactid="136"></span></div></a><div class="edit-menu" data-reactid="137"><button class="icon icon-edit" title="Edit this site" data-reactid="138"></button></div></div></li></ul><div class="edit-topsites-wrapper" data-reactid="139"><div class="edit-topsites-button" data-reactid="140"><button class="edit" title="Customize your Top Sites section" data-reactid="141"><span data-reactid="142">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="143"><section class="collapsible-section section animation-enabled" data-reactid="144"><div class="section-top-bar" data-reactid="145"><h3 class="section-title" data-reactid="146"><span class="click-target" data-reactid="147"><span class="icon icon-small-spacer icon-pocket" data-reactid="148"></span><span data-reactid="149">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="150"></span></span></h3></div><div class="section-body" data-reactid="151"><ul class="section-list" style="padding:0;" data-reactid="152"><li class="card-outer placeholder" data-reactid="153"><a data-reactid="154"><div class="card" data-reactid="155"><div class="card-details no-image" data-reactid="156"><div class="card-text no-context no-description no-host-name no-image" data-reactid="157"><h4 class="card-title" dir="auto" data-reactid="158"></h4><p class="card-description" dir="auto" data-reactid="159"></p></div><div class="card-context" data-reactid="160"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="161"><a data-reactid="162"><div class="card" data-reactid="163"><div class="card-details no-image" data-reactid="164"><div class="card-text no-context no-description no-host-name no-image" data-reactid="165"><h4 class="card-title" dir="auto" data-reactid="166"></h4><p class="card-description" dir="auto" data-reactid="167"></p></div><div class="card-context" data-reactid="168"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="169"><a data-reactid="170"><div class="card" data-reactid="171"><div class="card-details no-image" data-reactid="172"><div class="card-text no-context no-description no-host-name no-image" data-reactid="173"><h4 class="card-title" dir="auto" data-reactid="174"></h4><p class="card-description" dir="auto" data-reactid="175"></p></div><div class="card-context" data-reactid="176"></div></div></div></a></li></ul><div class="topic" data-reactid="177"><span data-reactid="178"><span data-reactid="179">Popular Topics:</span></span><ul data-reactid="180"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="181"><div class="section-top-bar" data-reactid="182"><h3 class="section-title" data-reactid="183"><span class="click-target" data-reactid="184"><span class="icon icon-small-spacer icon-highlights" data-reactid="185"></span><span data-reactid="186">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="187"></span></span></h3></div><div class="section-body" data-reactid="188"><ul class="section-list" style="padding:0;" data-reactid="189"><li class="card-outer placeholder" data-reactid="190"><a data-reactid="191"><div class="card" data-reactid="192"><div class="card-details no-image" data-reactid="193"><div class="card-text no-context no-description no-host-name no-image" data-reactid="194"><h4 class="card-title" dir="auto" data-reactid="195"></h4><p class="card-description" dir="auto" data-reactid="196"></p></div><div class="card-context" data-reactid="197"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="198"><a data-reactid="199"><div class="card" data-reactid="200"><div class="card-details no-image" data-reactid="201"><div class="card-text no-context no-description no-host-name no-image" data-reactid="202"><h4 class="card-title" dir="auto" data-reactid="203"></h4><p class="card-description" dir="auto" data-reactid="204"></p></div><div class="card-context" data-reactid="205"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="206"><a data-reactid="207"><div class="card" data-reactid="208"><div class="card-details no-image" data-reactid="209"><div class="card-text no-context no-description no-host-name no-image" data-reactid="210"><h4 class="card-title" dir="auto" data-reactid="211"></h4><p class="card-description" dir="auto" data-reactid="212"></p></div><div class="card-context" data-reactid="213"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 214 --></main></div></div>
+    <div id="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1133339003"><main data-reactid="2"><div class="search-wrapper" data-reactid="3"><label for="newtab-search-text" class="search-label" data-reactid="4"><span class="sr-only" data-reactid="5"><span data-reactid="6">Search the Web</span></span></label><input type="search" id="newtab-search-text" maxlength="256" placeholder="Search the Web" title="Search the Web" data-reactid="7"/><button id="searchSubmit" class="search-button" title="Search" data-reactid="8"><span class="sr-only" data-reactid="9"><span data-reactid="10">Search</span></span></button></div><div class="body-wrapper" data-reactid="11"><section class="collapsible-section top-sites animation-enabled" data-reactid="12"><div class="section-top-bar" data-reactid="13"><h3 class="section-title" data-reactid="14"><span class="click-target" data-reactid="15"><span class="icon icon-small-spacer icon-topsites" data-reactid="16"></span><span data-reactid="17">Top Sites</span><span class="icon icon-arrowhead-down" data-reactid="18"></span></span></h3><span class="section-info-option" data-reactid="19"><img class="info-option-icon" title="Info" aria-haspopup="true" aria-controls="info-option" aria-expanded="false" role="note" tabindex="0" data-reactid="20"/><div class="info-option" data-reactid="21"><div class="info-option-header" role="heading" data-reactid="22"><span data-reactid="23">Top Sites</span></div><p class="info-option-body" data-reactid="24"><span data-reactid="25">Access the websites you visit most.</span></p><div class="info-option-manage" data-reactid="26"><button data-reactid="27"><span data-reactid="28">New Tab Preferences</span></button></div></div></span></div><div class="section-body" data-reactid="29"><ul class="top-sites-list" data-reactid="30"><li class="top-site-outer placeholder" data-reactid="31"><div class="top-site-inner" data-reactid="32"><a data-reactid="33"><div class="tile" aria-hidden="true" data-reactid="34"><div class="screenshot" style="background-image:none;" data-reactid="35"></div></div><div class="title " data-reactid="36"><span dir="auto" data-reactid="37"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="38"></button></div></li><li class="top-site-outer placeholder" data-reactid="39"><div class="top-site-inner" data-reactid="40"><a data-reactid="41"><div class="tile" aria-hidden="true" data-reactid="42"><div class="screenshot" style="background-image:none;" data-reactid="43"></div></div><div class="title " data-reactid="44"><span dir="auto" data-reactid="45"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="46"></button></div></li><li class="top-site-outer placeholder" data-reactid="47"><div class="top-site-inner" data-reactid="48"><a data-reactid="49"><div class="tile" aria-hidden="true" data-reactid="50"><div class="screenshot" style="background-image:none;" data-reactid="51"></div></div><div class="title " data-reactid="52"><span dir="auto" data-reactid="53"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="54"></button></div></li><li class="top-site-outer placeholder" data-reactid="55"><div class="top-site-inner" data-reactid="56"><a data-reactid="57"><div class="tile" aria-hidden="true" data-reactid="58"><div class="screenshot" style="background-image:none;" data-reactid="59"></div></div><div class="title " data-reactid="60"><span dir="auto" data-reactid="61"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="62"></button></div></li><li class="top-site-outer placeholder" data-reactid="63"><div class="top-site-inner" data-reactid="64"><a data-reactid="65"><div class="tile" aria-hidden="true" data-reactid="66"><div class="screenshot" style="background-image:none;" data-reactid="67"></div></div><div class="title " data-reactid="68"><span dir="auto" data-reactid="69"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="70"></button></div></li><li class="top-site-outer placeholder" data-reactid="71"><div class="top-site-inner" data-reactid="72"><a data-reactid="73"><div class="tile" aria-hidden="true" data-reactid="74"><div class="screenshot" style="background-image:none;" data-reactid="75"></div></div><div class="title " data-reactid="76"><span dir="auto" data-reactid="77"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="78"></button></div></li><li class="top-site-outer placeholder" data-reactid="79"><div class="top-site-inner" data-reactid="80"><a data-reactid="81"><div class="tile" aria-hidden="true" data-reactid="82"><div class="screenshot" style="background-image:none;" data-reactid="83"></div></div><div class="title " data-reactid="84"><span dir="auto" data-reactid="85"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="86"></button></div></li><li class="top-site-outer placeholder" data-reactid="87"><div class="top-site-inner" data-reactid="88"><a data-reactid="89"><div class="tile" aria-hidden="true" data-reactid="90"><div class="screenshot" style="background-image:none;" data-reactid="91"></div></div><div class="title " data-reactid="92"><span dir="auto" data-reactid="93"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="94"></button></div></li><li class="top-site-outer placeholder" data-reactid="95"><div class="top-site-inner" data-reactid="96"><a data-reactid="97"><div class="tile" aria-hidden="true" data-reactid="98"><div class="screenshot" style="background-image:none;" data-reactid="99"></div></div><div class="title " data-reactid="100"><span dir="auto" data-reactid="101"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="102"></button></div></li><li class="top-site-outer placeholder" data-reactid="103"><div class="top-site-inner" data-reactid="104"><a data-reactid="105"><div class="tile" aria-hidden="true" data-reactid="106"><div class="screenshot" style="background-image:none;" data-reactid="107"></div></div><div class="title " data-reactid="108"><span dir="auto" data-reactid="109"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="110"></button></div></li><li class="top-site-outer placeholder" data-reactid="111"><div class="top-site-inner" data-reactid="112"><a data-reactid="113"><div class="tile" aria-hidden="true" data-reactid="114"><div class="screenshot" style="background-image:none;" data-reactid="115"></div></div><div class="title " data-reactid="116"><span dir="auto" data-reactid="117"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="118"></button></div></li><li class="top-site-outer placeholder" data-reactid="119"><div class="top-site-inner" data-reactid="120"><a data-reactid="121"><div class="tile" aria-hidden="true" data-reactid="122"><div class="screenshot" style="background-image:none;" data-reactid="123"></div></div><div class="title " data-reactid="124"><span dir="auto" data-reactid="125"></span></div></a><button class="context-menu-button edit-button icon" title="Edit this site" data-reactid="126"></button></div></li></ul><div class="edit-topsites-wrapper" data-reactid="127"><div class="edit-topsites-button" data-reactid="128"><button class="edit" title="Customize your Top Sites section" data-reactid="129"><span data-reactid="130">Edit</span></button></div></div></div></section><div class="sections-list" data-reactid="131"><section class="collapsible-section section animation-enabled" data-reactid="132"><div class="section-top-bar" data-reactid="133"><h3 class="section-title" data-reactid="134"><span class="click-target" data-reactid="135"><span class="icon icon-small-spacer icon-pocket" data-reactid="136"></span><span data-reactid="137">Recommended by Pocket</span><span class="icon icon-arrowhead-down" data-reactid="138"></span></span></h3></div><div class="section-body" data-reactid="139"><ul class="section-list" style="padding:0;" data-reactid="140"><li class="card-outer placeholder" data-reactid="141"><a data-reactid="142"><div class="card" data-reactid="143"><div class="card-details no-image" data-reactid="144"><div class="card-text no-context no-description no-host-name no-image" data-reactid="145"><h4 class="card-title" dir="auto" data-reactid="146"></h4><p class="card-description" dir="auto" data-reactid="147"></p></div><div class="card-context" data-reactid="148"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="149"><a data-reactid="150"><div class="card" data-reactid="151"><div class="card-details no-image" data-reactid="152"><div class="card-text no-context no-description no-host-name no-image" data-reactid="153"><h4 class="card-title" dir="auto" data-reactid="154"></h4><p class="card-description" dir="auto" data-reactid="155"></p></div><div class="card-context" data-reactid="156"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="157"><a data-reactid="158"><div class="card" data-reactid="159"><div class="card-details no-image" data-reactid="160"><div class="card-text no-context no-description no-host-name no-image" data-reactid="161"><h4 class="card-title" dir="auto" data-reactid="162"></h4><p class="card-description" dir="auto" data-reactid="163"></p></div><div class="card-context" data-reactid="164"></div></div></div></a></li></ul><div class="topic" data-reactid="165"><span data-reactid="166"><span data-reactid="167">Popular Topics:</span></span><ul data-reactid="168"></ul></div></div></section><section class="collapsible-section section animation-enabled" data-reactid="169"><div class="section-top-bar" data-reactid="170"><h3 class="section-title" data-reactid="171"><span class="click-target" data-reactid="172"><span class="icon icon-small-spacer icon-highlights" data-reactid="173"></span><span data-reactid="174">Highlights</span><span class="icon icon-arrowhead-down" data-reactid="175"></span></span></h3></div><div class="section-body" data-reactid="176"><ul class="section-list" style="padding:0;" data-reactid="177"><li class="card-outer placeholder" data-reactid="178"><a data-reactid="179"><div class="card" data-reactid="180"><div class="card-details no-image" data-reactid="181"><div class="card-text no-context no-description no-host-name no-image" data-reactid="182"><h4 class="card-title" dir="auto" data-reactid="183"></h4><p class="card-description" dir="auto" data-reactid="184"></p></div><div class="card-context" data-reactid="185"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="186"><a data-reactid="187"><div class="card" data-reactid="188"><div class="card-details no-image" data-reactid="189"><div class="card-text no-context no-description no-host-name no-image" data-reactid="190"><h4 class="card-title" dir="auto" data-reactid="191"></h4><p class="card-description" dir="auto" data-reactid="192"></p></div><div class="card-context" data-reactid="193"></div></div></div></a></li><li class="card-outer placeholder" data-reactid="194"><a data-reactid="195"><div class="card" data-reactid="196"><div class="card-details no-image" data-reactid="197"><div class="card-text no-context no-description no-host-name no-image" data-reactid="198"><h4 class="card-title" dir="auto" data-reactid="199"></h4><p class="card-description" dir="auto" data-reactid="200"></p></div><div class="card-context" data-reactid="201"></div></div></div></a></li></ul></div></section></div></div><!-- react-empty: 202 --></main></div></div>
     <div id="snippets-container">
       <div id="snippets"></div>
     </div>
diff --git a/browser/extensions/activity-stream/test/unit/lib/TelemetryFeed.test.js b/browser/extensions/activity-stream/test/unit/lib/TelemetryFeed.test.js
index 997c175447fd..7196c15ac66b 100644
--- a/browser/extensions/activity-stream/test/unit/lib/TelemetryFeed.test.js
+++ b/browser/extensions/activity-stream/test/unit/lib/TelemetryFeed.test.js
@@ -677,18 +677,19 @@ describe("TelemetryFeed", () => {
   describe("#handleNewTabInit", () => {
     it("should set the session as preloaded if the browser is preloaded", () => {
       const session = {perf: {}};
+      let preloadedBrowser = {getAttribute() { return "preloaded"; }};
       sandbox.stub(instance, "addSession").returns(session);
 
       instance.onAction(ac.SendToMain({
         type: at.NEW_TAB_INIT,
-        data: {url: "about:newtab", browser}
+        data: {url: "about:newtab", browser: preloadedBrowser}
       }));
 
       assert.ok(session.perf.is_preloaded);
     });
     it("should set the session as non-preloaded if the browser is non-preloaded", () => {
       const session = {perf: {}};
-      let nonPreloadedBrowser = {getAttribute() { return "false"; }};
+      let nonPreloadedBrowser = {getAttribute() { return ""; }};
       sandbox.stub(instance, "addSession").returns(session);
 
       instance.onAction(ac.SendToMain({
diff --git a/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp b/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
index 28f2b04ed48c..4822111c4b1c 100644
--- a/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
+++ b/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
@@ -111,7 +111,7 @@ public:
   virtual void MacroExpands(const Token &Tok, const MacroDefinition &Md,
                             SourceRange Range, const MacroArgs *Ma) override;
 #if CLANG_VERSION_MAJOR >= 5
-  virtual void MacroUndefined(const Token &tok, const MacroDefinition &md,
+  virtual void MacroUndefined(const Token &Tok, const MacroDefinition &Md,
                               const MacroDirective *Undef) override;
 #else
   virtual void MacroUndefined(const Token &Tok,
@@ -1421,8 +1421,8 @@ void PreprocessorHook::MacroExpands(const Token &Tok, const MacroDefinition &Md,
 }
 
 #if CLANG_VERSION_MAJOR >= 5
-void PreprocessorHook::MacroUndefined(const Token &tok,
-                                      const MacroDefinition &md,
+void PreprocessorHook::MacroUndefined(const Token &Tok,
+                                      const MacroDefinition &Md,
                                       const MacroDirective *Undef)
 #else
 void PreprocessorHook::MacroUndefined(const Token &Tok,
diff --git a/chrome/test/unit/test_no_remote_registration.js b/chrome/test/unit/test_no_remote_registration.js
index e5be45977ef5..78a000c5a6a2 100644
--- a/chrome/test/unit/test_no_remote_registration.js
+++ b/chrome/test/unit/test_no_remote_registration.js
@@ -23,14 +23,14 @@ ProtocolHandler.prototype =
   defaultPort: -1,
   allowPort: () => false,
   newURI(aSpec, aCharset, aBaseURI) {
-    let uri = Cc["@mozilla.org/network/standard-url;1"].
-              createInstance(Ci.nsIURI);
-    uri.spec = aSpec;
-    if (!uri.scheme) {
-      // We got a partial uri, so let's resolve it with the base one
-      uri.spec = aBaseURI.resolve(aSpec);
+    let mutator = Cc["@mozilla.org/network/standard-url-mutator;1"]
+                    .createInstance(Ci.nsIURIMutator);
+    if (aBaseURI) {
+      mutator.setSpec(aBaseURI.resolve(aSpec));
+    } else {
+      mutator.setSpec(aSpec);
     }
-    return uri;
+    return mutator.finalize();
   },
   newChannel2() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
   newChannel() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
diff --git a/config/config.mk b/config/config.mk
index dd382e223f22..871579d4eba2 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -167,8 +167,9 @@ endif
 endif # MOZ_PROFILE_USE
 endif # NO_PROFILE_GUIDED_OPTIMIZE
 
+LOCALE_TOPDIR ?= $(topsrcdir)
 MAKE_JARS_FLAGS = \
-	-t $(topsrcdir) \
+	-t $(LOCALE_TOPDIR) \
 	-f $(MOZ_JAR_MAKER_FILE_FORMAT) \
 	$(NULL)
 
@@ -354,14 +355,18 @@ ifndef L10NBASEDIR
   L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
 endif
 
-EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
+EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(LOCALE_TOPDIR)/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
 
 ifdef relativesrcdir
-LOCALE_SRCDIR ?= $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
+LOCALE_RELATIVEDIR ?= $(relativesrcdir)
+endif
+
+ifdef LOCALE_RELATIVEDIR
+LOCALE_SRCDIR ?= $(call EXPAND_LOCALE_SRCDIR,$(LOCALE_RELATIVEDIR))
 endif
 
 ifdef relativesrcdir
-MAKE_JARS_FLAGS += --relativesrcdir=$(relativesrcdir)
+MAKE_JARS_FLAGS += --relativesrcdir=$(LOCALE_RELATIVEDIR)
 ifneq (en-US,$(AB_CD))
 ifdef IS_LANGUAGE_REPACK
 MAKE_JARS_FLAGS += --locale-mergedir=$(REAL_LOCALE_MERGEDIR)
@@ -378,7 +383,7 @@ endif # ! relativesrcdir
 
 ifdef IS_LANGUAGE_REPACK
 MERGE_FILE = $(firstword \
-  $(wildcard $(REAL_LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))/$(1)) \
+  $(wildcard $(REAL_LOCALE_MERGEDIR)/$(subst /locales,,$(LOCALE_RELATIVEDIR))/$(1)) \
   $(wildcard $(LOCALE_SRCDIR)/$(1)) \
   $(srcdir)/en-US/$(1) )
 else
diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/test/browser.ini
index 965dc510e224..7c159c2e8101 100644
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -154,7 +154,6 @@ skip-if = e10s # Bug 1221911, bug 1222289, frequent e10s timeouts
 [browser_layoutHelpers.js]
 skip-if = e10s # Layouthelpers test should not run in a content page.
 [browser_layoutHelpers-getBoxQuads.js]
-skip-if = e10s # Layouthelpers test should not run in a content page.
 [browser_num-l10n.js]
 [browser_options-view-01.js]
 [browser_outputparser.js]
diff --git a/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
index 9996693b2d15..99c4c1344e3d 100644
--- a/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
+++ b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
@@ -6,214 +6,251 @@
 
 "use strict";
 
-const {getAdjustedQuads} = require("devtools/shared/layout/utils");
-
 const TEST_URI = TEST_URI_ROOT + "doc_layoutHelpers-getBoxQuads.html";
 
-add_task(function* () {
-  let tab = yield addTab(TEST_URI);
-  let doc = tab.linkedBrowser.contentDocument;
-
-  ok(typeof getAdjustedQuads === "function", "getAdjustedQuads is defined");
+add_task(async function () {
+  let tab = await addTab(TEST_URI);
 
   info("Running tests");
 
-  returnsTheRightDataStructure(doc);
-  isEmptyForMissingNode(doc);
-  isEmptyForHiddenNodes(doc);
-  defaultsToBorderBoxIfNoneProvided(doc);
-  returnsLikeGetBoxQuadsInSimpleCase(doc);
-  takesIframesOffsetsIntoAccount(doc);
-  takesScrollingIntoAccount(doc);
-  yield takesZoomIntoAccount(doc);
-  returnsMultipleItemsForWrappingInlineElements(doc);
+  // `FullZoom` isn't available from the ContentTask. This code is defined by browser
+  // frontend and runs in the parent process. Here, we use the message manager
+  // to allow the Content Task to call this zoom helper whenever it needs to.
+  let mm = tab.linkedBrowser.messageManager;
+  mm.addMessageListener("devtools-test:command", async function ({ data }) {
+    switch (data) {
+      case "zoom-enlarge":
+        window.FullZoom.enlarge();
+        break;
+      case "zoom-reset":
+        await window.FullZoom.reset();
+        break;
+      case "zoom-reduce":
+        window.FullZoom.reduce();
+        break;
+    }
+    mm.sendAsyncMessage("devtools-test:done");
+  });
+
+  await ContentTask.spawn(tab.linkedBrowser, null, async function () {
+    // This function allows the Content Task to easily call `FullZoom` API via
+    // the message manager.
+    function sendCommand(cmd) {
+      let onDone = new Promise(done => {
+        addMessageListener("devtools-test:done", function listener() {
+          removeMessageListener("devtools-test:done", listener);
+          done();
+        });
+      });
+      sendAsyncMessage("devtools-test:command", cmd);
+      return onDone;
+    }
+
+    const doc = content.document;
+
+    const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+    const {getAdjustedQuads} = require("devtools/shared/layout/utils");
+
+    ok(typeof getAdjustedQuads === "function", "getAdjustedQuads is defined");
+
+    returnsTheRightDataStructure();
+    isEmptyForMissingNode();
+    isEmptyForHiddenNodes();
+    defaultsToBorderBoxIfNoneProvided();
+    returnsLikeGetBoxQuadsInSimpleCase();
+    takesIframesOffsetsIntoAccount();
+    takesScrollingIntoAccount();
+    await takesZoomIntoAccount();
+    returnsMultipleItemsForWrappingInlineElements();
+
+    function returnsTheRightDataStructure() {
+      info("Checks that the returned data contains bounds and 4 points");
+
+      let node = doc.querySelector("body");
+      let [res] = getAdjustedQuads(doc.defaultView, node, "content");
+
+      ok("bounds" in res, "The returned data has a bounds property");
+      ok("p1" in res, "The returned data has a p1 property");
+      ok("p2" in res, "The returned data has a p2 property");
+      ok("p3" in res, "The returned data has a p3 property");
+      ok("p4" in res, "The returned data has a p4 property");
+
+      for (let boundProp of
+        ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
+        ok(boundProp in res.bounds, "The bounds has a " + boundProp + " property");
+      }
+
+      for (let point of ["p1", "p2", "p3", "p4"]) {
+        for (let pointProp of ["x", "y", "z", "w"]) {
+          ok(pointProp in res[point], point + " has a " + pointProp + " property");
+        }
+      }
+    }
+
+    function isEmptyForMissingNode() {
+      info("Checks that null is returned for invalid nodes");
+
+      for (let input of [null, undefined, "", 0]) {
+        is(getAdjustedQuads(doc.defaultView, input).length, 0,
+          "A 0-length array is returned for input " + input);
+      }
+    }
+
+    function isEmptyForHiddenNodes() {
+      info("Checks that null is returned for nodes that aren't rendered");
+
+      let style = doc.querySelector("#styles");
+      is(getAdjustedQuads(doc.defaultView, style).length, 0,
+        "null is returned for a <style> node");
+
+      let hidden = doc.querySelector("#hidden-node");
+      is(getAdjustedQuads(doc.defaultView, hidden).length, 0,
+        "null is returned for a hidden node");
+    }
+
+    function defaultsToBorderBoxIfNoneProvided() {
+      info("Checks that if no boxtype is passed, then border is the default one");
+
+      let node = doc.querySelector("#simple-node-with-margin-padding-border");
+      let [withBoxType] = getAdjustedQuads(doc.defaultView, node, "border");
+      let [withoutBoxType] = getAdjustedQuads(doc.defaultView, node);
+
+      for (let boundProp of
+        ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
+        is(withBoxType.bounds[boundProp], withoutBoxType.bounds[boundProp],
+          boundProp + " bound is equal with or without the border box type");
+      }
+
+      for (let point of ["p1", "p2", "p3", "p4"]) {
+        for (let pointProp of ["x", "y", "z", "w"]) {
+          is(withBoxType[point][pointProp], withoutBoxType[point][pointProp],
+            point + "." + pointProp +
+            " is equal with or without the border box type");
+        }
+      }
+    }
+
+    function returnsLikeGetBoxQuadsInSimpleCase() {
+      info("Checks that for an element in the main frame, without scroll nor zoom" +
+        "that the returned value is similar to the returned value of getBoxQuads");
+
+      let node = doc.querySelector("#simple-node-with-margin-padding-border");
+
+      for (let region of ["content", "padding", "border", "margin"]) {
+        let expected = node.getBoxQuads({
+          box: region
+        })[0];
+        let [actual] = getAdjustedQuads(doc.defaultView, node, region);
+
+        for (let boundProp of
+          ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
+          is(actual.bounds[boundProp], expected.bounds[boundProp],
+            boundProp + " bound is equal to the one returned by getBoxQuads for " +
+            region + " box");
+        }
+
+        for (let point of ["p1", "p2", "p3", "p4"]) {
+          for (let pointProp of ["x", "y", "z", "w"]) {
+            is(actual[point][pointProp], expected[point][pointProp],
+              point + "." + pointProp +
+              " is equal to the one returned by getBoxQuads for " + region + " box");
+          }
+        }
+      }
+    }
+
+    function takesIframesOffsetsIntoAccount() {
+      info("Checks that the quad returned for a node inside iframes that have " +
+        "margins takes those offsets into account");
+
+      let rootIframe = doc.querySelector("iframe");
+      let subIframe = rootIframe.contentDocument.querySelector("iframe");
+      let innerNode = subIframe.contentDocument.querySelector("#inner-node");
+
+      let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
+
+      // rootIframe margin + subIframe margin + node margin + node border + node padding
+      let p1x = 10 + 10 + 10 + 10 + 10;
+      is(quad.p1.x, p1x, "The inner node's p1 x position is correct");
+
+      // Same as p1x + the inner node width
+      let p2x = p1x + 100;
+      is(quad.p2.x, p2x, "The inner node's p2 x position is correct");
+    }
+
+    function takesScrollingIntoAccount() {
+      info("Checks that the quad returned for a node inside multiple scrolled " +
+        "containers takes the scroll values into account");
+
+      // For info, the container being tested here is absolutely positioned at 0 0
+      // to simplify asserting the coordinates
+
+      info("Scroll the container nodes down");
+      let scrolledNode = doc.querySelector("#scrolled-node");
+      scrolledNode.scrollTop = 100;
+      let subScrolledNode = doc.querySelector("#sub-scrolled-node");
+      subScrolledNode.scrollTop = 200;
+      let innerNode = doc.querySelector("#inner-scrolled-node");
+
+      let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
+      is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling down");
+      is(quad.p1.y, -300, "p1.y of the scrolled node is correct after scrolling down");
+
+      info("Scrolling back up");
+      scrolledNode.scrollTop = 0;
+      subScrolledNode.scrollTop = 0;
+
+      [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
+      is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling up");
+      is(quad.p1.y, 0, "p1.y of the scrolled node is correct after scrolling up");
+    }
+
+    async function takesZoomIntoAccount() {
+      info("Checks that if the page is zoomed in/out, the quad returned is correct");
+
+      // Hard-coding coordinates in this zoom test is a bad idea as it can vary
+      // depending on the platform, so we simply test that zooming in produces a
+      // bigger quad and zooming out produces a smaller quad
+
+      let node = doc.querySelector("#simple-node-with-margin-padding-border");
+      let [defaultQuad] = getAdjustedQuads(doc.defaultView, node);
+
+      info("Zoom in");
+      await sendCommand("zoom-enlarge");
+      let [zoomedInQuad] = getAdjustedQuads(doc.defaultView, node);
+
+      ok(zoomedInQuad.bounds.width > defaultQuad.bounds.width,
+        "The zoomed in quad is bigger than the default one");
+      ok(zoomedInQuad.bounds.height > defaultQuad.bounds.height,
+        "The zoomed in quad is bigger than the default one");
+
+      info("Zoom out");
+      await sendCommand("zoom-reset");
+      await sendCommand("zoom-reduce");
+
+      let [zoomedOutQuad] = getAdjustedQuads(doc.defaultView, node);
+
+      ok(zoomedOutQuad.bounds.width < defaultQuad.bounds.width,
+        "The zoomed out quad is smaller than the default one");
+      ok(zoomedOutQuad.bounds.height < defaultQuad.bounds.height,
+        "The zoomed out quad is smaller than the default one");
+
+      await sendCommand("zoom-reset");
+    }
+
+    function returnsMultipleItemsForWrappingInlineElements() {
+      info("Checks that several quads are returned " +
+           "for inline elements that span line-breaks");
+
+      let node = doc.querySelector("#inline");
+      let quads = getAdjustedQuads(doc.defaultView, node, "content");
+      // At least 3 because of the 2 <br />, maybe more depending on the window size.
+      ok(quads.length >= 3, "Multiple quads were returned");
+
+      is(quads.length, node.getBoxQuads().length,
+        "The same number of boxes as getBoxQuads was returned");
+    }
+  });
 
   gBrowser.removeCurrentTab();
 });
-
-function returnsTheRightDataStructure(doc) {
-  info("Checks that the returned data contains bounds and 4 points");
-
-  let node = doc.querySelector("body");
-  let [res] = getAdjustedQuads(doc.defaultView, node, "content");
-
-  ok("bounds" in res, "The returned data has a bounds property");
-  ok("p1" in res, "The returned data has a p1 property");
-  ok("p2" in res, "The returned data has a p2 property");
-  ok("p3" in res, "The returned data has a p3 property");
-  ok("p4" in res, "The returned data has a p4 property");
-
-  for (let boundProp of
-    ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
-    ok(boundProp in res.bounds, "The bounds has a " + boundProp + " property");
-  }
-
-  for (let point of ["p1", "p2", "p3", "p4"]) {
-    for (let pointProp of ["x", "y", "z", "w"]) {
-      ok(pointProp in res[point], point + " has a " + pointProp + " property");
-    }
-  }
-}
-
-function isEmptyForMissingNode(doc) {
-  info("Checks that null is returned for invalid nodes");
-
-  for (let input of [null, undefined, "", 0]) {
-    is(getAdjustedQuads(doc.defaultView, input).length, 0,
-      "A 0-length array is returned for input " + input);
-  }
-}
-
-function isEmptyForHiddenNodes(doc) {
-  info("Checks that null is returned for nodes that aren't rendered");
-
-  let style = doc.querySelector("#styles");
-  is(getAdjustedQuads(doc.defaultView, style).length, 0,
-    "null is returned for a <style> node");
-
-  let hidden = doc.querySelector("#hidden-node");
-  is(getAdjustedQuads(doc.defaultView, hidden).length, 0,
-    "null is returned for a hidden node");
-}
-
-function defaultsToBorderBoxIfNoneProvided(doc) {
-  info("Checks that if no boxtype is passed, then border is the default one");
-
-  let node = doc.querySelector("#simple-node-with-margin-padding-border");
-  let [withBoxType] = getAdjustedQuads(doc.defaultView, node, "border");
-  let [withoutBoxType] = getAdjustedQuads(doc.defaultView, node);
-
-  for (let boundProp of
-    ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
-    is(withBoxType.bounds[boundProp], withoutBoxType.bounds[boundProp],
-      boundProp + " bound is equal with or without the border box type");
-  }
-
-  for (let point of ["p1", "p2", "p3", "p4"]) {
-    for (let pointProp of ["x", "y", "z", "w"]) {
-      is(withBoxType[point][pointProp], withoutBoxType[point][pointProp],
-        point + "." + pointProp +
-        " is equal with or without the border box type");
-    }
-  }
-}
-
-function returnsLikeGetBoxQuadsInSimpleCase(doc) {
-  info("Checks that for an element in the main frame, without scroll nor zoom" +
-    "that the returned value is similar to the returned value of getBoxQuads");
-
-  let node = doc.querySelector("#simple-node-with-margin-padding-border");
-
-  for (let region of ["content", "padding", "border", "margin"]) {
-    let expected = node.getBoxQuads({
-      box: region
-    })[0];
-    let [actual] = getAdjustedQuads(doc.defaultView, node, region);
-
-    for (let boundProp of
-      ["bottom", "top", "right", "left", "width", "height", "x", "y"]) {
-      is(actual.bounds[boundProp], expected.bounds[boundProp],
-        boundProp + " bound is equal to the one returned by getBoxQuads for " +
-        region + " box");
-    }
-
-    for (let point of ["p1", "p2", "p3", "p4"]) {
-      for (let pointProp of ["x", "y", "z", "w"]) {
-        is(actual[point][pointProp], expected[point][pointProp],
-          point + "." + pointProp +
-          " is equal to the one returned by getBoxQuads for " + region + " box");
-      }
-    }
-  }
-}
-
-function takesIframesOffsetsIntoAccount(doc) {
-  info("Checks that the quad returned for a node inside iframes that have " +
-    "margins takes those offsets into account");
-
-  let rootIframe = doc.querySelector("iframe");
-  let subIframe = rootIframe.contentDocument.querySelector("iframe");
-  let innerNode = subIframe.contentDocument.querySelector("#inner-node");
-
-  let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
-
-  // rootIframe margin + subIframe margin + node margin + node border + node padding
-  let p1x = 10 + 10 + 10 + 10 + 10;
-  is(quad.p1.x, p1x, "The inner node's p1 x position is correct");
-
-  // Same as p1x + the inner node width
-  let p2x = p1x + 100;
-  is(quad.p2.x, p2x, "The inner node's p2 x position is correct");
-}
-
-function takesScrollingIntoAccount(doc) {
-  info("Checks that the quad returned for a node inside multiple scrolled " +
-    "containers takes the scroll values into account");
-
-  // For info, the container being tested here is absolutely positioned at 0 0
-  // to simplify asserting the coordinates
-
-  info("Scroll the container nodes down");
-  let scrolledNode = doc.querySelector("#scrolled-node");
-  scrolledNode.scrollTop = 100;
-  let subScrolledNode = doc.querySelector("#sub-scrolled-node");
-  subScrolledNode.scrollTop = 200;
-  let innerNode = doc.querySelector("#inner-scrolled-node");
-
-  let [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
-  is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling down");
-  is(quad.p1.y, -300, "p1.y of the scrolled node is correct after scrolling down");
-
-  info("Scrolling back up");
-  scrolledNode.scrollTop = 0;
-  subScrolledNode.scrollTop = 0;
-
-  [quad] = getAdjustedQuads(doc.defaultView, innerNode, "content");
-  is(quad.p1.x, 0, "p1.x of the scrolled node is correct after scrolling up");
-  is(quad.p1.y, 0, "p1.y of the scrolled node is correct after scrolling up");
-}
-
-function* takesZoomIntoAccount(doc) {
-  info("Checks that if the page is zoomed in/out, the quad returned is correct");
-
-  // Hard-coding coordinates in this zoom test is a bad idea as it can vary
-  // depending on the platform, so we simply test that zooming in produces a
-  // bigger quad and zooming out produces a smaller quad
-
-  let node = doc.querySelector("#simple-node-with-margin-padding-border");
-  let [defaultQuad] = getAdjustedQuads(doc.defaultView, node);
-
-  info("Zoom in");
-  window.FullZoom.enlarge();
-  let [zoomedInQuad] = getAdjustedQuads(doc.defaultView, node);
-
-  ok(zoomedInQuad.bounds.width > defaultQuad.bounds.width,
-    "The zoomed in quad is bigger than the default one");
-  ok(zoomedInQuad.bounds.height > defaultQuad.bounds.height,
-    "The zoomed in quad is bigger than the default one");
-
-  info("Zoom out");
-  yield window.FullZoom.reset();
-  window.FullZoom.reduce();
-  let [zoomedOutQuad] = getAdjustedQuads(doc.defaultView, node);
-
-  ok(zoomedOutQuad.bounds.width < defaultQuad.bounds.width,
-    "The zoomed out quad is smaller than the default one");
-  ok(zoomedOutQuad.bounds.height < defaultQuad.bounds.height,
-    "The zoomed out quad is smaller than the default one");
-
-  yield window.FullZoom.reset();
-}
-
-function returnsMultipleItemsForWrappingInlineElements(doc) {
-  info("Checks that several quads are returned " +
-       "for inline elements that span line-breaks");
-
-  let node = doc.querySelector("#inline");
-  let quads = getAdjustedQuads(doc.defaultView, node, "content");
-  // At least 3 because of the 2 <br />, maybe more depending on the window size.
-  ok(quads.length >= 3, "Multiple quads were returned");
-
-  is(quads.length, node.getBoxQuads().length,
-    "The same number of boxes as getBoxQuads was returned");
-}
diff --git a/devtools/client/styleeditor/test/browser.ini b/devtools/client/styleeditor/test/browser.ini
index 15b04a01a86a..96342a2f34cf 100644
--- a/devtools/client/styleeditor/test/browser.ini
+++ b/devtools/client/styleeditor/test/browser.ini
@@ -75,7 +75,7 @@ support-files =
 [browser_styleeditor_bug_1405342_serviceworker_iframes.js]
 [browser_styleeditor_cmd_edit.js]
 [browser_styleeditor_enabled.js]
-[browser_styleeditor_fetch-from-cache.js]
+[browser_styleeditor_fetch-from-netmonitor.js]
 [browser_styleeditor_filesave.js]
 [browser_styleeditor_highlight-selector.js]
 [browser_styleeditor_import.js]
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js b/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-netmonitor.js
similarity index 85%
rename from devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
rename to devtools/client/styleeditor/test/browser_styleeditor_fetch-from-netmonitor.js
index 121255fedc5d..6b01e51b726d 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-netmonitor.js
@@ -3,15 +3,12 @@
 
 "use strict";
 
-// A test to ensure Style Editor doesn't bybass cache when loading style sheet
-// contents (bug 978688).
+// A test to ensure Style Editor only issues 1 request for a stylesheet (instead of 2) by
+// using the network monitor's request history (bug 1306892).
 
 const TEST_URL = TEST_BASE_HTTP + "doc_uncached.html";
 
 add_task(function* () {
-  // Disable rcwn to make cache behavior deterministic.
-  yield pushPref("network.http.rcwn.enabled", false);
-
   info("Opening netmonitor");
   let tab = yield addTab("about:blank");
   let target = TargetFactory.forTab(tab);
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index e73941d589df..8c079d57c6af 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -136,6 +136,7 @@
 #include "nsIUploadChannel.h"
 #include "nsIURIFixup.h"
 #include "nsIURILoader.h"
+#include "nsIURIMutator.h"
 #include "nsIURL.h"
 #include "nsIViewSourceChannel.h"
 #include "nsIWebBrowserChrome.h"
@@ -1041,13 +1042,11 @@ nsDocShell::LoadStream(nsIInputStream* aStream, nsIURI* aURI,
   if (!uri) {
     // HACK ALERT
     nsresult rv = NS_OK;
-    uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
     // Make sure that the URI spec "looks" like a protocol and path...
     // For now, just use a bogus protocol called "internal"
-    rv = uri->SetSpec(NS_LITERAL_CSTRING("internal:load-stream"));
+    rv = NS_MutateURI(NS_SIMPLEURIMUTATOR_CONTRACTID)
+           .SetSpec(NS_LITERAL_CSTRING("internal:load-stream"))
+           .Finalize(uri);
     if (NS_FAILED(rv)) {
       return rv;
     }
diff --git a/dom/base/test/chrome/test_bug682305.html b/dom/base/test/chrome/test_bug682305.html
index fec4f013e49a..3046e4005d5d 100644
--- a/dom/base/test/chrome/test_bug682305.html
+++ b/dom/base/test/chrome/test_bug682305.html
@@ -32,7 +32,6 @@ var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-var SimpleURI = Cc["@mozilla.org/network/simple-uri;1"];
 var ios = Cc["@mozilla.org/network/io-service;1"]
             .getService(Ci.nsIIOService);
 var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
@@ -120,9 +119,10 @@ CustomProtocol.prototype = {
     return false;
   },
   newURI: function newURI(spec, charset, baseURI) {
-    var uri = SimpleURI.createInstance(Ci.nsIURI)
-    uri.spec = spec;
-    return uri.QueryInterface(Ci.nsIURI);
+    return Cc["@mozilla.org/network/simple-uri-mutator;1"]
+             .createInstance(Ci.nsIURIMutator)
+             .setSpec(spec)
+             .finalize();
   },
   newChannel2: function newChannel2(URI, loadInfo) {
     return new CustomChannel(URI, loadInfo);
diff --git a/dom/base/test/test_bug422403-1.html b/dom/base/test/test_bug422403-1.html
index fa6cbbd84a32..4e6bd2a2fe98 100644
--- a/dom/base/test/test_bug422403-1.html
+++ b/dom/base/test/test_bug422403-1.html
@@ -24,9 +24,10 @@ function loadFileContent(aFile, aCharset) {
     if(aCharset == undefined)
         aCharset = 'UTF-8';
 
-    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                   .createInstance(SpecialPowers.Ci.nsIURI);
-    baseUri.spec = window.location.href;
+    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                                  .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                                  .setSpec(window.location.href)
+                                  .finalize();
 
     var ios = SpecialPowers.Cc['@mozilla.org/network/io-service;1']
             .getService(SpecialPowers.Ci.nsIIOService);
diff --git a/dom/base/test/test_bug422403-2.xhtml b/dom/base/test/test_bug422403-2.xhtml
index 755cd7253251..fd61ad668fa7 100644
--- a/dom/base/test/test_bug422403-2.xhtml
+++ b/dom/base/test/test_bug422403-2.xhtml
@@ -23,9 +23,10 @@ function loadFileContent(aFile, aCharset) {
     if(aCharset == undefined)
         aCharset = 'UTF-8';
 
-    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                   .createInstance(SpecialPowers.Ci.nsIURI);
-    baseUri.spec = window.location.href;
+    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                                  .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                                  .setSpec(window.location.href)
+                                  .finalize();
 
     var ios = SpecialPowers.Cc['@mozilla.org/network/io-service;1']
             .getService(SpecialPowers.Ci.nsIIOService);
diff --git a/dom/base/test/test_bug424359-1.html b/dom/base/test/test_bug424359-1.html
index 1ee8164f6eff..93ea9e4be355 100644
--- a/dom/base/test/test_bug424359-1.html
+++ b/dom/base/test/test_bug424359-1.html
@@ -24,9 +24,10 @@ function loadFileContent(aFile, aCharset) {
     if(aCharset == undefined)
         aCharset = 'UTF-8';
 
-    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                   .createInstance(SpecialPowers.Ci.nsIURI);
-    baseUri.spec = window.location.href;
+    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                                  .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                                  .setSpec(window.location.href)
+                                  .finalize();
 
     var ios = SpecialPowers.Cc['@mozilla.org/network/io-service;1']
             .getService(SpecialPowers.Ci.nsIIOService);
diff --git a/dom/base/test/test_bug424359-2.html b/dom/base/test/test_bug424359-2.html
index 103e34e1c7ec..d46b92f42b56 100644
--- a/dom/base/test/test_bug424359-2.html
+++ b/dom/base/test/test_bug424359-2.html
@@ -23,9 +23,10 @@ function loadFileContent(aFile, aCharset) {
     if(aCharset == undefined)
         aCharset = 'UTF-8';
 
-    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                   .createInstance(SpecialPowers.Ci.nsIURI);
-    baseUri.spec = window.location.href;
+    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                                  .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                                  .setSpec(window.location.href)
+                                  .finalize();
 
     var ios = SpecialPowers.Cc['@mozilla.org/network/io-service;1']
             .getService(SpecialPowers.Ci.nsIIOService);
diff --git a/dom/base/test/test_bug498433.html b/dom/base/test/test_bug498433.html
index 5bafcd2ea61d..751bd60993fb 100644
--- a/dom/base/test/test_bug498433.html
+++ b/dom/base/test/test_bug498433.html
@@ -22,9 +22,10 @@ function loadFileContent(aFile, aCharset) {
     if (aCharset == undefined)
         aCharset = 'UTF-8';
 
-    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                   .createInstance(SpecialPowers.Ci.nsIURI);
-    baseUri.spec = window.location.href;
+    var baseUri = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                                  .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                                  .setSpec(window.location.href)
+                                  .finalize();
 
     var ios = SpecialPowers.Cc['@mozilla.org/network/io-service;1']
             .getService(SpecialPowers.Ci.nsIIOService);
diff --git a/dom/bindings/test/TestInterfaceJS.js b/dom/bindings/test/TestInterfaceJS.js
index d1d7b2f0f91d..4720b9d533cf 100644
--- a/dom/bindings/test/TestInterfaceJS.js
+++ b/dom/bindings/test/TestInterfaceJS.js
@@ -84,13 +84,8 @@ TestInterfaceJS.prototype = {
 
   testThrowNsresultFromNative: function(x) {
     // We want to throw an exception that we generate from an nsresult thrown
-    // by a C++ component.  Ideally we'd have one explicitly for testing, but
-    // for now just piggyback on nsStandardURL.
-    var url = Components.classes["@mozilla.org/network/standard-url;1"]
-                        .createInstance(Ci.nsIURI);
-    url.QueryInterface(Ci.nsIMutable);
-    url.mutable = false;
-    url.spec = "http://example.com";
+    // by a C++ component.
+    Services.netUtils.notImplemented();
   },
 
   testThrowCallbackError: function(callback) {
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index 415826221f76..de6ed0f48359 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -14,7 +14,7 @@
 #include "gfxPattern.h"
 #include "gfxPrefs.h"
 #include "gfxUtils.h"
-#include "gfx/gl/MozFramebuffer.h"
+#include "MozFramebuffer.h"
 #include "GLBlitHelper.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
diff --git a/dom/canvas/WebGLContextDraw.cpp b/dom/canvas/WebGLContextDraw.cpp
index 805b8f5d6364..0fa55ab256f9 100644
--- a/dom/canvas/WebGLContextDraw.cpp
+++ b/dom/canvas/WebGLContextDraw.cpp
@@ -6,7 +6,7 @@
 #include "WebGLContext.h"
 
 #include "GeckoProfiler.h"
-#include "gfx/gl/MozFramebuffer.h"
+#include "MozFramebuffer.h"
 #include "GLContext.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/UniquePtrExtensions.h"
diff --git a/dom/credentialmanagement/CredentialsContainer.cpp b/dom/credentialmanagement/CredentialsContainer.cpp
index d587735725c9..a782daa0ae1b 100644
--- a/dom/credentialmanagement/CredentialsContainer.cpp
+++ b/dom/credentialmanagement/CredentialsContainer.cpp
@@ -7,6 +7,7 @@
 #include "mozilla/dom/CredentialsContainer.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/WebAuthnManager.h"
+#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -19,6 +20,63 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(CredentialsContainer)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
+already_AddRefed<Promise>
+CreateAndReject(nsPIDOMWindowInner* aParent, ErrorResult& aRv)
+{
+  MOZ_ASSERT(aParent);
+
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aParent);
+  if (NS_WARN_IF(!global)) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
+  RefPtr<Promise> promise = Promise::Create(global, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  promise->MaybeReject(NS_ERROR_DOM_NOT_ALLOWED_ERR);
+  return promise.forget();
+}
+
+bool
+IsSameOriginWithAncestors(nsPIDOMWindowInner* aParent)
+{
+  // This method returns true if aParent is either not in a frame / iframe, or
+  // is in a frame or iframe and all ancestors for aParent are the same origin.
+  // This is useful for Credential Management because we need to prohibit
+  // iframes, but not break mochitests (which use iframes to embed the tests).
+  MOZ_ASSERT(aParent);
+
+  if (aParent->IsTopInnerWindow()) {
+    // Not in a frame or iframe
+    return true;
+  }
+
+  // We're in some kind of frame, so let's get the parent and start checking
+  // the same origin policy
+  nsINode* node = nsContentUtils::GetCrossDocParentNode(aParent->GetExtantDoc());
+  if (NS_WARN_IF(!node)) {
+    // This is a sanity check, since there has to be a parent. Fail safe.
+    return false;
+  }
+
+  // Check that all ancestors are the same origin, repeating until we find a
+  // null parent
+  do {
+    nsresult rv = nsContentUtils::CheckSameOrigin(aParent->GetExtantDoc(), node);
+    if (NS_FAILED(rv)) {
+      // same-origin policy is violated
+      return false;
+    }
+
+    node = nsContentUtils::GetCrossDocParentNode(node);
+  } while (node);
+
+  return true;
+}
+
 CredentialsContainer::CredentialsContainer(nsPIDOMWindowInner* aParent) :
   mParent(aParent)
 {
@@ -45,22 +103,42 @@ CredentialsContainer::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenPro
 }
 
 already_AddRefed<Promise>
-CredentialsContainer::Get(const CredentialRequestOptions& aOptions)
+CredentialsContainer::Get(const CredentialRequestOptions& aOptions,
+                          ErrorResult& aRv)
 {
+  if (!IsSameOriginWithAncestors(mParent)) {
+    return CreateAndReject(mParent, aRv);
+  }
+
+  // TODO: Check that we're an active document, too. See bug 1409202.
+
   EnsureWebAuthnManager();
   return mManager->GetAssertion(aOptions.mPublicKey, aOptions.mSignal);
 }
 
 already_AddRefed<Promise>
-CredentialsContainer::Create(const CredentialCreationOptions& aOptions)
+CredentialsContainer::Create(const CredentialCreationOptions& aOptions,
+                             ErrorResult& aRv)
 {
+  if (!IsSameOriginWithAncestors(mParent)) {
+    return CreateAndReject(mParent, aRv);
+  }
+
+  // TODO: Check that we're an active document, too. See bug 1409202.
+
   EnsureWebAuthnManager();
   return mManager->MakeCredential(aOptions.mPublicKey, aOptions.mSignal);
 }
 
 already_AddRefed<Promise>
-CredentialsContainer::Store(const Credential& aCredential)
+CredentialsContainer::Store(const Credential& aCredential, ErrorResult& aRv)
 {
+  if (!IsSameOriginWithAncestors(mParent)) {
+    return CreateAndReject(mParent, aRv);
+  }
+
+  // TODO: Check that we're an active document, too. See bug 1409202.
+
   EnsureWebAuthnManager();
   return mManager->Store(aCredential);
 }
diff --git a/dom/credentialmanagement/CredentialsContainer.h b/dom/credentialmanagement/CredentialsContainer.h
index e72665b39d1a..f187c5d4c2d6 100644
--- a/dom/credentialmanagement/CredentialsContainer.h
+++ b/dom/credentialmanagement/CredentialsContainer.h
@@ -33,13 +33,13 @@ public:
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   already_AddRefed<Promise>
-  Get(const CredentialRequestOptions& aOptions);
+  Get(const CredentialRequestOptions& aOptions, ErrorResult& aRv);
 
   already_AddRefed<Promise>
-  Create(const CredentialCreationOptions& aOptions);
+  Create(const CredentialCreationOptions& aOptions, ErrorResult& aRv);
 
   already_AddRefed<Promise>
-  Store(const Credential& aCredential);
+  Store(const Credential& aCredential, ErrorResult& aRv);
 
 private:
   ~CredentialsContainer();
diff --git a/dom/credentialmanagement/moz.build b/dom/credentialmanagement/moz.build
index 8fc7ab7ae9bc..5e1dc38bbd0a 100644
--- a/dom/credentialmanagement/moz.build
+++ b/dom/credentialmanagement/moz.build
@@ -20,3 +20,5 @@ UNIFIED_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
diff --git a/dom/credentialmanagement/tests/.eslintrc.js b/dom/credentialmanagement/tests/.eslintrc.js
new file mode 100644
index 000000000000..1f36b13c905e
--- /dev/null
+++ b/dom/credentialmanagement/tests/.eslintrc.js
@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  "extends": [
+    "plugin:mozilla/mochitest-test",
+  ],
+  "plugins": [
+    "mozilla"
+  ]
+};
\ No newline at end of file
diff --git a/dom/credentialmanagement/tests/mochitest/frame_credman_iframes.html b/dom/credentialmanagement/tests/mochitest/frame_credman_iframes.html
new file mode 100644
index 000000000000..a63b1185914d
--- /dev/null
+++ b/dom/credentialmanagement/tests/mochitest/frame_credman_iframes.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Embedded Frame for Credential Management: Prohibit use in cross-origin iframes</title>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <meta charset=utf-8>
+</head>
+<body>
+
+<script class="testbody" type="text/javascript">
+"use strict";
+
+const cose_alg_ECDSA_w_SHA256 = -7;
+var _parentOrigin = "https://example.com/";
+
+function log(msg) {
+  console.log(msg);
+  let logBox = document.getElementById("log");
+  if (logBox) {
+    logBox.textContent += "\n" + msg;
+  }
+}
+
+function local_finished() {
+  parent.postMessage({"done": true}, _parentOrigin);
+  log("Done.");
+}
+
+function local_ok(expression, message) {
+  let body = {"test": expression, "status": expression, "msg": message};
+  parent.postMessage(body, _parentOrigin);
+  log(expression + ": " + message);
+}
+
+function testSameOrigin() {
+  log("Same origin: " + document.domain);
+
+  navigator.credentials.create({publicKey: makeCredentialOptions})
+  .then(function sameOriginCreateThen(aResult) {
+    local_ok(aResult != undefined, "Create worked " + aResult);
+  })
+  .catch(function sameOriginCatch(aResult) {
+    local_ok(false, "Should not have failed " + aResult);
+  })
+  .then(function() {
+    local_finished();
+  });
+}
+
+function testCrossOrigin() {
+  log("Cross-origin: " + document.domain);
+
+  navigator.credentials.create({publicKey: makeCredentialOptions})
+  .then(function crossOriginThen(aBad) {
+    local_ok(false, "Should not have succeeded " + aBad);
+  })
+  .catch(function crossOriginCatch(aResult) {
+    local_ok(aResult.toString().startsWith("NotAllowedError"),
+             "Expecting a NotAllowedError, received " + aResult);
+  })
+  .then(function() {
+    local_finished();
+  });
+}
+
+let rp = {id: document.domain, name: "none", icon: "none"};
+let user = {
+  id: crypto.getRandomValues(new Uint8Array(16)),
+  name: "none", icon: "none", displayName: "none"
+};
+let param = {type: "public-key", alg: cose_alg_ECDSA_w_SHA256};
+let makeCredentialOptions = {
+  rp, user, challenge: new Uint8Array(), pubKeyCredParams: [param]
+};
+
+if (document.domain == "example.com") {
+  testSameOrigin();
+} else {
+  testCrossOrigin();
+}
+
+</script>
+
+<div id="log"></div>
+
+</body>
+</html>
diff --git a/dom/credentialmanagement/tests/mochitest/mochitest.ini b/dom/credentialmanagement/tests/mochitest/mochitest.ini
new file mode 100644
index 000000000000..b3e59bed8f8e
--- /dev/null
+++ b/dom/credentialmanagement/tests/mochitest/mochitest.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  frame_credman_iframes.html
+scheme = https
+skip-if = !e10s
+
+[test_credman_iframes.html]
diff --git a/dom/credentialmanagement/tests/mochitest/test_credman_iframes.html b/dom/credentialmanagement/tests/mochitest/test_credman_iframes.html
new file mode 100644
index 000000000000..0153b07c6b70
--- /dev/null
+++ b/dom/credentialmanagement/tests/mochitest/test_credman_iframes.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<head>
+  <title>Credential Management: Prohibit use in cross-origin iframes</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <meta charset=utf-8>
+</head>
+<body>
+<h1>Credential Management: Prohibit use in cross-origin iframes</h1>
+<ul>
+  <li><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1407789">Mozilla Bug 1407789</a></li>
+</ul>
+
+<div id="framediv">
+  <h2>Same Origin Test</h2>
+  <iframe id="frame_top"></iframe>
+
+  <h2>Cross-Origin Test</h2>
+  <iframe id="frame_bottom"></iframe>
+</div>
+
+<script class="testbody" type="text/javascript">
+"use strict";
+
+SimpleTest.waitForExplicitFinish();
+
+var _countCompletes = 0;
+var _expectedCompletes = 2; // 2 iframes
+
+function handleEventMessage(event) {
+  if ("test" in event.data) {
+    let summary = event.data.test + ": " + event.data.msg;
+    ok(event.data.status, summary);
+  } else if ("done" in event.data) {
+    _countCompletes += 1;
+    if (_countCompletes == _expectedCompletes) {
+      console.log("Test compeleted. Finished.");
+      SimpleTest.finish();
+    }
+  } else {
+    ok(false, "Unexpected message in the test harness: " + event.data);
+  }
+}
+
+window.addEventListener("message", handleEventMessage);
+SpecialPowers.pushPrefEnv({"set": [["security.webauth.webauthn", true],
+                                   ["security.webauth.webauthn_enable_softtoken", true],
+                                   ["security.webauth.webauthn_enable_usbtoken", false]]},
+function() {
+  document.getElementById("frame_top").src = "https://example.com/tests/dom/credentialmanagement/tests/mochitest/frame_credman_iframes.html";
+
+  document.getElementById("frame_bottom").src = "https://test1.example.com/tests/dom/credentialmanagement/tests/mochitest/frame_credman_iframes.html";
+
+});
+</script>
+</body>
+</html>
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 2702e679cbd1..ef9f8aa3d4fa 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -290,8 +290,7 @@ protected:
     // the elements of the Tuple into the final function call.
     auto copiedArgs = MakeTuple(Forward<Ts>(aArgs)...);
 
-    // keep mMaster in a local object because mMaster will become invalid after
-    // the current state object is deleted.
+    // Copy mMaster which will reset to null.
     auto master = mMaster;
 
     auto* s = new S(master);
@@ -303,6 +302,14 @@ protected:
 
     Exit();
 
+    // Delete the old state asynchronously to avoid UAF if the caller tries to
+    // access its members after SetState() returns.
+    master->OwnerThread()->DispatchDirectTask(
+      NS_NewRunnableFunction("MDSM::StateObject::DeleteOldState",
+                             [toDelete = Move(master->mStateObj)](){}));
+    // Also reset mMaster to catch potentail UAF.
+    mMaster = nullptr;
+
     master->mStateObj.reset(s);
     return CallEnterMemberFunction(s, copiedArgs,
                                    typename IndexSequenceFor<Ts...>::Type());
diff --git a/dom/tests/unit/test_bug465752.js b/dom/tests/unit/test_bug465752.js
index 03a444f8b8d0..b29c46e2e5d8 100644
--- a/dom/tests/unit/test_bug465752.js
+++ b/dom/tests/unit/test_bug465752.js
@@ -19,9 +19,10 @@ function run_test()
   Assert.ok(!uri3.equals(uri2));
   Assert.ok(!uri2.equals(uri3));
 
-  var simple = Components.classes["@mozilla.org/network/simple-uri;1"]
-                         .createInstance(Components.interfaces.nsIURI);
-  simple.spec = str;
+  var simple = Components.classes["@mozilla.org/network/simple-uri-mutator;1"]
+                         .createInstance(Components.interfaces.nsIURIMutator)
+                         .setSpec(str)
+                         .finalize();
   Assert.equal(simple.spec, uri.spec);
   Assert.ok(!simple.equals(uri));
   Assert.ok(!uri.equals(simple));
diff --git a/dom/webidl/CredentialManagement.webidl b/dom/webidl/CredentialManagement.webidl
index ca36a791607c..bcbced8107b1 100644
--- a/dom/webidl/CredentialManagement.webidl
+++ b/dom/webidl/CredentialManagement.webidl
@@ -15,8 +15,11 @@ interface Credential {
 
 [Exposed=Window, SecureContext, Pref="security.webauth.webauthn"]
 interface CredentialsContainer {
+  [Throws]
   Promise<Credential?> get(optional CredentialRequestOptions options);
+  [Throws]
   Promise<Credential?> create(optional CredentialCreationOptions options);
+  [Throws]
   Promise<Credential> store(Credential credential);
 };
 
diff --git a/dom/xslt/tests/XSLTMark/XSLTMark-static.js b/dom/xslt/tests/XSLTMark/XSLTMark-static.js
index d3284aac8ee4..138edb68888e 100644
--- a/dom/xslt/tests/XSLTMark/XSLTMark-static.js
+++ b/dom/xslt/tests/XSLTMark/XSLTMark-static.js
@@ -9,8 +9,8 @@ const nsIIOService    = Components.interfaces.nsIIOService;
 const SIS_CTRID       = "@mozilla.org/scriptableinputstream;1";
 const nsISIS          = Components.interfaces.nsIScriptableInputStream;
 const nsIFilePicker   = Components.interfaces.nsIFilePicker;
-const STDURL_CTRID    = "@mozilla.org/network/standard-url;1";
-const nsIURI          = Components.interfaces.nsIURI;
+const STDURLMUT_CTRID = "@mozilla.org/network/standard-url-mutator;1";
+const nsIURIMutator   = Components.interfaces.nsIURIMutator;
 
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
diff --git a/dom/xslt/tests/XSLTMark/XSLTMark-view.js b/dom/xslt/tests/XSLTMark/XSLTMark-view.js
index 7342d0d9ab2c..d24239ff10f5 100644
--- a/dom/xslt/tests/XSLTMark/XSLTMark-view.js
+++ b/dom/xslt/tests/XSLTMark/XSLTMark-view.js
@@ -20,8 +20,10 @@ var view =
         var res = fp.show();
 
         if (res == nsIFilePicker.returnOK) {
-            this.configUrl = Components.classes[STDURL_CTRID].createInstance(nsIURI);
-            this.configUrl.spec = fp.fileURL.spec;
+            this.configUrl = Components.classes[STDURLMUT_CTRID]
+                                       .createInstance(nsIURIMutator)
+                                       .setSpec(fp.fileURL.spec)
+                                       .finalize();
             document.getElementById('config').setAttribute('value', this.configUrl.spec);
         }
         this.parseConfig();
@@ -153,8 +155,11 @@ var view =
         enablePrivilege('UniversalXPConnect');
         if (!this.testArray) {
             if (!this.configUrl) {
-                this.configUrl = Components.classes[STDURL_CTRID].createInstance(nsIURI);
-                this.configUrl.spec = document.getElementById('config').value;
+                this.configUrl =
+                    Components.classes[STDURLMUT_CTRID]
+                              .createInstance(nsIURIMutator)
+                              .setSpec(document.getElementById('config').value)
+                              .finalize();
             }
             this.parseConfig();
         }
diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp
index 82118bdacf27..64f6fc3e5ba8 100644
--- a/editor/libeditor/EditorBase.cpp
+++ b/editor/libeditor/EditorBase.cpp
@@ -1449,10 +1449,10 @@ EditorBase::CreateNode(nsAtom* aTag,
     // Now, aPointToInsert may be invalid.  I.e., GetChild() keeps
     // referring the next sibling of new node but Offset() refers the
     // new node.  Let's make refer the new node.
-    pointToInsert.Set(ret);
+    pointToInsert.Set(ret, offset);
   }
 
-  mRangeUpdater.SelAdjCreateNode(pointToInsert.GetContainer(), offset);
+  mRangeUpdater.SelAdjCreateNode(pointToInsert.AsRaw());
 
   {
     AutoActionListenerArray listeners(mActionListeners);
@@ -1508,8 +1508,7 @@ EditorBase::InsertNode(nsIContent& aContentToInsert,
     InsertNodeTransaction::Create(*this, aContentToInsert, aPointToInsert);
   nsresult rv = DoTransaction(transaction);
 
-  mRangeUpdater.SelAdjInsertNode(aPointToInsert.GetContainer(),
-                                 aPointToInsert.Offset());
+  mRangeUpdater.SelAdjInsertNode(aPointToInsert.AsRaw());
 
   {
     AutoActionListenerArray listeners(mActionListeners);
@@ -1897,7 +1896,10 @@ EditorBase::MoveNode(nsIContent* aNode,
               AssertedCast<uint32_t>(aOffset) <= aParent->Length()));
 
   nsCOMPtr<nsINode> oldParent = aNode->GetParentNode();
-  int32_t oldOffset = oldParent ? oldParent->IndexOf(aNode) : -1;
+  if (NS_WARN_IF(!oldParent)) {
+    return NS_ERROR_FAILURE;
+  }
+  int32_t oldOffset = oldParent->IndexOf(aNode);
 
   if (aOffset == -1) {
     // Magic value meaning "move to end of aParent"
diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index e2a6f79a160b..2c7254dec6b8 100644
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -3732,6 +3732,9 @@ HTMLEditRules::WillMakeList(Selection* aSelection,
       }
       curList =
         htmlEditor->CreateNode(listType, splitCurNodeResult.SplitPoint());
+      if (NS_WARN_IF(!curList)) {
+        return NS_ERROR_FAILURE;
+      }
       // remember our new block for postprocessing
       mNewBlock = curList;
       // curList is now the correct thing to put curNode in
diff --git a/editor/libeditor/SelectionState.cpp b/editor/libeditor/SelectionState.cpp
index e28be7a6d0af..a996ec92ecd3 100644
--- a/editor/libeditor/SelectionState.cpp
+++ b/editor/libeditor/SelectionState.cpp
@@ -213,27 +213,31 @@ RangeUpdater::DropSelectionState(SelectionState& aSelState)
 // gravity methods:
 
 nsresult
-RangeUpdater::SelAdjCreateNode(nsINode* aParent,
-                               int32_t aPosition)
+RangeUpdater::SelAdjCreateNode(const EditorRawDOMPoint& aPoint)
 {
   if (mLock) {
     // lock set by Will/DidReplaceParent, etc...
     return NS_OK;
   }
-  NS_ENSURE_TRUE(aParent, NS_ERROR_NULL_POINTER);
   size_t count = mArray.Length();
   if (!count) {
     return NS_OK;
   }
 
+  if (NS_WARN_IF(!aPoint.IsSetAndValid())) {
+    return NS_ERROR_FAILURE;
+  }
+
   for (size_t i = 0; i < count; i++) {
     RangeItem* item = mArray[i];
     NS_ENSURE_TRUE(item, NS_ERROR_NULL_POINTER);
 
-    if (item->mStartContainer == aParent && item->mStartOffset > aPosition) {
+    if (item->mStartContainer == aPoint.GetContainer() &&
+        item->mStartOffset > static_cast<int32_t>(aPoint.Offset())) {
       item->mStartOffset++;
     }
-    if (item->mEndContainer == aParent && item->mEndOffset > aPosition) {
+    if (item->mEndContainer == aPoint.GetContainer() &&
+        item->mEndOffset > static_cast<int32_t>(aPoint.Offset())) {
       item->mEndOffset++;
     }
   }
@@ -241,10 +245,9 @@ RangeUpdater::SelAdjCreateNode(nsINode* aParent,
 }
 
 nsresult
-RangeUpdater::SelAdjInsertNode(nsINode* aParent,
-                               int32_t aPosition)
+RangeUpdater::SelAdjInsertNode(const EditorRawDOMPoint& aPoint)
 {
-  return SelAdjCreateNode(aParent, aPosition);
+  return SelAdjCreateNode(aPoint);
 }
 
 void
@@ -320,8 +323,7 @@ RangeUpdater::SelAdjSplitNode(nsIContent& aRightNode,
   }
 
   EditorRawDOMPoint atLeftNode(aNewLeftNode);
-  nsresult rv =
-    SelAdjInsertNode(atLeftNode.GetContainer(), atLeftNode.Offset());
+  nsresult rv = SelAdjInsertNode(atLeftNode);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
diff --git a/editor/libeditor/SelectionState.h b/editor/libeditor/SelectionState.h
index c9abc1c9c4e3..7bde4f643f85 100644
--- a/editor/libeditor/SelectionState.h
+++ b/editor/libeditor/SelectionState.h
@@ -109,8 +109,8 @@ public:
   // if you move a node, that corresponds to deleting it and reinserting it.
   // DOM Range gravity will promote the selection out of the node on deletion,
   // which is not what you want if you know you are reinserting it.
-  nsresult SelAdjCreateNode(nsINode* aParent, int32_t aPosition);
-  nsresult SelAdjInsertNode(nsINode* aParent, int32_t aPosition);
+  nsresult SelAdjCreateNode(const EditorRawDOMPoint& aPoint);
+  nsresult SelAdjInsertNode(const EditorRawDOMPoint& aPoint);
   void SelAdjDeleteNode(nsINode* aNode);
   nsresult SelAdjSplitNode(nsIContent& aRightNode, nsIContent* aNewLeftNode);
   nsresult SelAdjJoinNodes(nsINode& aLeftNode,
diff --git a/editor/libeditor/crashtests/1425091.html b/editor/libeditor/crashtests/1425091.html
new file mode 100644
index 000000000000..b4ab8cc2ef60
--- /dev/null
+++ b/editor/libeditor/crashtests/1425091.html
@@ -0,0 +1,15 @@
+<script>
+function go() {
+  document.scrollingElement.addEventListener("DOMNodeInserted", () => {
+    document.execCommand("selectAll", false);
+    document.execCommand("insertOrderedList", false);
+  });
+  a.appendChild(document.createElement("e"));
+}
+</script>
+<body onload=go()>
+<meter contenteditable="true">
+<dialog>
+<style id="a"></style>
+</dialog>
+</meter>
diff --git a/editor/libeditor/crashtests/crashtests.list b/editor/libeditor/crashtests/crashtests.list
index 3bc588919f41..cbe19391c749 100644
--- a/editor/libeditor/crashtests/crashtests.list
+++ b/editor/libeditor/crashtests/crashtests.list
@@ -95,3 +95,4 @@ load 1405747.html
 load 1408170.html
 load 1414581.html
 load 1415231.html
+load 1425091.html
diff --git a/gfx/doc/README.webrender b/gfx/doc/README.webrender
index 0f88db0a2842..5cbbd315e339 100644
--- a/gfx/doc/README.webrender
+++ b/gfx/doc/README.webrender
@@ -175,4 +175,4 @@ Troubleshooting tips:
 -------------------------------------------------------------------------------
 
 The version of WebRender currently in the tree is:
-1142dfc557c319119a5117450718c5b67a93cb9f
+a422f907be948b92bf5c7003a01f7744391a795e
diff --git a/gfx/webrender/Cargo.toml b/gfx/webrender/Cargo.toml
index 2f8d010bd924..0898e385086b 100644
--- a/gfx/webrender/Cargo.toml
+++ b/gfx/webrender/Cargo.toml
@@ -10,7 +10,8 @@ build = "build.rs"
 default = ["freetype-lib"]
 freetype-lib = ["freetype/servo-freetype-sys"]
 profiler = ["thread_profiler/thread_profiler"]
-debugger = ["ws", "serde_json", "serde", "serde_derive", "image", "base64"]
+debugger = ["ws", "serde_json", "serde", "image", "base64"]
+capture = ["webrender_api/debug-serialization", "ron", "serde"]
 
 [dependencies]
 app_units = "0.6"
@@ -31,10 +32,10 @@ plane-split = "0.7"
 smallvec = "0.6"
 ws = { optional = true, version = "0.7.3" }
 serde_json = { optional = true, version = "1.0" }
-serde = { optional = true, version = "1.0" }
-serde_derive = { optional = true, version = "1.0" }
+serde = { optional = true, version = "1.0", features = ["serde_derive"] }
 image = { optional = true, version = "0.17" }
 base64 = { optional = true, version = "0.3.0" }
+ron = { optional = true, version = "0.1.3" }
 
 [dev-dependencies]
 angle = {git = "https://github.com/servo/angle", branch = "servo"}
diff --git a/gfx/webrender/examples/basic.rs b/gfx/webrender/examples/basic.rs
index e83736d5ec58..3b1a2a23356d 100644
--- a/gfx/webrender/examples/basic.rs
+++ b/gfx/webrender/examples/basic.rs
@@ -256,7 +256,7 @@ impl Example for App {
         builder.push_border(&info, border_widths, border_details);
         builder.pop_clip_id();
 
-        if false {
+        if true {
             // draw text?
             let font_key = api.generate_font_key();
             let font_bytes = load_file("../wrench/reftests/text/FreeSans.ttf");
diff --git a/gfx/webrender/examples/common/boilerplate.rs b/gfx/webrender/examples/common/boilerplate.rs
index c0be1c056d2a..2e0e8f9560d5 100644
--- a/gfx/webrender/examples/common/boilerplate.rs
+++ b/gfx/webrender/examples/common/boilerplate.rs
@@ -263,6 +263,19 @@ pub fn main_wrapper<E: Example>(
                 ) => {
                     api.notify_memory_pressure();
                 }
+                #[cfg(feature = "capture")]
+                glutin::Event::KeyboardInput(
+                    glutin::ElementState::Pressed,
+                    _,
+                    Some(glutin::VirtualKeyCode::C),
+                ) => {
+                    let path: PathBuf = "captures/example".into();
+                    if path.is_dir() {
+                        api.load_capture(path);
+                    } else {
+                        api.save_capture(path);
+                    }
+                }
                 _ => if example.on_event(event, &api, document_id) {
                     let mut builder = DisplayListBuilder::new(pipeline_id, layout_size);
                     let mut resources = ResourceUpdates::new();
@@ -285,7 +298,7 @@ pub fn main_wrapper<E: Example>(
                         resources,
                     );
                     api.generate_frame(document_id, None);
-                },
+                }
             }
         }
 
diff --git a/gfx/webrender/res/brush.glsl b/gfx/webrender/res/brush.glsl
index 81e90736e944..77023ef3a364 100644
--- a/gfx/webrender/res/brush.glsl
+++ b/gfx/webrender/res/brush.glsl
@@ -8,49 +8,34 @@ void brush_vs(
     int prim_address,
     vec2 local_pos,
     RectWithSize local_rect,
-    ivec2 user_data
+    ivec2 user_data,
+    PictureTask pic_task
 );
 
-#define RASTERIZATION_MODE_LOCAL_SPACE      0.0
-#define RASTERIZATION_MODE_SCREEN_SPACE     1.0
-
-#define SEGMENT_ALL             0
-#define SEGMENT_TOP_LEFT        1
-#define SEGMENT_TOP_RIGHT       2
-#define SEGMENT_BOTTOM_RIGHT    3
-#define SEGMENT_BOTTOM_LEFT     4
-#define SEGMENT_TOP_MID         5
-#define SEGMENT_MID_RIGHT       6
-#define SEGMENT_BOTTOM_MID      7
-#define SEGMENT_MID_LEFT        8
-#define SEGMENT_CENTER          9
-
-#define AA_KIND_DEFAULT         0
-#define AA_KIND_SEGMENT         1
-
-#define VECS_PER_BRUSH_PRIM                 4
+#define VECS_PER_BRUSH_PRIM                 2
+#define VECS_PER_SEGMENT                    2
 
 struct BrushInstance {
     int picture_address;
     int prim_address;
-    int clip_node_id;
+    int clip_chain_rect_index;
     int scroll_node_id;
     int clip_address;
     int z;
-    int segment_kind;
+    int segment_index;
     ivec2 user_data;
 };
 
 BrushInstance load_brush() {
-	BrushInstance bi;
+    BrushInstance bi;
 
     bi.picture_address = aData0.x;
     bi.prim_address = aData0.y;
-    bi.clip_node_id = aData0.z / 65536;
+    bi.clip_chain_rect_index = aData0.z / 65536;
     bi.scroll_node_id = aData0.z % 65536;
     bi.clip_address = aData0.w;
     bi.z = aData1.x;
-    bi.segment_kind = aData1.y;
+    bi.segment_index = aData1.y;
     bi.user_data = aData1.zw;
 
     return bi;
@@ -59,19 +44,16 @@ BrushInstance load_brush() {
 struct BrushPrimitive {
     RectWithSize local_rect;
     RectWithSize local_clip_rect;
-    vec4 offsets;
-    int aa_kind;
 };
 
-BrushPrimitive fetch_brush_primitive(int address) {
-    vec4 data[4] = fetch_from_resource_cache_4(address);
+BrushPrimitive fetch_brush_primitive(int address, int clip_chain_rect_index) {
+    vec4 data[2] = fetch_from_resource_cache_2(address);
 
-    BrushPrimitive prim = BrushPrimitive(
-        RectWithSize(data[0].xy, data[0].zw),
-        RectWithSize(data[1].xy, data[1].zw),
-        data[2],
-        int(data[3].x)
-    );
+    RectWithSize clip_chain_rect = fetch_clip_chain_rect(clip_chain_rect_index);
+    RectWithSize brush_clip_rect = RectWithSize(data[1].xy, data[1].zw);
+    RectWithSize clip_rect = intersect_rects(clip_chain_rect, brush_clip_rect);
+
+    BrushPrimitive prim = BrushPrimitive(RectWithSize(data[0].xy, data[0].zw), clip_rect);
 
     return prim;
 }
@@ -83,77 +65,25 @@ void main(void) {
     // Load the geometry for this brush. For now, this is simply the
     // local rect of the primitive. In the future, this will support
     // loading segment rects, and other rect formats (glyphs).
-    BrushPrimitive brush_prim = fetch_brush_primitive(brush.prim_address);
+    BrushPrimitive brush_prim =
+        fetch_brush_primitive(brush.prim_address, brush.clip_chain_rect_index);
 
     // Fetch the segment of this brush primitive we are drawing.
-    RectWithSize local_segment_rect;
-    vec4 edge_aa_segment_mask;
+    int segment_address = brush.prim_address +
+                          VECS_PER_BRUSH_PRIM +
+                          VECS_PER_SPECIFIC_BRUSH +
+                          brush.segment_index * VECS_PER_SEGMENT;
 
-    // p0 = origin of outer rect
-    // p1 = origin of inner rect
-    // p2 = bottom right corner of inner rect
-    // p3 = bottom right corner of outer rect
-    vec2 p0 = brush_prim.local_rect.p0;
-    vec2 p1 = brush_prim.local_rect.p0 + brush_prim.offsets.xy;
-    vec2 p2 = brush_prim.local_rect.p0 + brush_prim.local_rect.size - brush_prim.offsets.zw;
-    vec2 p3 = brush_prim.local_rect.p0 + brush_prim.local_rect.size;
-
-    switch (brush.segment_kind) {
-        case SEGMENT_ALL:
-            local_segment_rect = brush_prim.local_rect;
-            break;
-
-        case SEGMENT_TOP_LEFT:
-            local_segment_rect = RectWithSize(p0, p1 - p0);
-            break;
-        case SEGMENT_TOP_RIGHT:
-            local_segment_rect = RectWithSize(vec2(p2.x, p0.y), vec2(p3.x - p2.x, p1.y - p0.y));
-            break;
-        case SEGMENT_BOTTOM_RIGHT:
-            local_segment_rect = RectWithSize(vec2(p2.x, p2.y), vec2(p3.x - p2.x, p3.y - p2.y));
-            break;
-        case SEGMENT_BOTTOM_LEFT:
-            local_segment_rect = RectWithSize(vec2(p0.x, p2.y), vec2(p1.x - p0.x, p3.y - p2.y));
-            break;
-
-        case SEGMENT_TOP_MID:
-            local_segment_rect = RectWithSize(vec2(p1.x, p0.y), vec2(p2.x - p1.x, p1.y - p0.y));
-            break;
-        case SEGMENT_MID_RIGHT:
-            local_segment_rect = RectWithSize(vec2(p2.x, p1.y), vec2(p3.x - p2.x, p2.y - p1.y));
-            break;
-        case SEGMENT_BOTTOM_MID:
-            local_segment_rect = RectWithSize(vec2(p1.x, p2.y), vec2(p2.x - p1.x, p3.y - p2.y));
-            break;
-        case SEGMENT_MID_LEFT:
-            local_segment_rect = RectWithSize(vec2(p0.x, p1.y), vec2(p1.x - p0.x, p2.y - p1.y));
-            break;
-
-        case SEGMENT_CENTER:
-            local_segment_rect = RectWithSize(p1, p2 - p1);
-            break;
-
-        default:
-            local_segment_rect = RectWithSize(vec2(0.0), vec2(0.0));
-            break;
-    }
-
-    switch (brush_prim.aa_kind) {
-        case AA_KIND_SEGMENT:
-            // TODO: select these correctly based on the segment kind.
-            edge_aa_segment_mask = vec4(1.0);
-            break;
-        case AA_KIND_DEFAULT:
-            edge_aa_segment_mask = vec4(1.0);
-            break;
-    }
+    vec4[2] segment_data = fetch_from_resource_cache_2(segment_address);
+    RectWithSize local_segment_rect = RectWithSize(segment_data[0].xy, segment_data[0].zw);
 
     vec2 device_pos, local_pos;
 
     // Fetch the dynamic picture that we are drawing on.
     PictureTask pic_task = fetch_picture_task(brush.picture_address);
+    ClipArea clip_area = fetch_clip_area(brush.clip_address);
 
-    if (pic_task.rasterization_mode == RASTERIZATION_MODE_LOCAL_SPACE) {
+    if (pic_task.pic_kind_and_raster_mode > 0.0) {
         local_pos = local_segment_rect.p0 + aPosition.xy * local_segment_rect.size;
 
         // Right now - pictures only support local positions. In the future, this
@@ -161,20 +91,26 @@ void main(void) {
         device_pos = pic_task.common_data.task_rect.p0 +
                      uDevicePixelRatio * (local_pos - pic_task.content_origin);
 
+#ifdef WR_FEATURE_ALPHA_PASS
+        write_clip(
+            vec2(0.0),
+            clip_area
+        );
+#endif
+
         // Write the final position transformed by the orthographic device-pixel projection.
         gl_Position = uTransform * vec4(device_pos, 0.0, 1.0);
     } else {
         VertexInfo vi;
-        Layer layer = fetch_layer(brush.clip_node_id, brush.scroll_node_id);
-        ClipArea clip_area = fetch_clip_area(brush.clip_address);
+        ClipScrollNode scroll_node = fetch_clip_scroll_node(brush.scroll_node_id);
 
         // Write the normal vertex information out.
-        if (layer.is_axis_aligned) {
+        if (scroll_node.is_axis_aligned) {
             vi = write_vertex(
                 local_segment_rect,
                 brush_prim.local_clip_rect,
                 float(brush.z),
-                layer,
+                scroll_node,
                 pic_task,
                 brush_prim.local_rect
             );
@@ -189,13 +125,14 @@ void main(void) {
             vLocalBounds = vec4(vec2(-1000000.0), vec2(1000000.0));
 #endif
         } else {
+            bvec4 edge_mask = notEqual(int(segment_data[1].x) & ivec4(1, 2, 4, 8), ivec4(0));
             vi = write_transform_vertex(
                 local_segment_rect,
                 brush_prim.local_rect,
                 brush_prim.local_clip_rect,
-                edge_aa_segment_mask,
+                mix(vec4(0.0), vec4(1.0), edge_mask),
                 float(brush.z),
-                layer,
+                scroll_node,
                 pic_task
             );
         }
@@ -221,7 +158,8 @@ void main(void) {
         brush.prim_address + VECS_PER_BRUSH_PRIM,
         local_pos,
         brush_prim.local_rect,
-        brush.user_data
+        brush.user_data,
+        pic_task
     );
 }
 #endif
diff --git a/gfx/webrender/res/brush_image.glsl b/gfx/webrender/res/brush_image.glsl
index adca94181b34..ca10f3c7cbc3 100644
--- a/gfx/webrender/res/brush_image.glsl
+++ b/gfx/webrender/res/brush_image.glsl
@@ -2,6 +2,8 @@
  * 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/. */
 
+#define VECS_PER_SPECIFIC_BRUSH 0
+
 #include shared,prim_shared,brush
 
 #ifdef WR_FEATURE_ALPHA_PASS
@@ -27,7 +29,8 @@ void brush_vs(
     int prim_address,
     vec2 local_pos,
     RectWithSize local_rect,
-    ivec2 user_data
+    ivec2 user_data,
+    PictureTask pic_task
 ) {
     // TODO(gw): For now, this brush_image shader is only
     //           being used to draw items from the intermediate
diff --git a/gfx/webrender/res/ps_line.glsl b/gfx/webrender/res/brush_line.glsl
similarity index 78%
rename from gfx/webrender/res/ps_line.glsl
rename to gfx/webrender/res/brush_line.glsl
index d583d527854d..523575d72b44 100644
--- a/gfx/webrender/res/ps_line.glsl
+++ b/gfx/webrender/res/brush_line.glsl
@@ -2,17 +2,20 @@
  * 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/. */
 
-#include shared,prim_shared
+#define VECS_PER_SPECIFIC_BRUSH 2
 
-varying vec4 vColor;
+#include shared,prim_shared,brush
+
+varying vec2 vLocalPos;
+
+flat varying vec4 vColor;
 flat varying int vStyle;
 flat varying float vAxisSelect;
 flat varying vec4 vParams;
 flat varying vec2 vLocalOrigin;
 
-varying vec2 vLocalPos;
-
 #ifdef WR_VERTEX_SHADER
+
 #define LINE_ORIENTATION_VERTICAL       0
 #define LINE_ORIENTATION_HORIZONTAL     1
 
@@ -28,22 +31,38 @@ Line fetch_line(int address) {
     return Line(data[0], data[1].x, data[1].y, data[1].z);
 }
 
-void main(void) {
-    Primitive prim = load_primitive();
-    Line line = fetch_line(prim.specific_prim_address);
+void brush_vs(
+    int prim_address,
+    vec2 local_pos,
+    RectWithSize local_rect,
+    ivec2 user_data,
+    PictureTask pic_task
+) {
+    vLocalPos = local_pos;
+
+    Line line = fetch_line(prim_address);
+
+    switch (int(abs(pic_task.pic_kind_and_raster_mode))) {
+        case PIC_TYPE_TEXT_SHADOW:
+            vColor = pic_task.color;
+            break;
+        default:
+            vColor = line.color;
+            break;
+    }
 
     vec2 pos, size;
 
     switch (int(line.orientation)) {
         case LINE_ORIENTATION_HORIZONTAL:
             vAxisSelect = 0.0;
-            pos = prim.local_rect.p0;
-            size = prim.local_rect.size;
+            pos = local_rect.p0;
+            size = local_rect.size;
             break;
         case LINE_ORIENTATION_VERTICAL:
             vAxisSelect = 1.0;
-            pos = prim.local_rect.p0.yx;
-            size = prim.local_rect.size.yx;
+            pos = local_rect.p0.yx;
+            size = local_rect.size.yx;
             break;
     }
 
@@ -89,39 +108,6 @@ void main(void) {
             break;
         }
     }
-
-#ifdef WR_FEATURE_CACHE
-    vec2 device_origin = prim.task.common_data.task_rect.p0 +
-                         uDevicePixelRatio * (prim.local_rect.p0 - prim.task.content_origin);
-    vec2 device_size = uDevicePixelRatio * prim.local_rect.size;
-
-    vec2 device_pos = mix(device_origin,
-                          device_origin + device_size,
-                          aPosition.xy);
-
-    vColor = prim.task.color;
-    vLocalPos = mix(prim.local_rect.p0,
-                    prim.local_rect.p0 + prim.local_rect.size,
-                    aPosition.xy);
-
-    gl_Position = uTransform * vec4(device_pos, 0.0, 1.0);
-#else
-    vColor = line.color;
-
-    #ifdef WR_FEATURE_TRANSFORM
-        VertexInfo vi = write_transform_vertex_primitive(prim);
-    #else
-        VertexInfo vi = write_vertex(prim.local_rect,
-                                     prim.local_clip_rect,
-                                     prim.z,
-                                     prim.layer,
-                                     prim.task,
-                                     prim.local_rect);
-    #endif
-
-    vLocalPos = vi.local_pos;
-    write_clip(vi.screen_pos, prim.clip_area);
-#endif
 }
 #endif
 
@@ -160,22 +146,11 @@ float approx_distance(vec2 p, vec2 b0, vec2 b1, vec2 b2) {
     return length(get_distance_vector(b0 - p, b1 - p, b2 - p));
 }
 
-void main(void) {
-    float alpha = 1.0;
-
-    vec2 local_pos = vLocalPos;
-
-#ifdef WR_FEATURE_CACHE
-#else
-    #ifdef WR_FEATURE_TRANSFORM
-        alpha = init_transform_fs(vLocalPos);
-    #endif
-
-        alpha *= do_clip();
-#endif
-
+vec4 brush_fs() {
     // Find the appropriate distance to apply the step over.
+    vec2 local_pos = vLocalPos;
     float aa_range = compute_aa_range(local_pos);
+    float alpha = 1.0;
 
     // Select the x/y coord, depending on which axis this edge is.
     vec2 pos = mix(local_pos.xy, local_pos.yx, vAxisSelect);
@@ -189,7 +164,7 @@ void main(void) {
             float x = mod(pos.x - vLocalOrigin.x, vParams.x);
 
             // Calculate dash alpha (on/off) based on dash length
-            alpha = min(alpha, step(x, vParams.y));
+            alpha = step(x, vParams.y);
             break;
         }
         case LINE_STYLE_DOTTED: {
@@ -199,7 +174,7 @@ void main(void) {
             // Get the dot alpha
             vec2 dot_relative_pos = vec2(x, pos.y) - vParams.yz;
             float dot_distance = length(dot_relative_pos) - vParams.y;
-            alpha = min(alpha, distance_aa(aa_range, dot_distance));
+            alpha = distance_aa(aa_range, dot_distance);
             // Clip off partial dots
             alpha *= step(pos.x - vLocalOrigin.x, vParams.w);
             break;
@@ -249,6 +224,6 @@ void main(void) {
         }
     }
 
-    oFragColor = vColor * alpha;
+    return vColor * alpha;
 }
 #endif
diff --git a/gfx/webrender/res/brush_mask_corner.glsl b/gfx/webrender/res/brush_mask_corner.glsl
index 85ea442690b9..e418c50b692f 100644
--- a/gfx/webrender/res/brush_mask_corner.glsl
+++ b/gfx/webrender/res/brush_mask_corner.glsl
@@ -2,6 +2,8 @@
  * 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/. */
 
+#define VECS_PER_SPECIFIC_BRUSH 1
+
 #include shared,prim_shared,ellipse,brush
 
 flat varying float vClipMode;
@@ -25,7 +27,8 @@ void brush_vs(
     int prim_address,
     vec2 local_pos,
     RectWithSize local_rect,
-    ivec2 user_data
+    ivec2 user_data,
+    PictureTask pic_task
 ) {
     // Load the specific primitive.
     BrushMaskCornerPrimitive prim = fetch_primitive(prim_address);
diff --git a/gfx/webrender/res/brush_mask_rounded_rect.glsl b/gfx/webrender/res/brush_mask_rounded_rect.glsl
index 327e7d8f23ae..a3e7e002219d 100644
--- a/gfx/webrender/res/brush_mask_rounded_rect.glsl
+++ b/gfx/webrender/res/brush_mask_rounded_rect.glsl
@@ -2,6 +2,8 @@
  * 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/. */
 
+#define VECS_PER_SPECIFIC_BRUSH 4
+
 #include shared,prim_shared,ellipse,brush
 
 flat varying float vClipMode;
@@ -39,7 +41,8 @@ void brush_vs(
     int prim_address,
     vec2 local_pos,
     RectWithSize local_rect,
-    ivec2 user_data
+    ivec2 user_data,
+    PictureTask pic_task
 ) {
     // Load the specific primitive.
     RoundedRectPrimitive prim = fetch_rounded_rect_primitive(prim_address);
diff --git a/gfx/webrender/res/brush_solid.glsl b/gfx/webrender/res/brush_solid.glsl
index 79767072234e..981f238a3e90 100644
--- a/gfx/webrender/res/brush_solid.glsl
+++ b/gfx/webrender/res/brush_solid.glsl
@@ -2,6 +2,8 @@
  * 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/. */
 
+#define VECS_PER_SPECIFIC_BRUSH 1
+
 #include shared,prim_shared,brush
 
 flat varying vec4 vColor;
@@ -25,7 +27,8 @@ void brush_vs(
     int prim_address,
     vec2 local_pos,
     RectWithSize local_rect,
-    ivec2 user_data
+    ivec2 user_data,
+    PictureTask pic_task
 ) {
     SolidBrush prim = fetch_solid_primitive(prim_address);
     vColor = prim.color;
diff --git a/gfx/webrender/res/clip_shared.glsl b/gfx/webrender/res/clip_shared.glsl
index 90da9e7799ea..7da359ffdb2a 100644
--- a/gfx/webrender/res/clip_shared.glsl
+++ b/gfx/webrender/res/clip_shared.glsl
@@ -11,13 +11,13 @@
 #define SEGMENT_CORNER_BR   4
 
 in int aClipRenderTaskAddress;
-in int aClipLayerAddress;
+in int aScrollNodeId;
 in int aClipSegment;
 in ivec4 aClipDataResourceAddress;
 
 struct ClipMaskInstance {
     int render_task_address;
-    int layer_address;
+    int scroll_node_id;
     int segment;
     ivec2 clip_data_address;
     ivec2 resource_address;
@@ -27,7 +27,7 @@ ClipMaskInstance fetch_clip_item() {
     ClipMaskInstance cmi;
 
     cmi.render_task_address = aClipRenderTaskAddress;
-    cmi.layer_address = aClipLayerAddress;
+    cmi.scroll_node_id = aScrollNodeId;
     cmi.segment = aClipSegment;
     cmi.clip_data_address = aClipDataResourceAddress.xy;
     cmi.resource_address = aClipDataResourceAddress.zw;
@@ -49,13 +49,13 @@ RectWithSize intersect_rect(RectWithSize a, RectWithSize b) {
 // The transformed vertex function that always covers the whole clip area,
 // which is the intersection of all clip instances of a given primitive
 ClipVertexInfo write_clip_tile_vertex(RectWithSize local_clip_rect,
-                                      Layer layer,
+                                      ClipScrollNode scroll_node,
                                       ClipArea area) {
     vec2 actual_pos = area.screen_origin + aPosition.xy * area.common_data.task_rect.size;
 
-    vec4 layer_pos = get_layer_pos(actual_pos / uDevicePixelRatio, layer);
+    vec4 node_pos = get_node_pos(actual_pos / uDevicePixelRatio, scroll_node);
 
-    // compute the point position in side the layer, in CSS space
+    // compute the point position inside the scroll node, in CSS space
     vec2 vertex_pos = actual_pos +
                       area.common_data.task_rect.p0 -
                       area.screen_origin;
@@ -64,7 +64,7 @@ ClipVertexInfo write_clip_tile_vertex(RectWithSize local_clip_rect,
 
     vLocalBounds = vec4(local_clip_rect.p0, local_clip_rect.p0 + local_clip_rect.size);
 
-    ClipVertexInfo vi = ClipVertexInfo(layer_pos.xyw, actual_pos, local_clip_rect);
+    ClipVertexInfo vi = ClipVertexInfo(node_pos.xyw, actual_pos, local_clip_rect);
     return vi;
 }
 
diff --git a/gfx/webrender/res/cs_clip_border.glsl b/gfx/webrender/res/cs_clip_border.glsl
index e2b5ae3b2abb..a82708ffa46f 100644
--- a/gfx/webrender/res/cs_clip_border.glsl
+++ b/gfx/webrender/res/cs_clip_border.glsl
@@ -64,7 +64,7 @@ BorderClipDot fetch_border_clip_dot(ivec2 address, int segment) {
 void main(void) {
     ClipMaskInstance cmi = fetch_clip_item();
     ClipArea area = fetch_clip_area(cmi.render_task_address);
-    Layer layer = fetch_layer(cmi.layer_address, cmi.layer_address);
+    ClipScrollNode scroll_node = fetch_clip_scroll_node(cmi.scroll_node_id);
 
     // Fetch the header information for this corner clip.
     BorderCorner corner = fetch_border_corner(cmi.clip_data_address);
@@ -120,7 +120,7 @@ void main(void) {
     vec2 pos = corner.rect.p0 + aPosition.xy * corner.rect.size;
 
     // Transform to world pos
-    vec4 world_pos = layer.transform * vec4(pos, 0.0, 1.0);
+    vec4 world_pos = scroll_node.transform * vec4(pos, 0.0, 1.0);
     world_pos.xyz /= world_pos.w;
 
     // Scale into device pixels.
@@ -132,8 +132,8 @@ void main(void) {
                      area.common_data.task_rect.p0;
 
     // Calculate the local space position for this vertex.
-    vec4 layer_pos = get_layer_pos(world_pos.xy, layer);
-    vPos = layer_pos.xyw;
+    vec4 node_pos = get_node_pos(world_pos.xy, scroll_node);
+    vPos = node_pos.xyw;
 
     gl_Position = uTransform * vec4(final_pos, 0.0, 1.0);
 }
diff --git a/gfx/webrender/res/cs_clip_image.glsl b/gfx/webrender/res/cs_clip_image.glsl
index 009896e17c6a..d8d703f16c1e 100644
--- a/gfx/webrender/res/cs_clip_image.glsl
+++ b/gfx/webrender/res/cs_clip_image.glsl
@@ -24,13 +24,13 @@ ImageMaskData fetch_mask_data(ivec2 address) {
 void main(void) {
     ClipMaskInstance cmi = fetch_clip_item();
     ClipArea area = fetch_clip_area(cmi.render_task_address);
-    Layer layer = fetch_layer(cmi.layer_address, cmi.layer_address);
+    ClipScrollNode scroll_node = fetch_clip_scroll_node(cmi.scroll_node_id);
     ImageMaskData mask = fetch_mask_data(cmi.clip_data_address);
     RectWithSize local_rect = mask.local_rect;
     ImageResource res = fetch_image_resource_direct(cmi.resource_address);
 
     ClipVertexInfo vi = write_clip_tile_vertex(local_rect,
-                                               layer,
+                                               scroll_node,
                                                area);
 
     vPos = vi.local_pos;
diff --git a/gfx/webrender/res/cs_clip_rectangle.glsl b/gfx/webrender/res/cs_clip_rectangle.glsl
index c1a985ce1fb9..2dafddab0f73 100644
--- a/gfx/webrender/res/cs_clip_rectangle.glsl
+++ b/gfx/webrender/res/cs_clip_rectangle.glsl
@@ -58,13 +58,11 @@ ClipData fetch_clip(ivec2 address) {
 void main(void) {
     ClipMaskInstance cmi = fetch_clip_item();
     ClipArea area = fetch_clip_area(cmi.render_task_address);
-    Layer layer = fetch_layer(cmi.layer_address, cmi.layer_address);
+    ClipScrollNode scroll_node = fetch_clip_scroll_node(cmi.scroll_node_id);
     ClipData clip = fetch_clip(cmi.clip_data_address);
     RectWithSize local_rect = clip.rect.rect;
 
-    ClipVertexInfo vi = write_clip_tile_vertex(local_rect,
-                                               layer,
-                                               area);
+    ClipVertexInfo vi = write_clip_tile_vertex(local_rect, scroll_node, area);
     vPos = vi.local_pos;
 
     vClipMode = clip.rect.mode.x;
diff --git a/gfx/webrender/res/prim_shared.glsl b/gfx/webrender/res/prim_shared.glsl
index 153cab776722..14ca38a9330f 100644
--- a/gfx/webrender/res/prim_shared.glsl
+++ b/gfx/webrender/res/prim_shared.glsl
@@ -69,7 +69,8 @@ vec4[2] fetch_from_resource_cache_2(int address) {
 
 #ifdef WR_VERTEX_SHADER
 
-#define VECS_PER_LAYER              7
+#define VECS_PER_CLIP_SCROLL_NODE   5
+#define VECS_PER_LOCAL_CLIP_RECT    1
 #define VECS_PER_RENDER_TASK        3
 #define VECS_PER_PRIM_HEADER        2
 #define VECS_PER_TEXT_RUN           3
@@ -77,6 +78,7 @@ vec4[2] fetch_from_resource_cache_2(int address) {
 #define VECS_PER_GRADIENT_STOP      2
 
 uniform HIGHP_SAMPLER_FLOAT sampler2D sClipScrollNodes;
+uniform HIGHP_SAMPLER_FLOAT sampler2D sLocalClipRects;
 uniform HIGHP_SAMPLER_FLOAT sampler2D sRenderTasks;
 
 // Instanced attributes
@@ -143,9 +145,6 @@ vec4 fetch_from_resource_cache_1(int address) {
 
 struct ClipScrollNode {
     mat4 transform;
-    vec4 local_clip_rect;
-    vec2 reference_frame_relative_scroll_offset;
-    vec2 scroll_offset;
     bool is_axis_aligned;
 };
 
@@ -156,7 +155,7 @@ ClipScrollNode fetch_clip_scroll_node(int index) {
     // This is required because trying to use an offset
     // of more than 8 texels doesn't work on some versions
     // of OSX.
-    ivec2 uv = get_fetch_uv(index, VECS_PER_LAYER);
+    ivec2 uv = get_fetch_uv(index, VECS_PER_CLIP_SCROLL_NODE);
     ivec2 uv0 = ivec2(uv.x + 0, uv.y);
 
     node.transform[0] = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(0, 0));
@@ -164,41 +163,16 @@ ClipScrollNode fetch_clip_scroll_node(int index) {
     node.transform[2] = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(2, 0));
     node.transform[3] = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(3, 0));
 
-    vec4 clip_rect = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(4, 0));
-    node.local_clip_rect = clip_rect;
-
-    vec4 offsets = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(5, 0));
-    node.reference_frame_relative_scroll_offset = offsets.xy;
-    node.scroll_offset = offsets.zw;
-
-    vec4 misc = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(6, 0));
+    vec4 misc = TEXEL_FETCH(sClipScrollNodes, uv0, 0, ivec2(4, 0));
     node.is_axis_aligned = misc.x == 0.0;
 
     return node;
 }
 
-struct Layer {
-    mat4 transform;
-    RectWithSize local_clip_rect;
-    bool is_axis_aligned;
-};
-
-Layer fetch_layer(int clip_node_id, int scroll_node_id) {
-    ClipScrollNode clip_node = fetch_clip_scroll_node(clip_node_id);
-    ClipScrollNode scroll_node = fetch_clip_scroll_node(scroll_node_id);
-
-    Layer layer;
-    layer.transform = scroll_node.transform;
-
-    vec4 local_clip_rect = clip_node.local_clip_rect;
-    local_clip_rect.xy += clip_node.reference_frame_relative_scroll_offset;
-    local_clip_rect.xy -= scroll_node.reference_frame_relative_scroll_offset;
-    local_clip_rect.xy -= scroll_node.scroll_offset;
-
-    layer.local_clip_rect = RectWithSize(local_clip_rect.xy, local_clip_rect.zw);
-    layer.is_axis_aligned = scroll_node.is_axis_aligned;
-
-    return layer;
+RectWithSize fetch_clip_chain_rect(int index) {
+    ivec2 uv = get_fetch_uv(index, VECS_PER_LOCAL_CLIP_RECT);
+    vec4 rect = TEXEL_FETCH(sLocalClipRects, uv, 0, ivec2(0, 0));
+    return RectWithSize(rect.xy, rect.zw);
 }
 
 struct RenderTaskCommonData {
@@ -257,6 +231,10 @@ RenderTaskCommonData fetch_render_task_common_data(int index) {
     return data;
 }
 
+#define PIC_TYPE_IMAGE          1
+#define PIC_TYPE_TEXT_SHADOW    2
+#define PIC_TYPE_BOX_SHADOW     3
+
 /*
  The dynamic picture that this brush exists on. Right now, it
  contains minimal information. In the future, it will describe
@@ -265,7 +243,7 @@ RenderTaskCommonData fetch_render_task_common_data(int index) {
 struct PictureTask {
     RenderTaskCommonData common_data;
     vec2 content_origin;
-    float rasterization_mode;
+    float pic_kind_and_raster_mode;
     vec4 color;
 };
 
@@ -401,7 +379,7 @@ struct PrimitiveInstance {
     int render_task_index;
     int clip_task_index;
     int scroll_node_id;
-    int clip_node_id;
+    int clip_chain_rect_index;
     int z;
     int user_data0;
     int user_data1;
@@ -415,7 +393,7 @@ PrimitiveInstance fetch_prim_instance() {
     pi.specific_prim_address = pi.prim_address + VECS_PER_PRIM_HEADER;
     pi.render_task_index = aData0.y;
     pi.clip_task_index = aData0.z;
-    pi.clip_node_id = aData0.w / 65536;
+    pi.clip_chain_rect_index = aData0.w / 65536;
     pi.scroll_node_id = aData0.w % 65536;
     pi.z = aData1.x;
     pi.user_data0 = aData1.y;
@@ -453,7 +431,7 @@ CompositeInstance fetch_composite_instance() {
 }
 
 struct Primitive {
-    Layer layer;
+    ClipScrollNode scroll_node;
     ClipArea clip_area;
     PictureTask task;
     RectWithSize local_rect;
@@ -481,13 +459,15 @@ Primitive load_primitive() {
 
     Primitive prim;
 
-    prim.layer = fetch_layer(pi.clip_node_id, pi.scroll_node_id);
+    prim.scroll_node = fetch_clip_scroll_node(pi.scroll_node_id);
     prim.clip_area = fetch_clip_area(pi.clip_task_index);
     prim.task = fetch_picture_task(pi.render_task_index);
 
+    RectWithSize clip_chain_rect = fetch_clip_chain_rect(pi.clip_chain_rect_index);
+
     PrimitiveGeometry geom = fetch_primitive_geometry(pi.prim_address);
     prim.local_rect = geom.local_rect;
-    prim.local_clip_rect = geom.local_clip_rect;
+    prim.local_clip_rect = intersect_rects(clip_chain_rect, geom.local_clip_rect);
 
     prim.specific_prim_address = pi.specific_prim_address;
     prim.user_data0 = pi.user_data0;
@@ -515,50 +495,50 @@ bool ray_plane(vec3 normal, vec3 point, vec3 ray_origin, vec3 ray_dir, out float
 
 // Apply the inverse transform "inv_transform"
 // to the reference point "ref" in CSS space,
-// producing a local point on a layer plane,
+// producing a local point on a ClipScrollNode plane,
 // set by a base point "a" and a normal "n".
 vec4 untransform(vec2 ref, vec3 n, vec3 a, mat4 inv_transform) {
     vec3 p = vec3(ref, -10000.0);
     vec3 d = vec3(0, 0, 1.0);
 
     float t = 0.0;
-    // get an intersection of the layer plane with Z axis vector,
+    // get an intersection of the ClipScrollNode plane with Z axis vector,
     // originated from the "ref" point
     ray_plane(n, a, p, d, t);
-    float z = p.z + d.z * t; // Z of the visible point on the layer
+    float z = p.z + d.z * t; // Z of the visible point on the ClipScrollNode
 
     vec4 r = inv_transform * vec4(ref, z, 1.0);
     return r;
 }
 
-// Given a CSS space position, transform it back into the layer space.
-vec4 get_layer_pos(vec2 pos, Layer layer) {
-    // get a point on the layer plane
-    vec4 ah = layer.transform * vec4(0.0, 0.0, 0.0, 1.0);
+// Given a CSS space position, transform it back into the ClipScrollNode space.
+vec4 get_node_pos(vec2 pos, ClipScrollNode node) {
+    // get a point on the scroll node plane
+    vec4 ah = node.transform * vec4(0.0, 0.0, 0.0, 1.0);
     vec3 a = ah.xyz / ah.w;
 
-    // get the normal to the layer plane
-    mat4 inv_transform = inverse(layer.transform);
+    // get the normal to the scroll node plane
+    mat4 inv_transform = inverse(node.transform);
     vec3 n = transpose(mat3(inv_transform)) * vec3(0.0, 0.0, 1.0);
     return untransform(pos, n, a, inv_transform);
 }
 
 // Compute a snapping offset in world space (adjusted to pixel ratio),
-// given local position on the layer and a snap rectangle.
+// given local position on the scroll_node and a snap rectangle.
 vec2 compute_snap_offset(vec2 local_pos,
-                         Layer layer,
+                         ClipScrollNode scroll_node,
                          RectWithSize snap_rect) {
     // Ensure that the snap rect is at *least* one device pixel in size.
     // TODO(gw): It's not clear to me that this is "correct". Specifically,
     //           how should it interact with sub-pixel snap rects when there
-    //           is a layer transform with scale present? But it does fix
+    //           is a scroll_node transform with scale present? But it does fix
     //           the test cases we have in Servo that are failing without it
     //           and seem better than not having this at all.
     snap_rect.size = max(snap_rect.size, vec2(1.0 / uDevicePixelRatio));
 
     // Transform the snap corners to the world space.
-    vec4 world_snap_p0 = layer.transform * vec4(snap_rect.p0, 0.0, 1.0);
-    vec4 world_snap_p1 = layer.transform * vec4(snap_rect.p0 + snap_rect.size, 0.0, 1.0);
+    vec4 world_snap_p0 = scroll_node.transform * vec4(snap_rect.p0, 0.0, 1.0);
+    vec4 world_snap_p1 = scroll_node.transform * vec4(snap_rect.p0 + snap_rect.size, 0.0, 1.0);
     // Snap bounds in world coordinates, adjusted for pixel ratio. XY = top left, ZW = bottom right
     vec4 world_snap = uDevicePixelRatio * vec4(world_snap_p0.xy, world_snap_p1.xy) /
                                           vec4(world_snap_p0.ww, world_snap_p1.ww);
@@ -579,7 +559,7 @@ struct VertexInfo {
 VertexInfo write_vertex(RectWithSize instance_rect,
                         RectWithSize local_clip_rect,
                         float z,
-                        Layer layer,
+                        ClipScrollNode scroll_node,
                         PictureTask task,
                         RectWithSize snap_rect) {
 
@@ -587,13 +567,13 @@ VertexInfo write_vertex(RectWithSize instance_rect,
     vec2 local_pos = instance_rect.p0 + instance_rect.size * aPosition.xy;
 
     // Clamp to the two local clip rects.
-    vec2 clamped_local_pos = clamp_rect(clamp_rect(local_pos, local_clip_rect), layer.local_clip_rect);
+    vec2 clamped_local_pos = clamp_rect(local_pos, local_clip_rect);
 
     /// Compute the snapping offset.
-    vec2 snap_offset = compute_snap_offset(clamped_local_pos, layer, snap_rect);
+    vec2 snap_offset = compute_snap_offset(clamped_local_pos, scroll_node, snap_rect);
 
     // Transform the current vertex to world space.
-    vec4 world_pos = layer.transform * vec4(clamped_local_pos, 0.0, 1.0);
+    vec4 world_pos = scroll_node.transform * vec4(clamped_local_pos, 0.0, 1.0);
 
     // Convert the world positions to device pixel space.
     vec2 device_pos = world_pos.xy / world_pos.w * uDevicePixelRatio;
@@ -633,19 +613,15 @@ VertexInfo write_transform_vertex(RectWithSize local_segment_rect,
                                   RectWithSize local_clip_rect,
                                   vec4 clip_edge_mask,
                                   float z,
-                                  Layer layer,
+                                  ClipScrollNode scroll_node,
                                   PictureTask task) {
-    // Calculate a clip rect from local clip + layer clip.
+    // Calculate a clip rect from local_rect + local clip
     RectWithEndpoint clip_rect = to_rect_with_endpoint(local_clip_rect);
-    clip_rect.p0 = clamp_rect(clip_rect.p0, layer.local_clip_rect);
-    clip_rect.p1 = clamp_rect(clip_rect.p1, layer.local_clip_rect);
-
-    // Calculate a clip rect from local_rect + local clip + layer clip.
     RectWithEndpoint segment_rect = to_rect_with_endpoint(local_segment_rect);
     segment_rect.p0 = clamp(segment_rect.p0, clip_rect.p0, clip_rect.p1);
     segment_rect.p1 = clamp(segment_rect.p1, clip_rect.p0, clip_rect.p1);
 
-    // Calculate a clip rect from local_rect + local clip + layer clip.
+    // Calculate a clip rect from local_rect + local clip
     RectWithEndpoint prim_rect = to_rect_with_endpoint(local_prim_rect);
     prim_rect.p0 = clamp(prim_rect.p0, clip_rect.p0, clip_rect.p1);
     prim_rect.p1 = clamp(prim_rect.p1, clip_rect.p0, clip_rect.p1);
@@ -666,7 +642,7 @@ VertexInfo write_transform_vertex(RectWithSize local_segment_rect,
     vec2 local_pos = local_segment_rect.p0 + local_segment_rect.size * aPosition.xy;
 
     // Transform the current vertex to the world cpace.
-    vec4 world_pos = layer.transform * vec4(local_pos, 0.0, 1.0);
+    vec4 world_pos = scroll_node.transform * vec4(local_pos, 0.0, 1.0);
 
     // Convert the world positions to device pixel space.
     vec2 device_pos = world_pos.xy / world_pos.w * uDevicePixelRatio;
@@ -676,7 +652,7 @@ VertexInfo write_transform_vertex(RectWithSize local_segment_rect,
     // We also want that to apply to any interpolators. However, we
     // want a constant Z across the primitive, since we're using it
     // for draw ordering - so scale by the W coord to ensure this.
-    vec4 final_pos = vec4(world_pos.xy * uDevicePixelRatio + task_offset,
+    vec4 final_pos = vec4((device_pos + task_offset) * world_pos.w,
                           z * world_pos.w,
                           world_pos.w);
     gl_Position = uTransform * final_pos;
@@ -698,7 +674,7 @@ VertexInfo write_transform_vertex_primitive(Primitive prim) {
         prim.local_clip_rect,
         vec4(0.0),
         prim.z,
-        prim.layer,
+        prim.scroll_node,
         prim.task
     );
 }
diff --git a/gfx/webrender/res/ps_angle_gradient.glsl b/gfx/webrender/res/ps_angle_gradient.glsl
index 7056fc5c2b18..81abc6bc4dd0 100644
--- a/gfx/webrender/res/ps_angle_gradient.glsl
+++ b/gfx/webrender/res/ps_angle_gradient.glsl
@@ -23,7 +23,7 @@ void main(void) {
     VertexInfo vi = write_vertex(prim.local_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
 
diff --git a/gfx/webrender/res/ps_border_corner.glsl b/gfx/webrender/res/ps_border_corner.glsl
index 1064543fb9e7..bea4ffcfea88 100644
--- a/gfx/webrender/res/ps_border_corner.glsl
+++ b/gfx/webrender/res/ps_border_corner.glsl
@@ -303,13 +303,13 @@ void main(void) {
                                            prim.local_clip_rect,
                                            vec4(1.0),
                                            prim.z,
-                                           prim.layer,
+                                           prim.scroll_node,
                                            prim.task);
 #else
     VertexInfo vi = write_vertex(segment_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
 #endif
diff --git a/gfx/webrender/res/ps_border_edge.glsl b/gfx/webrender/res/ps_border_edge.glsl
index b7a00872173d..7dc070828515 100644
--- a/gfx/webrender/res/ps_border_edge.glsl
+++ b/gfx/webrender/res/ps_border_edge.glsl
@@ -221,13 +221,13 @@ void main(void) {
                                            prim.local_clip_rect,
                                            vec4(1.0),
                                            prim.z,
-                                           prim.layer,
+                                           prim.scroll_node,
                                            prim.task);
 #else
     VertexInfo vi = write_vertex(segment_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
 #endif
diff --git a/gfx/webrender/res/ps_gradient.glsl b/gfx/webrender/res/ps_gradient.glsl
index 1aec09fc9d1c..390a25058151 100644
--- a/gfx/webrender/res/ps_gradient.glsl
+++ b/gfx/webrender/res/ps_gradient.glsl
@@ -72,7 +72,7 @@ void main(void) {
                                            prim.local_clip_rect,
                                            vec4(1.0),
                                            prim.z,
-                                           prim.layer,
+                                           prim.scroll_node,
                                            prim.task);
     vLocalPos = vi.local_pos;
     vec2 f = (vi.local_pos.xy - prim.local_rect.p0) / prim.local_rect.size;
@@ -80,7 +80,7 @@ void main(void) {
     VertexInfo vi = write_vertex(segment_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
 
diff --git a/gfx/webrender/res/ps_image.glsl b/gfx/webrender/res/ps_image.glsl
index cfff1c3162e3..fe36b9aaf179 100644
--- a/gfx/webrender/res/ps_image.glsl
+++ b/gfx/webrender/res/ps_image.glsl
@@ -34,7 +34,7 @@ void main(void) {
     VertexInfo vi = write_vertex(prim.local_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
     vLocalPos = vi.local_pos - prim.local_rect.p0;
diff --git a/gfx/webrender/res/ps_radial_gradient.glsl b/gfx/webrender/res/ps_radial_gradient.glsl
index f7d65485f542..46483ee5b07d 100644
--- a/gfx/webrender/res/ps_radial_gradient.glsl
+++ b/gfx/webrender/res/ps_radial_gradient.glsl
@@ -25,7 +25,7 @@ void main(void) {
     VertexInfo vi = write_vertex(prim.local_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
 
diff --git a/gfx/webrender/res/ps_text_run.glsl b/gfx/webrender/res/ps_text_run.glsl
index ed58e2c6d4b1..3c0dd9069423 100644
--- a/gfx/webrender/res/ps_text_run.glsl
+++ b/gfx/webrender/res/ps_text_run.glsl
@@ -22,17 +22,18 @@ varying vec4 vUvClip;
 #define MODE_SUBPX_BG_PASS0     4
 #define MODE_SUBPX_BG_PASS1     5
 #define MODE_SUBPX_BG_PASS2     6
-#define MODE_BITMAP             7
-#define MODE_COLOR_BITMAP       8
+#define MODE_SUBPX_DUAL_SOURCE  7
+#define MODE_BITMAP             8
+#define MODE_COLOR_BITMAP       9
 
 VertexInfo write_text_vertex(vec2 clamped_local_pos,
                              RectWithSize local_clip_rect,
                              float z,
-                             Layer layer,
+                             ClipScrollNode scroll_node,
                              PictureTask task,
                              RectWithSize snap_rect) {
     // Transform the current vertex to world space.
-    vec4 world_pos = layer.transform * vec4(clamped_local_pos, 0.0, 1.0);
+    vec4 world_pos = scroll_node.transform * vec4(clamped_local_pos, 0.0, 1.0);
 
     // Convert the world positions to device pixel space.
     vec2 device_pos = world_pos.xy / world_pos.w * uDevicePixelRatio;
@@ -44,12 +45,12 @@ VertexInfo write_text_vertex(vec2 clamped_local_pos,
 
 #ifdef WR_FEATURE_GLYPH_TRANSFORM
     // For transformed subpixels, we just need to align the glyph origin to a device pixel.
-    // Only check the layer transform's translation since the scales and axes match.
-    vec2 world_snap_p0 = snap_rect.p0 + layer.transform[3].xy * uDevicePixelRatio;
+    // Only check the scroll node transform's translation since the scales and axes match.
+    vec2 world_snap_p0 = snap_rect.p0 + scroll_node.transform[3].xy * uDevicePixelRatio;
     final_pos += floor(world_snap_p0 + 0.5) - world_snap_p0;
 #elif !defined(WR_FEATURE_TRANSFORM)
-    // Compute the snapping offset only if the layer transform is axis-aligned.
-    final_pos += compute_snap_offset(clamped_local_pos, layer, snap_rect);
+    // Compute the snapping offset only if the scroll node transform is axis-aligned.
+    final_pos += compute_snap_offset(clamped_local_pos, scroll_node, snap_rect);
 #endif
 
     gl_Position = uTransform * vec4(final_pos, z, 1.0);
@@ -73,7 +74,7 @@ void main(void) {
 
 #ifdef WR_FEATURE_GLYPH_TRANSFORM
     // Transform from local space to glyph space.
-    mat2 transform = mat2(prim.layer.transform) * uDevicePixelRatio;
+    mat2 transform = mat2(prim.scroll_node.transform) * uDevicePixelRatio;
 
     // Compute the glyph rect in glyph space.
     RectWithSize glyph_rect = RectWithSize(res.offset + transform * (text.offset + glyph.offset),
@@ -86,15 +87,12 @@ void main(void) {
     // Select the corner of the glyph's local space rect that we are processing.
     vec2 local_pos = local_rect.p0 + local_rect.size * aPosition.xy;
 
-    // Calculate a combined local clip rect.
-    RectWithSize local_clip_rect = intersect_rects(prim.local_clip_rect, prim.layer.local_clip_rect);
-
     // If the glyph's local rect would fit inside the local clip rect, then select a corner from
     // the device space glyph rect to reduce overdraw of clipped pixels in the fragment shader.
     // Otherwise, fall back to clamping the glyph's local rect to the local clip rect.
-    local_pos = rect_inside_rect(local_rect, local_clip_rect) ?
+    local_pos = rect_inside_rect(local_rect, prim.local_clip_rect) ?
                     inv * (glyph_rect.p0 + glyph_rect.size * aPosition.xy) :
-                    clamp_rect(local_pos, local_clip_rect);
+                    clamp_rect(local_pos, prim.local_clip_rect);
 #else
     // Scale from glyph space to local space.
     float scale = res.scale / uDevicePixelRatio;
@@ -106,14 +104,14 @@ void main(void) {
     // Select the corner of the glyph rect that we are processing.
     vec2 local_pos = glyph_rect.p0 + glyph_rect.size * aPosition.xy;
 
-    // Clamp to the two local clip rects.
-    local_pos = clamp_rect(clamp_rect(local_pos, prim.local_clip_rect), prim.layer.local_clip_rect);
+    // Clamp to the local clip rect.
+    local_pos = clamp_rect(local_pos, prim.local_clip_rect);
 #endif
 
     VertexInfo vi = write_text_vertex(local_pos,
                                       prim.local_clip_rect,
                                       prim.z,
-                                      prim.layer,
+                                      prim.scroll_node,
                                       prim.task,
                                       glyph_rect);
 
@@ -134,6 +132,7 @@ void main(void) {
             break;
         case MODE_SUBPX_PASS1:
         case MODE_SUBPX_BG_PASS2:
+        case MODE_SUBPX_DUAL_SOURCE:
             vMaskSwizzle = vec2(1.0, 0.0);
             vColor = text.color;
             break;
@@ -170,6 +169,12 @@ void main(void) {
     alpha *= float(all(greaterThanEqual(vUvClip, vec4(0.0))));
 #endif
 
+#ifdef WR_FEATURE_DUAL_SOURCE_BLENDING
+    vec4 alpha_mask = mask * alpha;
+    oFragColor = vColor * alpha_mask;
+    oFragBlend = alpha_mask * vColor.a;
+#else
     oFragColor = vColor * mask * alpha;
+#endif
 }
 #endif
diff --git a/gfx/webrender/res/ps_yuv_image.glsl b/gfx/webrender/res/ps_yuv_image.glsl
index a82ea142f6fe..e8a51016e66b 100644
--- a/gfx/webrender/res/ps_yuv_image.glsl
+++ b/gfx/webrender/res/ps_yuv_image.glsl
@@ -43,7 +43,7 @@ void main(void) {
     VertexInfo vi = write_vertex(prim.local_rect,
                                  prim.local_clip_rect,
                                  prim.z,
-                                 prim.layer,
+                                 prim.scroll_node,
                                  prim.task,
                                  prim.local_rect);
     vLocalPos = vi.local_pos - prim.local_rect.p0;
diff --git a/gfx/webrender/res/shared.glsl b/gfx/webrender/res/shared.glsl
index 87d0251fd0ce..16248cc243b2 100644
--- a/gfx/webrender/res/shared.glsl
+++ b/gfx/webrender/res/shared.glsl
@@ -8,6 +8,10 @@
 #extension GL_OES_EGL_image_external_essl3 : require
 #endif
 
+#ifdef WR_FEATURE_DUAL_SOURCE_BLENDING
+#extension GL_ARB_explicit_attrib_location : require
+#endif
+
 #include base
 
 // The textureLod() doesn't support samplerExternalOES for WR_FEATURE_TEXTURE_EXTERNAL.
@@ -46,7 +50,12 @@
     // Uniform inputs
 
     // Fragment shader outputs
-    out vec4 oFragColor;
+    #ifdef WR_FEATURE_DUAL_SOURCE_BLENDING
+        layout(location = 0, index = 0) out vec4 oFragColor;
+        layout(location = 0, index = 1) out vec4 oFragBlend;
+    #else
+        out vec4 oFragColor;
+    #endif
 #endif
 
 //======================================================================================
diff --git a/gfx/webrender/src/batch.rs b/gfx/webrender/src/batch.rs
new file mode 100644
index 000000000000..ef5bdc455d01
--- /dev/null
+++ b/gfx/webrender/src/batch.rs
@@ -0,0 +1,1484 @@
+/* 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/. */
+
+use api::{DeviceIntRect, DeviceIntSize, ImageKey, LayerToWorldScale};
+use api::{ExternalImageType, FilterOp, ImageRendering, LayerRect};
+use api::{SubpixelDirection, TileOffset, YuvColorSpace, YuvFormat};
+use api::{LayerToWorldTransform, WorldPixel};
+use border::{BorderCornerInstance, BorderCornerSide};
+use clip::{ClipSource, ClipStore};
+use clip_scroll_tree::{CoordinateSystemId};
+use euclid::{TypedTransform3D, vec3};
+use glyph_rasterizer::GlyphFormat;
+use gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle};
+use gpu_types::{BrushImageKind, BrushInstance, ClipChainRectIndex};
+use gpu_types::{ClipMaskInstance, ClipScrollNodeIndex, PictureType};
+use gpu_types::{CompositePrimitiveInstance, PrimitiveInstance, SimplePrimitiveInstance};
+use internal_types::{FastHashMap, SourceTexture};
+use picture::{PictureCompositeMode, PictureKind, PicturePrimitive};
+use plane_split::{BspSplitter, Polygon, Splitter};
+use prim_store::{PrimitiveIndex, PrimitiveKind, PrimitiveMetadata, PrimitiveStore};
+use prim_store::{BrushPrimitive, BrushKind, DeferredResolve, PrimitiveRun};
+use render_task::{ClipWorkItem};
+use render_task::{RenderTaskAddress, RenderTaskId, RenderTaskKind};
+use render_task::{RenderTaskTree};
+use renderer::{BlendMode, ImageBufferKind};
+use renderer::BLOCKS_PER_UV_RECT;
+use resource_cache::{GlyphFetchResult, ResourceCache};
+use std::{usize, f32, i32};
+use tiling::{RenderTargetContext, RenderTargetKind};
+use util::{MatrixHelpers, TransformedRectKind};
+
+// Special sentinel value recognized by the shader. It is considered to be
+// a dummy task that doesn't mask out anything.
+const OPAQUE_TASK_ADDRESS: RenderTaskAddress = RenderTaskAddress(i32::MAX as u32);
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+pub enum TransformBatchKind {
+    TextRun(GlyphFormat),
+    Image(ImageBufferKind),
+    YuvImage(ImageBufferKind, YuvFormat, YuvColorSpace),
+    AlignedGradient,
+    AngleGradient,
+    RadialGradient,
+    BorderCorner,
+    BorderEdge,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+pub enum BrushImageSourceKind {
+    Alpha,
+    Color,
+    ColorAlphaMask,
+}
+
+impl BrushImageSourceKind {
+    pub fn from_render_target_kind(render_target_kind: RenderTargetKind) -> BrushImageSourceKind {
+        match render_target_kind {
+            RenderTargetKind::Color => BrushImageSourceKind::Color,
+            RenderTargetKind::Alpha => BrushImageSourceKind::Alpha,
+        }
+    }
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+pub enum BrushBatchKind {
+    Image(BrushImageSourceKind),
+    Solid,
+    Line,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+pub enum BatchKind {
+    Composite {
+        task_id: RenderTaskId,
+        source_id: RenderTaskId,
+        backdrop_id: RenderTaskId,
+    },
+    HardwareComposite,
+    SplitComposite,
+    Blend,
+    Transformable(TransformedRectKind, TransformBatchKind),
+    Brush(BrushBatchKind),
+}
+
+/// Optional textures that can be used as a source in the shaders.
+/// Textures that are not used by the batch are equal to TextureId::invalid().
+#[derive(Copy, Clone, Debug)]
+pub struct BatchTextures {
+    pub colors: [SourceTexture; 3],
+}
+
+impl BatchTextures {
+    pub fn no_texture() -> Self {
+        BatchTextures {
+            colors: [SourceTexture::Invalid; 3],
+        }
+    }
+
+    pub fn render_target_cache() -> Self {
+        BatchTextures {
+            colors: [
+                SourceTexture::CacheRGBA8,
+                SourceTexture::CacheA8,
+                SourceTexture::Invalid,
+            ],
+        }
+    }
+
+    pub fn color(texture: SourceTexture) -> Self {
+        BatchTextures {
+            colors: [texture, SourceTexture::Invalid, SourceTexture::Invalid],
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct AlphaPrimitiveBatch {
+    pub key: BatchKey,
+    pub instances: Vec<PrimitiveInstance>,
+    pub item_rects: Vec<DeviceIntRect>,
+}
+
+impl AlphaPrimitiveBatch {
+    pub fn new(key: BatchKey) -> AlphaPrimitiveBatch {
+        AlphaPrimitiveBatch {
+            key,
+            instances: Vec::new(),
+            item_rects: Vec::new(),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct OpaquePrimitiveBatch {
+    pub key: BatchKey,
+    pub instances: Vec<PrimitiveInstance>,
+}
+
+impl OpaquePrimitiveBatch {
+    pub fn new(key: BatchKey) -> OpaquePrimitiveBatch {
+        OpaquePrimitiveBatch {
+            key,
+            instances: Vec::new(),
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub struct BatchKey {
+    pub kind: BatchKind,
+    pub blend_mode: BlendMode,
+    pub textures: BatchTextures,
+}
+
+impl BatchKey {
+    pub fn new(kind: BatchKind, blend_mode: BlendMode, textures: BatchTextures) -> Self {
+        BatchKey {
+            kind,
+            blend_mode,
+            textures,
+        }
+    }
+
+    pub fn is_compatible_with(&self, other: &BatchKey) -> bool {
+        self.kind == other.kind && self.blend_mode == other.blend_mode &&
+            textures_compatible(self.textures.colors[0], other.textures.colors[0]) &&
+            textures_compatible(self.textures.colors[1], other.textures.colors[1]) &&
+            textures_compatible(self.textures.colors[2], other.textures.colors[2])
+    }
+}
+
+#[inline]
+fn textures_compatible(t1: SourceTexture, t2: SourceTexture) -> bool {
+    t1 == SourceTexture::Invalid || t2 == SourceTexture::Invalid || t1 == t2
+}
+
+pub struct AlphaBatchList {
+    pub batches: Vec<AlphaPrimitiveBatch>,
+}
+
+impl AlphaBatchList {
+    fn new() -> Self {
+        AlphaBatchList {
+            batches: Vec::new(),
+        }
+    }
+
+    pub fn get_suitable_batch(
+        &mut self,
+        key: BatchKey,
+        item_bounding_rect: &DeviceIntRect,
+    ) -> &mut Vec<PrimitiveInstance> {
+        let mut selected_batch_index = None;
+
+        match (key.kind, key.blend_mode) {
+            (BatchKind::Composite { .. }, _) => {
+                // Composites always get added to their own batch.
+                // This is because the result of a composite can affect
+                // the input to the next composite. Perhaps we can
+                // optimize this in the future.
+            }
+            (BatchKind::Transformable(_, TransformBatchKind::TextRun(_)), BlendMode::SubpixelWithBgColor) |
+            (BatchKind::Transformable(_, TransformBatchKind::TextRun(_)), BlendMode::SubpixelVariableTextColor) => {
+                'outer_text: for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
+                    // Subpixel text is drawn in two passes. Because of this, we need
+                    // to check for overlaps with every batch (which is a bit different
+                    // than the normal batching below).
+                    for item_rect in &batch.item_rects {
+                        if item_rect.intersects(item_bounding_rect) {
+                            break 'outer_text;
+                        }
+                    }
+
+                    if batch.key.is_compatible_with(&key) {
+                        selected_batch_index = Some(batch_index);
+                        break;
+                    }
+                }
+            }
+            _ => {
+                'outer_default: for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
+                    // For normal batches, we only need to check for overlaps for batches
+                    // other than the first batch we consider. If the first batch
+                    // is compatible, then we know there isn't any potential overlap
+                    // issues to worry about.
+                    if batch.key.is_compatible_with(&key) {
+                        selected_batch_index = Some(batch_index);
+                        break;
+                    }
+
+                    // check for intersections
+                    for item_rect in &batch.item_rects {
+                        if item_rect.intersects(item_bounding_rect) {
+                            break 'outer_default;
+                        }
+                    }
+                }
+            }
+        }
+
+        if selected_batch_index.is_none() {
+            let new_batch = AlphaPrimitiveBatch::new(key);
+            selected_batch_index = Some(self.batches.len());
+            self.batches.push(new_batch);
+        }
+
+        let batch = &mut self.batches[selected_batch_index.unwrap()];
+        batch.item_rects.push(*item_bounding_rect);
+
+        &mut batch.instances
+    }
+}
+
+pub struct OpaqueBatchList {
+    pub pixel_area_threshold_for_new_batch: i32,
+    pub batches: Vec<OpaquePrimitiveBatch>,
+}
+
+impl OpaqueBatchList {
+    fn new(pixel_area_threshold_for_new_batch: i32) -> Self {
+        OpaqueBatchList {
+            batches: Vec::new(),
+            pixel_area_threshold_for_new_batch,
+        }
+    }
+
+    pub fn get_suitable_batch(
+        &mut self,
+        key: BatchKey,
+        item_bounding_rect: &DeviceIntRect
+    ) -> &mut Vec<PrimitiveInstance> {
+        let mut selected_batch_index = None;
+        let item_area = item_bounding_rect.size.area();
+
+        // If the area of this primitive is larger than the given threshold,
+        // then it is large enough to warrant breaking a batch for. In this
+        // case we just see if it can be added to the existing batch or
+        // create a new one.
+        if item_area > self.pixel_area_threshold_for_new_batch {
+            if let Some(ref batch) = self.batches.last() {
+                if batch.key.is_compatible_with(&key) {
+                    selected_batch_index = Some(self.batches.len() - 1);
+                }
+            }
+        } else {
+            // Otherwise, look back through a reasonable number of batches.
+            for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
+                if batch.key.is_compatible_with(&key) {
+                    selected_batch_index = Some(batch_index);
+                    break;
+                }
+            }
+        }
+
+        if selected_batch_index.is_none() {
+            let new_batch = OpaquePrimitiveBatch::new(key);
+            selected_batch_index = Some(self.batches.len());
+            self.batches.push(new_batch);
+        }
+
+        let batch = &mut self.batches[selected_batch_index.unwrap()];
+
+        &mut batch.instances
+    }
+
+    fn finalize(&mut self) {
+        // Reverse the instance arrays in the opaque batches
+        // to get maximum z-buffer efficiency by drawing
+        // front-to-back.
+        // TODO(gw): Maybe we can change the batch code to
+        //           build these in reverse and avoid having
+        //           to reverse the instance array here.
+        for batch in &mut self.batches {
+            batch.instances.reverse();
+        }
+    }
+}
+
+pub struct BatchList {
+    pub alpha_batch_list: AlphaBatchList,
+    pub opaque_batch_list: OpaqueBatchList,
+}
+
+impl BatchList {
+    pub fn new(screen_size: DeviceIntSize) -> Self {
+        // The threshold for creating a new batch is
+        // one quarter the screen size.
+        let batch_area_threshold = screen_size.width * screen_size.height / 4;
+
+        BatchList {
+            alpha_batch_list: AlphaBatchList::new(),
+            opaque_batch_list: OpaqueBatchList::new(batch_area_threshold),
+        }
+    }
+
+    pub fn get_suitable_batch(
+        &mut self,
+        key: BatchKey,
+        item_bounding_rect: &DeviceIntRect,
+    ) -> &mut Vec<PrimitiveInstance> {
+        match key.blend_mode {
+            BlendMode::None => {
+                self.opaque_batch_list
+                    .get_suitable_batch(key, item_bounding_rect)
+            }
+            BlendMode::PremultipliedAlpha |
+            BlendMode::PremultipliedDestOut |
+            BlendMode::SubpixelConstantTextColor(..) |
+            BlendMode::SubpixelVariableTextColor |
+            BlendMode::SubpixelWithBgColor |
+            BlendMode::SubpixelDualSource => {
+                self.alpha_batch_list
+                    .get_suitable_batch(key, item_bounding_rect)
+            }
+        }
+    }
+
+    fn finalize(&mut self) {
+        self.opaque_batch_list.finalize()
+    }
+}
+
+/// Encapsulates the logic of building batches for items that are blended.
+pub struct AlphaBatcher {
+    pub batch_list: BatchList,
+    pub text_run_cache_prims: FastHashMap<SourceTexture, Vec<PrimitiveInstance>>,
+    pub line_cache_prims: Vec<PrimitiveInstance>,
+    glyph_fetch_buffer: Vec<GlyphFetchResult>,
+}
+
+impl AlphaBatcher {
+    pub fn new(screen_size: DeviceIntSize) -> Self {
+        AlphaBatcher {
+            batch_list: BatchList::new(screen_size),
+            glyph_fetch_buffer: Vec::new(),
+            text_run_cache_prims: FastHashMap::default(),
+            line_cache_prims: Vec::new(),
+        }
+    }
+
+    pub fn build(
+        &mut self,
+        tasks: &[RenderTaskId],
+        ctx: &RenderTargetContext,
+        gpu_cache: &mut GpuCache,
+        render_tasks: &RenderTaskTree,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+    ) {
+        for &task_id in tasks {
+            match render_tasks[task_id].kind {
+                RenderTaskKind::Picture(ref pic_task) => {
+                    let pic_index = ctx.prim_store.cpu_metadata[pic_task.prim_index.0].cpu_prim_index;
+                    let pic = &ctx.prim_store.cpu_pictures[pic_index.0];
+                    self.add_pic_to_batch(
+                        pic,
+                        task_id,
+                        ctx,
+                        gpu_cache,
+                        render_tasks,
+                        deferred_resolves,
+                    );
+                }
+                _ => {
+                    unreachable!();
+                }
+            }
+        }
+
+        self.batch_list.finalize();
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.batch_list.opaque_batch_list.batches.is_empty() &&
+            self.batch_list.alpha_batch_list.batches.is_empty()
+    }
+
+    fn add_pic_to_batch(
+        &mut self,
+        pic: &PicturePrimitive,
+        task_id: RenderTaskId,
+        ctx: &RenderTargetContext,
+        gpu_cache: &mut GpuCache,
+        render_tasks: &RenderTaskTree,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+    ) {
+        let task_address = render_tasks.get_task_address(task_id);
+
+        // Even though most of the time a splitter isn't used or needed,
+        // they are cheap to construct so we will always pass one down.
+        let mut splitter = BspSplitter::new();
+
+        // Add each run in this picture to the batch.
+        for run in &pic.runs {
+            let scroll_node = &ctx.clip_scroll_tree.nodes[&run.clip_and_scroll.scroll_node_id];
+            let scroll_id = scroll_node.node_data_index;
+            self.add_run_to_batch(
+                run,
+                scroll_id,
+                ctx,
+                gpu_cache,
+                render_tasks,
+                task_id,
+                task_address,
+                deferred_resolves,
+                &mut splitter,
+                pic.picture_type(),
+            );
+        }
+
+        // Flush the accumulated plane splits onto the task tree.
+        // Z axis is directed at the screen, `sort` is ascending, and we need back-to-front order.
+        for poly in splitter.sort(vec3(0.0, 0.0, 1.0)) {
+            let prim_index = PrimitiveIndex(poly.anchor);
+            debug!("process sorted poly {:?} {:?}", prim_index, poly.points);
+            let pp = &poly.points;
+            let gpu_blocks = [
+                [pp[0].x as f32, pp[0].y as f32, pp[0].z as f32, pp[1].x as f32].into(),
+                [pp[1].y as f32, pp[1].z as f32, pp[2].x as f32, pp[2].y as f32].into(),
+                [pp[2].z as f32, pp[3].x as f32, pp[3].y as f32, pp[3].z as f32].into(),
+            ];
+            let gpu_handle = gpu_cache.push_per_frame_blocks(&gpu_blocks);
+            let key = BatchKey::new(
+                BatchKind::SplitComposite,
+                BlendMode::PremultipliedAlpha,
+                BatchTextures::no_texture(),
+            );
+            let pic_metadata = &ctx.prim_store.cpu_metadata[prim_index.0];
+            let pic = &ctx.prim_store.cpu_pictures[pic_metadata.cpu_prim_index.0];
+            let batch = self.batch_list.get_suitable_batch(key, pic_metadata.screen_rect.as_ref().expect("bug"));
+            let source_task_address = render_tasks.get_task_address(pic.render_task_id.expect("bug"));
+            let gpu_address = gpu_handle.as_int(gpu_cache);
+
+            let instance = CompositePrimitiveInstance::new(
+                task_address,
+                source_task_address,
+                RenderTaskAddress(0),
+                gpu_address,
+                0,
+                prim_index.0 as i32,
+                0,
+                0,
+            );
+
+            batch.push(PrimitiveInstance::from(instance));
+        }
+    }
+
+    // Helper to add an entire primitive run to a batch list.
+    // TODO(gw): Restructure this so the param list isn't quite
+    //           so daunting!
+    fn add_run_to_batch(
+        &mut self,
+        run: &PrimitiveRun,
+        scroll_id: ClipScrollNodeIndex,
+        ctx: &RenderTargetContext,
+        gpu_cache: &mut GpuCache,
+        render_tasks: &RenderTaskTree,
+        task_id: RenderTaskId,
+        task_address: RenderTaskAddress,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+        splitter: &mut BspSplitter<f64, WorldPixel>,
+        pic_type: PictureType,
+    ) {
+        for i in 0 .. run.count {
+            let prim_index = PrimitiveIndex(run.base_prim_index.0 + i);
+
+            let metadata = &ctx.prim_store.cpu_metadata[prim_index.0];
+
+            // Now that we walk the primitive runs in order to add
+            // items to batches, we need to check if they are
+            // visible here.
+            // We currently only support culling on normal (Image)
+            // picture types.
+            // TODO(gw): Support culling on shadow image types.
+            if pic_type != PictureType::Image || metadata.screen_rect.is_some() {
+                self.add_prim_to_batch(
+                    metadata.clip_chain_rect_index,
+                    scroll_id,
+                    prim_index,
+                    ctx,
+                    gpu_cache,
+                    render_tasks,
+                    task_id,
+                    task_address,
+                    deferred_resolves,
+                    splitter,
+                    pic_type,
+                );
+            }
+        }
+    }
+
+    // Adds a primitive to a batch.
+    // It can recursively call itself in some situations, for
+    // example if it encounters a picture where the items
+    // in that picture are being drawn into the same target.
+    fn add_prim_to_batch(
+        &mut self,
+        clip_chain_rect_index: ClipChainRectIndex,
+        scroll_id: ClipScrollNodeIndex,
+        prim_index: PrimitiveIndex,
+        ctx: &RenderTargetContext,
+        gpu_cache: &mut GpuCache,
+        render_tasks: &RenderTaskTree,
+        task_id: RenderTaskId,
+        task_address: RenderTaskAddress,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+        splitter: &mut BspSplitter<f64, WorldPixel>,
+        pic_type: PictureType,
+    ) {
+        let z = prim_index.0 as i32;
+        let prim_metadata = ctx.prim_store.get_metadata(prim_index);
+        let scroll_node = &ctx.node_data[scroll_id.0 as usize];
+        // TODO(gw): Calculating this for every primitive is a bit
+        //           wasteful. We should probably cache this in
+        //           the scroll node...
+        let transform_kind = scroll_node.transform.transform_kind();
+        let item_bounding_rect = &match prim_metadata.screen_rect {
+            Some(screen_rect) => screen_rect,
+            None => {
+                debug_assert_ne!(pic_type, PictureType::Image);
+                DeviceIntRect::zero()
+            }
+        };
+        let prim_cache_address = gpu_cache.get_address(&prim_metadata.gpu_location);
+        let no_textures = BatchTextures::no_texture();
+        let clip_task_address = prim_metadata
+            .clip_task_id
+            .map_or(OPAQUE_TASK_ADDRESS, |id| render_tasks.get_task_address(id));
+        let base_instance = SimplePrimitiveInstance::new(
+            prim_cache_address,
+            task_address,
+            clip_task_address,
+            clip_chain_rect_index,
+            scroll_id,
+            z,
+        );
+
+        let blend_mode = ctx.prim_store.get_blend_mode(prim_metadata, transform_kind);
+
+        match prim_metadata.prim_kind {
+            PrimitiveKind::Brush => {
+                let brush = &ctx.prim_store.cpu_brushes[prim_metadata.cpu_prim_index.0];
+                let base_instance = BrushInstance {
+                    picture_address: task_address,
+                    prim_address: prim_cache_address,
+                    clip_chain_rect_index,
+                    scroll_id,
+                    clip_task_address,
+                    z,
+                    segment_index: 0,
+                    user_data0: 0,
+                    user_data1: 0,
+                };
+
+                match brush.segment_desc {
+                    Some(ref segment_desc) => {
+                        let opaque_batch = self.batch_list.opaque_batch_list.get_suitable_batch(
+                            brush.get_batch_key(
+                                BlendMode::None
+                            ),
+                            item_bounding_rect
+                        );
+                        let alpha_batch = self.batch_list.alpha_batch_list.get_suitable_batch(
+                            brush.get_batch_key(
+                                BlendMode::PremultipliedAlpha
+                            ),
+                            item_bounding_rect
+                        );
+
+                        for (i, segment) in segment_desc.segments.iter().enumerate() {
+                            let is_inner = segment.edge_flags.is_empty();
+                            let needs_blending = !prim_metadata.opacity.is_opaque ||
+                                                 segment.clip_task_id.is_some() ||
+                                                 (!is_inner && transform_kind == TransformedRectKind::Complex);
+
+                            let clip_task_address = segment
+                                .clip_task_id
+                                .map_or(OPAQUE_TASK_ADDRESS, |id| render_tasks.get_task_address(id));
+
+                            let instance = PrimitiveInstance::from(BrushInstance {
+                                segment_index: i as i32,
+                                clip_task_address,
+                                ..base_instance
+                            });
+
+                            if needs_blending {
+                                alpha_batch.push(instance);
+                            } else {
+                                opaque_batch.push(instance);
+                            }
+                        }
+                    }
+                    None => {
+                        let batch = self.batch_list.get_suitable_batch(brush.get_batch_key(blend_mode), item_bounding_rect);
+                        batch.push(PrimitiveInstance::from(base_instance));
+                    }
+                }
+            }
+            PrimitiveKind::Border => {
+                let border_cpu =
+                    &ctx.prim_store.cpu_borders[prim_metadata.cpu_prim_index.0];
+                // TODO(gw): Select correct blend mode for edges and corners!!
+                let corner_kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::BorderCorner,
+                );
+                let corner_key = BatchKey::new(corner_kind, blend_mode, no_textures);
+                let edge_kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::BorderEdge,
+                );
+                let edge_key = BatchKey::new(edge_kind, blend_mode, no_textures);
+
+                // Work around borrow ck on borrowing batch_list twice.
+                {
+                    let batch =
+                        self.batch_list.get_suitable_batch(corner_key, item_bounding_rect);
+                    for (i, instance_kind) in border_cpu.corner_instances.iter().enumerate()
+                    {
+                        let sub_index = i as i32;
+                        match *instance_kind {
+                            BorderCornerInstance::None => {}
+                            BorderCornerInstance::Single => {
+                                batch.push(base_instance.build(
+                                    sub_index,
+                                    BorderCornerSide::Both as i32,
+                                    0,
+                                ));
+                            }
+                            BorderCornerInstance::Double => {
+                                batch.push(base_instance.build(
+                                    sub_index,
+                                    BorderCornerSide::First as i32,
+                                    0,
+                                ));
+                                batch.push(base_instance.build(
+                                    sub_index,
+                                    BorderCornerSide::Second as i32,
+                                    0,
+                                ));
+                            }
+                        }
+                    }
+                }
+
+                let batch = self.batch_list.get_suitable_batch(edge_key, item_bounding_rect);
+                for border_segment in 0 .. 4 {
+                    batch.push(base_instance.build(border_segment, 0, 0));
+                }
+            }
+            PrimitiveKind::Line => {
+                let base_instance = BrushInstance {
+                    picture_address: task_address,
+                    prim_address: prim_cache_address,
+                    clip_chain_rect_index,
+                    scroll_id,
+                    clip_task_address,
+                    z,
+                    segment_index: 0,
+                    user_data0: 0,
+                    user_data1: 0,
+                };
+
+                let instance = PrimitiveInstance::from(base_instance);
+
+                match pic_type {
+                    PictureType::TextShadow => {
+                        self.line_cache_prims.push(instance);
+                    }
+                    PictureType::Image => {
+                        let kind =
+                            BatchKind::Brush(BrushBatchKind::Line);
+                        let key = BatchKey::new(kind, blend_mode, no_textures);
+                        let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                        batch.push(instance);
+                    }
+                    PictureType::BoxShadow => unreachable!(),
+                }
+            }
+            PrimitiveKind::Image => {
+                let image_cpu = &ctx.prim_store.cpu_images[prim_metadata.cpu_prim_index.0];
+
+                let (color_texture_id, uv_address) = resolve_image(
+                    image_cpu.image_key,
+                    image_cpu.image_rendering,
+                    image_cpu.tile_offset,
+                    ctx.resource_cache,
+                    gpu_cache,
+                    deferred_resolves,
+                );
+
+                if color_texture_id == SourceTexture::Invalid {
+                    warn!("Warnings: skip a PrimitiveKind::Image at {:?}.\n", item_bounding_rect);
+                    return;
+                }
+
+                let batch_kind = match color_texture_id {
+                    SourceTexture::External(ext_image) => {
+                        match ext_image.image_type {
+                            ExternalImageType::Texture2DHandle => {
+                                TransformBatchKind::Image(ImageBufferKind::Texture2D)
+                            }
+                            ExternalImageType::Texture2DArrayHandle => {
+                                TransformBatchKind::Image(ImageBufferKind::Texture2DArray)
+                            }
+                            ExternalImageType::TextureRectHandle => {
+                                TransformBatchKind::Image(ImageBufferKind::TextureRect)
+                            }
+                            ExternalImageType::TextureExternalHandle => {
+                                TransformBatchKind::Image(ImageBufferKind::TextureExternal)
+                            }
+                            ExternalImageType::ExternalBuffer => {
+                                // The ExternalImageType::ExternalBuffer should be handled by resource_cache.
+                                // It should go through the non-external case.
+                                panic!(
+                                    "Non-texture handle type should be handled in other way"
+                                );
+                            }
+                        }
+                    }
+                    _ => TransformBatchKind::Image(ImageBufferKind::Texture2DArray),
+                };
+
+                let textures = BatchTextures {
+                    colors: [
+                        color_texture_id,
+                        SourceTexture::Invalid,
+                        SourceTexture::Invalid,
+                    ],
+                };
+
+                let key = BatchKey::new(
+                    BatchKind::Transformable(transform_kind, batch_kind),
+                    blend_mode,
+                    textures,
+                );
+                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                batch.push(base_instance.build(uv_address.as_int(gpu_cache), 0, 0));
+            }
+            PrimitiveKind::TextRun => {
+                let text_cpu =
+                    &ctx.prim_store.cpu_text_runs[prim_metadata.cpu_prim_index.0];
+                let is_shadow = pic_type == PictureType::TextShadow;
+
+                // TODO(gw): It probably makes sense to base this decision on the content
+                //           origin field in the future (once that's configurable).
+                let font_transform = if is_shadow {
+                    None
+                } else {
+                    Some(&scroll_node.transform)
+                };
+
+                let font = text_cpu.get_font(
+                    ctx.device_pixel_scale,
+                    font_transform,
+                );
+
+                let glyph_fetch_buffer = &mut self.glyph_fetch_buffer;
+                let batch_list = &mut self.batch_list;
+                let text_run_cache_prims = &mut self.text_run_cache_prims;
+
+                ctx.resource_cache.fetch_glyphs(
+                    font,
+                    &text_cpu.glyph_keys,
+                    glyph_fetch_buffer,
+                    gpu_cache,
+                    |texture_id, mut glyph_format, glyphs| {
+                        debug_assert_ne!(texture_id, SourceTexture::Invalid);
+
+                        // Ignore color and only sample alpha when shadowing.
+                        if text_cpu.is_shadow() {
+                            glyph_format = glyph_format.ignore_color();
+                        }
+
+                        let subpx_dir = match glyph_format {
+                            GlyphFormat::Bitmap |
+                            GlyphFormat::ColorBitmap => SubpixelDirection::None,
+                            _ => text_cpu.font.subpx_dir.limit_by(text_cpu.font.render_mode),
+                        };
+
+                        let batch = if is_shadow {
+                            text_run_cache_prims
+                                .entry(texture_id)
+                                .or_insert(Vec::new())
+                        } else {
+                            let textures = BatchTextures {
+                                colors: [
+                                    texture_id,
+                                    SourceTexture::Invalid,
+                                    SourceTexture::Invalid,
+                                ],
+                            };
+
+                            let kind = BatchKind::Transformable(
+                                transform_kind,
+                                TransformBatchKind::TextRun(glyph_format),
+                            );
+
+                            let blend_mode = match glyph_format {
+                                GlyphFormat::Subpixel |
+                                GlyphFormat::TransformedSubpixel => {
+                                    if text_cpu.font.bg_color.a != 0 {
+                                        BlendMode::SubpixelWithBgColor
+                                    } else if ctx.use_dual_source_blending {
+                                        BlendMode::SubpixelDualSource
+                                    } else {
+                                        BlendMode::SubpixelConstantTextColor(text_cpu.font.color.into())
+                                    }
+                                }
+                                GlyphFormat::Alpha |
+                                GlyphFormat::TransformedAlpha |
+                                GlyphFormat::Bitmap |
+                                GlyphFormat::ColorBitmap => BlendMode::PremultipliedAlpha,
+                            };
+
+                            let key = BatchKey::new(kind, blend_mode, textures);
+                            batch_list.get_suitable_batch(key, item_bounding_rect)
+                        };
+
+                        for glyph in glyphs {
+                            batch.push(base_instance.build(
+                                glyph.index_in_text_run,
+                                glyph.uv_rect_address.as_int(),
+                                subpx_dir as u32 as i32,
+                            ));
+                        }
+                    },
+                );
+            }
+            PrimitiveKind::Picture => {
+                let picture =
+                    &ctx.prim_store.cpu_pictures[prim_metadata.cpu_prim_index.0];
+
+                match picture.render_task_id {
+                    Some(cache_task_id) => {
+                        let cache_task_address = render_tasks.get_task_address(cache_task_id);
+                        let textures = BatchTextures::render_target_cache();
+
+                        match picture.kind {
+                            PictureKind::TextShadow { .. } => {
+                                let kind = BatchKind::Brush(
+                                    BrushBatchKind::Image(
+                                        BrushImageSourceKind::from_render_target_kind(picture.target_kind())),
+                                );
+                                let key = BatchKey::new(kind, blend_mode, textures);
+                                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+
+                                let instance = BrushInstance {
+                                    picture_address: task_address,
+                                    prim_address: prim_cache_address,
+                                    clip_chain_rect_index,
+                                    scroll_id,
+                                    clip_task_address,
+                                    z,
+                                    segment_index: 0,
+                                    user_data0: cache_task_address.0 as i32,
+                                    user_data1: BrushImageKind::Simple as i32,
+                                };
+                                batch.push(PrimitiveInstance::from(instance));
+                            }
+                            PictureKind::BoxShadow { image_kind, .. } => {
+                                let kind = BatchKind::Brush(
+                                    BrushBatchKind::Image(
+                                        BrushImageSourceKind::from_render_target_kind(picture.target_kind())),
+                                );
+                                let key = BatchKey::new(kind, blend_mode, textures);
+                                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+
+                                let instance = BrushInstance {
+                                    picture_address: task_address,
+                                    prim_address: prim_cache_address,
+                                    clip_chain_rect_index,
+                                    scroll_id,
+                                    clip_task_address,
+                                    z,
+                                    segment_index: 0,
+                                    user_data0: cache_task_address.0 as i32,
+                                    user_data1: image_kind as i32,
+                                };
+                                batch.push(PrimitiveInstance::from(instance));
+                            }
+                            PictureKind::Image {
+                                composite_mode,
+                                secondary_render_task_id,
+                                is_in_3d_context,
+                                reference_frame_id,
+                                real_local_rect,
+                                ..
+                            } => {
+                                // If this picture is participating in a 3D rendering context,
+                                // then don't add it to any batches here. Instead, create a polygon
+                                // for it and add it to the current plane splitter.
+                                if is_in_3d_context {
+                                    // Push into parent plane splitter.
+
+                                    let real_xf = &ctx.clip_scroll_tree.nodes[&reference_frame_id].world_content_transform;
+
+                                    let polygon = make_polygon(
+                                        real_local_rect,
+                                        &real_xf,
+                                        prim_index.0,
+                                    );
+
+                                    splitter.add(polygon);
+
+                                    return;
+                                }
+
+                                // Depending on the composite mode of the picture, we generate the
+                                // old style Composite primitive instances. In the future, we'll
+                                // remove these and pass them through the brush batching pipeline.
+                                // This will allow us to unify some of the shaders, apply clip masks
+                                // when compositing pictures, and also correctly apply pixel snapping
+                                // to picture compositing operations.
+                                let source_id = picture.render_task_id.expect("no source!?");
+
+                                match composite_mode.expect("bug: only composites here") {
+                                    PictureCompositeMode::Filter(filter) => {
+                                        match filter {
+                                            FilterOp::Blur(..) => {
+                                                let src_task_address = render_tasks.get_task_address(source_id);
+                                                let key = BatchKey::new(
+                                                    BatchKind::HardwareComposite,
+                                                    BlendMode::PremultipliedAlpha,
+                                                    BatchTextures::render_target_cache(),
+                                                );
+                                                let batch = self.batch_list.get_suitable_batch(key, &item_bounding_rect);
+                                                let instance = CompositePrimitiveInstance::new(
+                                                    task_address,
+                                                    src_task_address,
+                                                    RenderTaskAddress(0),
+                                                    item_bounding_rect.origin.x,
+                                                    item_bounding_rect.origin.y,
+                                                    z,
+                                                    item_bounding_rect.size.width,
+                                                    item_bounding_rect.size.height,
+                                                );
+
+                                                batch.push(PrimitiveInstance::from(instance));
+                                            }
+                                            FilterOp::DropShadow(offset, _, _) => {
+                                                let kind = BatchKind::Brush(
+                                                    BrushBatchKind::Image(BrushImageSourceKind::ColorAlphaMask),
+                                                );
+                                                let key = BatchKey::new(kind, blend_mode, textures);
+
+                                                let instance = BrushInstance {
+                                                    picture_address: task_address,
+                                                    prim_address: prim_cache_address,
+                                                    clip_chain_rect_index,
+                                                    scroll_id,
+                                                    clip_task_address,
+                                                    z,
+                                                    segment_index: 0,
+                                                    user_data0: cache_task_address.0 as i32,
+                                                    user_data1: BrushImageKind::Simple as i32,
+                                                };
+
+                                                {
+                                                    let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                                                    batch.push(PrimitiveInstance::from(instance));
+                                                }
+
+                                                let secondary_id = secondary_render_task_id.expect("no secondary!?");
+                                                let render_task = &render_tasks[secondary_id];
+                                                let secondary_task_address = render_tasks.get_task_address(secondary_id);
+                                                let render_pass_index = render_task.pass_index.expect("no render_pass_index!?");
+                                                let secondary_textures = BatchTextures {
+                                                    colors: [
+                                                        SourceTexture::RenderTaskCacheRGBA8(render_pass_index),
+                                                        SourceTexture::Invalid,
+                                                        SourceTexture::Invalid,
+                                                    ],
+                                                };
+                                                let key = BatchKey::new(
+                                                    BatchKind::HardwareComposite,
+                                                    BlendMode::PremultipliedAlpha,
+                                                    secondary_textures,
+                                                );
+                                                let batch = self.batch_list.get_suitable_batch(key, &item_bounding_rect);
+                                                let device_offset = (offset * LayerToWorldScale::new(1.0) * ctx.device_pixel_scale).round().to_i32();
+                                                let instance = CompositePrimitiveInstance::new(
+                                                    task_address,
+                                                    secondary_task_address,
+                                                    RenderTaskAddress(0),
+                                                    item_bounding_rect.origin.x - device_offset.x,
+                                                    item_bounding_rect.origin.y - device_offset.y,
+                                                    z,
+                                                    item_bounding_rect.size.width,
+                                                    item_bounding_rect.size.height,
+                                                );
+
+                                                batch.push(PrimitiveInstance::from(instance));
+                                            }
+                                            _ => {
+                                                let key = BatchKey::new(
+                                                    BatchKind::Blend,
+                                                    BlendMode::PremultipliedAlpha,
+                                                    BatchTextures::no_texture(),
+                                                );
+                                                let src_task_address = render_tasks.get_task_address(source_id);
+
+                                                let (filter_mode, amount) = match filter {
+                                                    FilterOp::Blur(..) => (0, 0.0),
+                                                    FilterOp::Contrast(amount) => (1, amount),
+                                                    FilterOp::Grayscale(amount) => (2, amount),
+                                                    FilterOp::HueRotate(angle) => (3, angle),
+                                                    FilterOp::Invert(amount) => (4, amount),
+                                                    FilterOp::Saturate(amount) => (5, amount),
+                                                    FilterOp::Sepia(amount) => (6, amount),
+                                                    FilterOp::Brightness(amount) => (7, amount),
+                                                    FilterOp::Opacity(_, amount) => (8, amount),
+                                                    FilterOp::DropShadow(..) => unreachable!(),
+                                                };
+
+                                                let amount = (amount * 65535.0).round() as i32;
+                                                let batch = self.batch_list.get_suitable_batch(key, &item_bounding_rect);
+
+                                                let instance = CompositePrimitiveInstance::new(
+                                                    task_address,
+                                                    src_task_address,
+                                                    RenderTaskAddress(0),
+                                                    filter_mode,
+                                                    amount,
+                                                    z,
+                                                    0,
+                                                    0,
+                                                );
+
+                                                batch.push(PrimitiveInstance::from(instance));
+                                            }
+                                        }
+                                    }
+                                    PictureCompositeMode::MixBlend(mode) => {
+                                        let backdrop_id = secondary_render_task_id.expect("no backdrop!?");
+
+                                        let key = BatchKey::new(
+                                            BatchKind::Composite {
+                                                task_id,
+                                                source_id,
+                                                backdrop_id,
+                                            },
+                                            BlendMode::PremultipliedAlpha,
+                                            BatchTextures::no_texture(),
+                                        );
+                                        let batch = self.batch_list.get_suitable_batch(key, &item_bounding_rect);
+                                        let backdrop_task_address = render_tasks.get_task_address(backdrop_id);
+                                        let source_task_address = render_tasks.get_task_address(source_id);
+
+                                        let instance = CompositePrimitiveInstance::new(
+                                            task_address,
+                                            source_task_address,
+                                            backdrop_task_address,
+                                            mode as u32 as i32,
+                                            0,
+                                            z,
+                                            0,
+                                            0,
+                                        );
+
+                                        batch.push(PrimitiveInstance::from(instance));
+                                    }
+                                    PictureCompositeMode::Blit => {
+                                        let src_task_address = render_tasks.get_task_address(source_id);
+                                        let key = BatchKey::new(
+                                            BatchKind::HardwareComposite,
+                                            BlendMode::PremultipliedAlpha,
+                                            BatchTextures::render_target_cache(),
+                                        );
+                                        let batch = self.batch_list.get_suitable_batch(key, &item_bounding_rect);
+                                        let instance = CompositePrimitiveInstance::new(
+                                            task_address,
+                                            src_task_address,
+                                            RenderTaskAddress(0),
+                                            item_bounding_rect.origin.x,
+                                            item_bounding_rect.origin.y,
+                                            z,
+                                            item_bounding_rect.size.width,
+                                            item_bounding_rect.size.height,
+                                        );
+
+                                        batch.push(PrimitiveInstance::from(instance));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    None => {
+                        // If this picture is being drawn into an existing target (i.e. with
+                        // no composition operation), recurse and add to the current batch list.
+                        self.add_pic_to_batch(
+                            picture,
+                            task_id,
+                            ctx,
+                            gpu_cache,
+                            render_tasks,
+                            deferred_resolves,
+                        );
+                    }
+                }
+            }
+            PrimitiveKind::AlignedGradient => {
+                let gradient_cpu =
+                    &ctx.prim_store.cpu_gradients[prim_metadata.cpu_prim_index.0];
+                let kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::AlignedGradient,
+                );
+                let key = BatchKey::new(kind, blend_mode, no_textures);
+                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                for part_index in 0 .. (gradient_cpu.stops_count - 1) {
+                    batch.push(base_instance.build(part_index as i32, 0, 0));
+                }
+            }
+            PrimitiveKind::AngleGradient => {
+                let kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::AngleGradient,
+                );
+                let key = BatchKey::new(kind, blend_mode, no_textures);
+                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                batch.push(base_instance.build(0, 0, 0));
+            }
+            PrimitiveKind::RadialGradient => {
+                let kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::RadialGradient,
+                );
+                let key = BatchKey::new(kind, blend_mode, no_textures);
+                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+                batch.push(base_instance.build(0, 0, 0));
+            }
+            PrimitiveKind::YuvImage => {
+                let mut textures = BatchTextures::no_texture();
+                let mut uv_rect_addresses = [0; 3];
+                let image_yuv_cpu =
+                    &ctx.prim_store.cpu_yuv_images[prim_metadata.cpu_prim_index.0];
+
+                //yuv channel
+                let channel_count = image_yuv_cpu.format.get_plane_num();
+                debug_assert!(channel_count <= 3);
+                for channel in 0 .. channel_count {
+                    let image_key = image_yuv_cpu.yuv_key[channel];
+
+                    let (texture, address) = resolve_image(
+                        image_key,
+                        image_yuv_cpu.image_rendering,
+                        None,
+                        ctx.resource_cache,
+                        gpu_cache,
+                        deferred_resolves,
+                    );
+
+                    if texture == SourceTexture::Invalid {
+                        warn!("Warnings: skip a PrimitiveKind::YuvImage at {:?}.\n", item_bounding_rect);
+                        return;
+                    }
+
+                    textures.colors[channel] = texture;
+                    uv_rect_addresses[channel] = address.as_int(gpu_cache);
+                }
+
+                let get_buffer_kind = |texture: SourceTexture| {
+                    match texture {
+                        SourceTexture::External(ext_image) => {
+                            match ext_image.image_type {
+                                ExternalImageType::Texture2DHandle => {
+                                    ImageBufferKind::Texture2D
+                                }
+                                ExternalImageType::Texture2DArrayHandle => {
+                                    ImageBufferKind::Texture2DArray
+                                }
+                                ExternalImageType::TextureRectHandle => {
+                                    ImageBufferKind::TextureRect
+                                }
+                                ExternalImageType::TextureExternalHandle => {
+                                    ImageBufferKind::TextureExternal
+                                }
+                                ExternalImageType::ExternalBuffer => {
+                                    // The ExternalImageType::ExternalBuffer should be handled by resource_cache.
+                                    // It should go through the non-external case.
+                                    panic!("Unexpected non-texture handle type");
+                                }
+                            }
+                        }
+                        _ => ImageBufferKind::Texture2DArray,
+                    }
+                };
+
+                // All yuv textures should be the same type.
+                let buffer_kind = get_buffer_kind(textures.colors[0]);
+                assert!(
+                    textures.colors[1 .. image_yuv_cpu.format.get_plane_num()]
+                        .iter()
+                        .all(|&tid| buffer_kind == get_buffer_kind(tid))
+                );
+
+                let kind = BatchKind::Transformable(
+                    transform_kind,
+                    TransformBatchKind::YuvImage(
+                        buffer_kind,
+                        image_yuv_cpu.format,
+                        image_yuv_cpu.color_space,
+                    ),
+                );
+                let key = BatchKey::new(kind, blend_mode, textures);
+                let batch = self.batch_list.get_suitable_batch(key, item_bounding_rect);
+
+                batch.push(base_instance.build(
+                    uv_rect_addresses[0],
+                    uv_rect_addresses[1],
+                    uv_rect_addresses[2],
+                ));
+            }
+        }
+    }
+}
+
+impl BrushPrimitive {
+    fn get_batch_key(&self, blend_mode: BlendMode) -> BatchKey {
+        match self.kind {
+            BrushKind::Solid { .. } => {
+                BatchKey::new(
+                    BatchKind::Brush(BrushBatchKind::Solid),
+                    blend_mode,
+                    BatchTextures::no_texture(),
+                )
+            }
+            BrushKind::Clear => {
+                BatchKey::new(
+                    BatchKind::Brush(BrushBatchKind::Solid),
+                    BlendMode::PremultipliedDestOut,
+                    BatchTextures::no_texture(),
+                )
+            }
+            BrushKind::Mask { .. } => {
+                unreachable!("bug: mask brushes not expected in normal alpha pass");
+            }
+        }
+    }
+}
+
+trait AlphaBatchHelpers {
+    fn get_blend_mode(
+        &self,
+        metadata: &PrimitiveMetadata,
+        transform_kind: TransformedRectKind,
+    ) -> BlendMode;
+}
+
+impl AlphaBatchHelpers for PrimitiveStore {
+    fn get_blend_mode(
+        &self,
+        metadata: &PrimitiveMetadata,
+        transform_kind: TransformedRectKind,
+    ) -> BlendMode {
+        let needs_blending = !metadata.opacity.is_opaque || metadata.clip_task_id.is_some() ||
+            transform_kind == TransformedRectKind::Complex;
+
+        match metadata.prim_kind {
+            // Can only resolve the TextRun's blend mode once glyphs are fetched.
+            PrimitiveKind::TextRun => BlendMode::PremultipliedAlpha,
+            PrimitiveKind::Border |
+            PrimitiveKind::Image |
+            PrimitiveKind::YuvImage |
+            PrimitiveKind::AlignedGradient |
+            PrimitiveKind::AngleGradient |
+            PrimitiveKind::RadialGradient |
+            PrimitiveKind::Line |
+            PrimitiveKind::Brush |
+            PrimitiveKind::Picture => if needs_blending {
+                BlendMode::PremultipliedAlpha
+            } else {
+                BlendMode::None
+            },
+        }
+    }
+}
+
+fn resolve_image(
+    image_key: ImageKey,
+    image_rendering: ImageRendering,
+    tile_offset: Option<TileOffset>,
+    resource_cache: &ResourceCache,
+    gpu_cache: &mut GpuCache,
+    deferred_resolves: &mut Vec<DeferredResolve>,
+) -> (SourceTexture, GpuCacheHandle) {
+    match resource_cache.get_image_properties(image_key) {
+        Some(image_properties) => {
+            // Check if an external image that needs to be resolved
+            // by the render thread.
+            match image_properties.external_image {
+                Some(external_image) => {
+                    // This is an external texture - we will add it to
+                    // the deferred resolves list to be patched by
+                    // the render thread...
+                    let cache_handle = gpu_cache.push_deferred_per_frame_blocks(BLOCKS_PER_UV_RECT);
+                    deferred_resolves.push(DeferredResolve {
+                        image_properties,
+                        address: gpu_cache.get_address(&cache_handle),
+                    });
+
+                    (SourceTexture::External(external_image), cache_handle)
+                }
+                None => {
+                    if let Ok(cache_item) = resource_cache.get_cached_image(image_key, image_rendering, tile_offset) {
+                        (cache_item.texture_id, cache_item.uv_rect_handle)
+                    } else {
+                        // There is no usable texture entry for the image key. Just return an invalid texture here.
+                        (SourceTexture::Invalid, GpuCacheHandle::new())
+                    }
+                }
+            }
+        }
+        None => (SourceTexture::Invalid, GpuCacheHandle::new()),
+    }
+}
+
+/// Construct a polygon from stacking context boundaries.
+/// `anchor` here is an index that's going to be preserved in all the
+/// splits of the polygon.
+fn make_polygon(
+    rect: LayerRect,
+    transform: &LayerToWorldTransform,
+    anchor: usize,
+) -> Polygon<f64, WorldPixel> {
+    let mat = TypedTransform3D::row_major(
+        transform.m11 as f64,
+        transform.m12 as f64,
+        transform.m13 as f64,
+        transform.m14 as f64,
+        transform.m21 as f64,
+        transform.m22 as f64,
+        transform.m23 as f64,
+        transform.m24 as f64,
+        transform.m31 as f64,
+        transform.m32 as f64,
+        transform.m33 as f64,
+        transform.m34 as f64,
+        transform.m41 as f64,
+        transform.m42 as f64,
+        transform.m43 as f64,
+        transform.m44 as f64);
+    Polygon::from_transformed_rect(rect.cast().unwrap(), mat, anchor)
+}
+
+/// Batcher managing draw calls into the clip mask (in the RT cache).
+#[derive(Debug)]
+pub struct ClipBatcher {
+    /// Rectangle draws fill up the rectangles with rounded corners.
+    pub rectangles: Vec<ClipMaskInstance>,
+    /// Image draws apply the image masking.
+    pub images: FastHashMap<SourceTexture, Vec<ClipMaskInstance>>,
+    pub border_clears: Vec<ClipMaskInstance>,
+    pub borders: Vec<ClipMaskInstance>,
+}
+
+impl ClipBatcher {
+    pub fn new() -> Self {
+        ClipBatcher {
+            rectangles: Vec::new(),
+            images: FastHashMap::default(),
+            border_clears: Vec::new(),
+            borders: Vec::new(),
+        }
+    }
+
+    pub fn add(
+        &mut self,
+        task_address: RenderTaskAddress,
+        clips: &[ClipWorkItem],
+        coordinate_system_id: CoordinateSystemId,
+        resource_cache: &ResourceCache,
+        gpu_cache: &GpuCache,
+        clip_store: &ClipStore,
+    ) {
+        let mut coordinate_system_id = coordinate_system_id;
+        for work_item in clips.iter() {
+            let instance = ClipMaskInstance {
+                render_task_address: task_address,
+                scroll_node_data_index: work_item.scroll_node_data_index,
+                segment: 0,
+                clip_data_address: GpuCacheAddress::invalid(),
+                resource_address: GpuCacheAddress::invalid(),
+            };
+            let info = clip_store
+                .get_opt(&work_item.clip_sources)
+                .expect("bug: clip handle should be valid");
+
+            for &(ref source, ref handle) in &info.clips {
+                let gpu_address = gpu_cache.get_address(handle);
+
+                match *source {
+                    ClipSource::Image(ref mask) => {
+                        if let Ok(cache_item) = resource_cache.get_cached_image(mask.image, ImageRendering::Auto, None) {
+                            self.images
+                                .entry(cache_item.texture_id)
+                                .or_insert(Vec::new())
+                                .push(ClipMaskInstance {
+                                    clip_data_address: gpu_address,
+                                    resource_address: gpu_cache.get_address(&cache_item.uv_rect_handle),
+                                    ..instance
+                                });
+                        } else {
+                            warn!("Warnings: skip a image mask. Key:{:?} Rect::{:?}.\n", mask.image, mask.rect);
+                            continue;
+                        }
+                    }
+                    ClipSource::Rectangle(..) => {
+                        if work_item.coordinate_system_id != coordinate_system_id {
+                            self.rectangles.push(ClipMaskInstance {
+                                clip_data_address: gpu_address,
+                                ..instance
+                            });
+                            coordinate_system_id = work_item.coordinate_system_id;
+                        }
+                    }
+                    ClipSource::RoundedRectangle(..) => {
+                        self.rectangles.push(ClipMaskInstance {
+                            clip_data_address: gpu_address,
+                            ..instance
+                        });
+                    }
+                    ClipSource::BorderCorner(ref source) => {
+                        self.border_clears.push(ClipMaskInstance {
+                            clip_data_address: gpu_address,
+                            segment: 0,
+                            ..instance
+                        });
+                        for clip_index in 0 .. source.actual_clip_count {
+                            self.borders.push(ClipMaskInstance {
+                                clip_data_address: gpu_address,
+                                segment: 1 + clip_index as i32,
+                                ..instance
+                            })
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/gfx/webrender/src/border.rs b/gfx/webrender/src/border.rs
index 3d4ea7818665..9c4b1b168858 100644
--- a/gfx/webrender/src/border.rs
+++ b/gfx/webrender/src/border.rs
@@ -9,8 +9,8 @@ use clip::ClipSource;
 use ellipse::Ellipse;
 use frame_builder::FrameBuilder;
 use gpu_cache::GpuDataRequest;
-use prim_store::{BrushAntiAliasMode, BrushSegmentDescriptor, BrushSegmentKind};
-use prim_store::{BorderPrimitiveCpu, PrimitiveContainer, TexelRect};
+use prim_store::{BorderPrimitiveCpu, BrushSegment, BrushSegmentDescriptor};
+use prim_store::{BrushClipMaskKind, EdgeAaSegmentMask, PrimitiveContainer, TexelRect};
 use util::{lerp, pack_as_float};
 
 #[repr(u8)]
@@ -422,84 +422,90 @@ impl FrameBuilder {
         let has_no_curve = radius.is_zero();
 
         if has_no_curve && all_corners_simple && all_edges_simple {
-            let inner_rect = LayerRect::new(
-                LayerPoint::new(
-                    info.rect.origin.x + left_len,
-                    info.rect.origin.y + top_len,
-                ),
-                LayerSize::new(
-                    info.rect.size.width - left_len - right_len,
-                    info.rect.size.height - top_len - bottom_len,
-                ),
+            let p0 = info.rect.origin;
+            let p1 = LayerPoint::new(
+                info.rect.origin.x + left_len,
+                info.rect.origin.y + top_len,
+            );
+            let p2 = LayerPoint::new(
+                info.rect.origin.x + info.rect.size.width - right_len,
+                info.rect.origin.y + info.rect.size.height - bottom_len,
+            );
+            let p3 = info.rect.bottom_right();
+
+            let segment = |x0, y0, x1, y1| BrushSegment::new(
+                LayerPoint::new(x0, y0),
+                LayerSize::new(x1-x0, y1-y0),
+                false,
+                EdgeAaSegmentMask::all() // Note: this doesn't seem right, needs revision
             );
 
             // Add a solid rectangle for each visible edge/corner combination.
             if top_edge == BorderEdgeKind::Solid {
-                let descriptor = BrushSegmentDescriptor::new(
-                    &info.rect,
-                    &inner_rect,
-                    Some(&[
-                        BrushSegmentKind::TopLeft,
-                        BrushSegmentKind::TopMid,
-                        BrushSegmentKind::TopRight
-                    ]),
-                );
+                let descriptor = BrushSegmentDescriptor {
+                    segments: vec![
+                        segment(p0.x, p0.y, p1.x, p1.y),
+                        segment(p2.x, p0.y, p3.x, p1.y),
+                        segment(p1.x, p0.y, p2.x, p1.y),
+                    ],
+                    clip_mask_kind: BrushClipMaskKind::Unknown,
+                };
+
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
                     border.top.color,
-                    Some(Box::new(descriptor)),
-                    BrushAntiAliasMode::Segment,
+                    Some(descriptor),
                 );
             }
+
             if left_edge == BorderEdgeKind::Solid {
-                let descriptor = BrushSegmentDescriptor::new(
-                    &info.rect,
-                    &inner_rect,
-                    Some(&[
-                        BrushSegmentKind::MidLeft,
-                    ]),
-                );
+                let descriptor = BrushSegmentDescriptor {
+                    segments: vec![
+                        segment(p0.x, p1.y, p1.x, p2.y),
+                    ],
+                    clip_mask_kind: BrushClipMaskKind::Unknown,
+                };
+
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
                     border.left.color,
-                    Some(Box::new(descriptor)),
-                    BrushAntiAliasMode::Segment,
+                    Some(descriptor),
                 );
             }
+
             if right_edge == BorderEdgeKind::Solid {
-                let descriptor = BrushSegmentDescriptor::new(
-                    &info.rect,
-                    &inner_rect,
-                    Some(&[
-                        BrushSegmentKind::MidRight,
-                    ]),
-                );
+                let descriptor = BrushSegmentDescriptor {
+                    segments: vec![
+                        segment(p2.x, p1.y, p3.x, p2.y),
+                    ],
+                    clip_mask_kind: BrushClipMaskKind::Unknown,
+                };
+
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
                     border.right.color,
-                    Some(Box::new(descriptor)),
-                    BrushAntiAliasMode::Segment,
+                    Some(descriptor),
                 );
             }
+
             if bottom_edge == BorderEdgeKind::Solid {
-                let descriptor = BrushSegmentDescriptor::new(
-                    &info.rect,
-                    &inner_rect,
-                    Some(&[
-                        BrushSegmentKind::BottomLeft,
-                        BrushSegmentKind::BottomMid,
-                        BrushSegmentKind::BottomRight
-                    ]),
-                );
+                let descriptor = BrushSegmentDescriptor {
+                    segments: vec![
+                        segment(p1.x, p2.y, p2.x, p3.y),
+                        segment(p2.x, p2.y, p3.x, p3.y),
+                        segment(p0.x, p2.y, p1.x, p3.y),
+                    ],
+                    clip_mask_kind: BrushClipMaskKind::Unknown,
+                };
+
                 self.add_solid_rectangle(
                     clip_and_scroll,
                     &info,
                     border.bottom.color,
-                    Some(Box::new(descriptor)),
-                    BrushAntiAliasMode::Segment,
+                    Some(descriptor),
                 );
             }
         } else {
@@ -928,4 +934,4 @@ impl ImageBorderSegment {
             tile_spacing,
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gfx/webrender/src/box_shadow.rs b/gfx/webrender/src/box_shadow.rs
index b85925fa45a8..2a3a06601db9 100644
--- a/gfx/webrender/src/box_shadow.rs
+++ b/gfx/webrender/src/box_shadow.rs
@@ -10,7 +10,7 @@ use app_units::Au;
 use clip::ClipSource;
 use frame_builder::FrameBuilder;
 use gpu_types::BrushImageKind;
-use prim_store::{BrushAntiAliasMode, PrimitiveContainer};
+use prim_store::{PrimitiveContainer};
 use prim_store::{BrushMaskKind, BrushKind, BrushPrimitive};
 use picture::PicturePrimitive;
 use util::RectHelpers;
@@ -136,7 +136,6 @@ impl FrameBuilder {
                             color: *color,
                         },
                         None,
-                        BrushAntiAliasMode::Primitive,
                     )
                 ),
             );
@@ -188,7 +187,6 @@ impl FrameBuilder {
                                 kind: BrushMaskKind::Corner(corner_size),
                             },
                             None,
-                            BrushAntiAliasMode::Primitive,
                         );
                     } else {
                         // Create a minimal size primitive mask to blur. In this
@@ -226,7 +224,6 @@ impl FrameBuilder {
                                 kind: BrushMaskKind::RoundedRect(clip_rect, shadow_radius),
                             },
                             None,
-                            BrushAntiAliasMode::Primitive,
                         );
                     };
 
@@ -301,7 +298,7 @@ impl FrameBuilder {
                     let mut inflate_size = 1.0;
                     while adjusted_blur_std_deviation > MAX_BLUR_STD_DEVIATION {
                         adjusted_blur_std_deviation *= 0.5;
-                        inflate_size += 1.0;
+                        inflate_size *= 2.0;
                     }
 
                     let brush_rect = brush_rect.inflate(inflate_size, inflate_size);
@@ -311,7 +308,6 @@ impl FrameBuilder {
                             kind: BrushMaskKind::RoundedRect(clip_rect, shadow_radius),
                         },
                         None,
-                        BrushAntiAliasMode::Primitive,
                     );
                     let brush_info = LayerPrimitiveInfo::new(brush_rect);
                     let brush_prim_index = self.create_primitive(
diff --git a/gfx/webrender/src/clip.rs b/gfx/webrender/src/clip.rs
index 338045b7b0a8..48ebf298f710 100644
--- a/gfx/webrender/src/clip.rs
+++ b/gfx/webrender/src/clip.rs
@@ -3,7 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{BorderRadius, ClipMode, ComplexClipRegion, DeviceIntRect, ImageMask, ImageRendering};
-use api::{LayerPoint, LayerRect, LayerToWorldTransform, LayoutPoint, LayoutVector2D, LocalClip};
+use api::{LayerPoint, LayerRect, LayoutPoint, LayoutVector2D, LocalClip};
+use api::{DevicePixelScale, LayerToWorldTransform};
 use border::{BorderCornerClipSource, ensure_no_corner_overlap};
 use ellipse::Ellipse;
 use freelist::{FreeList, FreeListHandle, WeakFreeListHandle};
@@ -168,21 +169,18 @@ impl ClipSources {
         let mut local_outer = Some(LayerRect::max_rect());
         let mut local_inner = local_outer;
         let mut can_calculate_inner_rect = true;
-        let mut can_calculate_outer_rect = true;
+        let mut can_calculate_outer_rect = false;
         for source in clips {
             match *source {
                 ClipSource::Image(ref mask) => {
                     if !mask.repeat {
+                        can_calculate_outer_rect = true;
                         local_outer = local_outer.and_then(|r| r.intersection(&mask.rect));
-                        can_calculate_inner_rect = false;
-                    } else {
-                        can_calculate_inner_rect = false;
-                        can_calculate_outer_rect = false;
-                        break;
                     }
                     local_inner = None;
                 }
                 ClipSource::Rectangle(rect) => {
+                    can_calculate_outer_rect = true;
                     local_outer = local_outer.and_then(|r| r.intersection(&rect));
                     local_inner = local_inner.and_then(|r| r.intersection(&rect));
                 }
@@ -191,10 +189,10 @@ impl ClipSources {
                     // case clip mask size, for now.
                     if mode == ClipMode::ClipOut {
                         can_calculate_inner_rect = false;
-                        can_calculate_outer_rect = false;
                         break;
                     }
 
+                    can_calculate_outer_rect = true;
                     local_outer = local_outer.and_then(|r| r.intersection(rect));
 
                     let inner_rect = extract_inner_rect_safe(rect, radius);
@@ -203,19 +201,18 @@ impl ClipSources {
                 }
                 ClipSource::BorderCorner { .. } => {
                     can_calculate_inner_rect = false;
-                    can_calculate_outer_rect = false;
                     break;
                 }
             }
         }
 
         let outer = match can_calculate_outer_rect {
-            true => local_outer,
+            true => Some(local_outer.unwrap_or_else(LayerRect::zero)),
             false => None,
         };
 
         let inner = match can_calculate_inner_rect {
-            true => local_inner.unwrap_or(LayerRect::zero()),
+            true => local_inner.unwrap_or_else(LayerRect::zero),
             false => LayerRect::zero(),
         };
 
@@ -262,7 +259,7 @@ impl ClipSources {
     pub fn get_screen_bounds(
         &self,
         transform: &LayerToWorldTransform,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
     ) -> (DeviceIntRect, Option<DeviceIntRect>) {
         // If this translation isn't axis aligned or has a perspective component, don't try to
         // calculate the inner rectangle. The rectangle that we produce would include potentially
@@ -273,13 +270,13 @@ impl ClipSources {
         let can_calculate_inner_rect =
             transform.preserves_2d_axis_alignment() && !transform.has_perspective_component();
         let screen_inner_rect = if can_calculate_inner_rect {
-            calculate_screen_bounding_rect(transform, &self.local_inner_rect, device_pixel_ratio)
+            calculate_screen_bounding_rect(transform, &self.local_inner_rect, device_pixel_scale)
         } else {
             DeviceIntRect::zero()
         };
 
         let screen_outer_rect = self.local_outer_rect.map(|outer_rect|
-            calculate_screen_bounding_rect(transform, &outer_rect, device_pixel_ratio)
+            calculate_screen_bounding_rect(transform, &outer_rect, device_pixel_scale)
         );
 
         (screen_inner_rect, screen_outer_rect)
diff --git a/gfx/webrender/src/clip_scroll_node.rs b/gfx/webrender/src/clip_scroll_node.rs
index 2918b409c0c7..6b67f04a59e0 100644
--- a/gfx/webrender/src/clip_scroll_node.rs
+++ b/gfx/webrender/src/clip_scroll_node.rs
@@ -2,10 +2,10 @@
  * 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/. */
 
-use api::{ClipId, DeviceIntRect, LayerPixel, LayerPoint, LayerRect, LayerSize};
-use api::{LayerToScrollTransform, LayerToWorldTransform, LayerVector2D, LayoutVector2D, PipelineId};
-use api::{ScrollClamping, ScrollEventPhase, ScrollLocation, ScrollSensitivity};
-use api::{LayoutTransform, PropertyBinding, StickyOffsetBounds, WorldPoint};
+use api::{ClipId, DeviceIntRect, DevicePixelScale, LayerPixel, LayerPoint, LayerRect, LayerSize};
+use api::{LayerToWorldTransform, LayerTransform, LayerVector2D, LayoutTransform, LayoutVector2D};
+use api::{PipelineId, PropertyBinding, ScrollClamping, ScrollEventPhase, ScrollLocation};
+use api::{ScrollSensitivity, StickyOffsetBounds, WorldPoint};
 use clip::{ClipSourcesHandle, ClipStore};
 use clip_scroll_tree::{CoordinateSystemId, TransformUpdateState};
 use euclid::SideOffsets2D;
@@ -17,7 +17,7 @@ use resource_cache::ResourceCache;
 use scene::SceneProperties;
 use spring::{DAMPING, STIFFNESS, Spring};
 use std::rc::Rc;
-use util::{MatrixHelpers, MaxRect, TransformedRectKind};
+use util::{MatrixHelpers, TransformOrOffset, TransformedRectKind};
 
 #[cfg(target_os = "macos")]
 const CAN_OVERSCROLL: bool = true;
@@ -85,10 +85,6 @@ pub struct ClipScrollNode {
     /// Viewing rectangle in the coordinate system of the parent reference frame.
     pub local_viewport_rect: LayerRect,
 
-    /// Clip rect of this node - typically the same as viewport rect, except
-    /// in overscroll cases.
-    pub local_clip_rect: LayerRect,
-
     /// The transformation for this viewport in world coordinates is the transformation for
     /// our parent reference frame, plus any accumulated scrolling offsets from nodes
     /// between our reference frame and this node. For reference frames, we also include
@@ -116,12 +112,19 @@ pub struct ClipScrollNode {
     /// generate clip tasks.
     pub clip_chain_node: ClipChain,
 
-    /// The intersected outer bounds of the clips for this node.
-    pub combined_clip_outer_bounds: DeviceIntRect,
+    /// True if this node is transformed by an invertible transform.  If not, display items
+    /// transformed by this node will not be displayed and display items not transformed by this
+    /// node will not be clipped by clips that are transformed by this node.
+    pub invertible: bool,
 
     /// The axis-aligned coordinate system id of this node.
     pub coordinate_system_id: CoordinateSystemId,
 
+    /// The transformation from the coordinate system which established our compatible coordinate
+    /// system (same coordinate system id) and us. This can change via scroll offsets and via new
+    /// reference frame transforms.
+    pub coordinate_system_relative_transform: TransformOrOffset,
+
     /// A linear ID / index of this clip-scroll node. Used as a reference to
     /// pass to shaders, to allow them to fetch a given clip-scroll node.
     pub node_data_index: ClipScrollNodeIndex,
@@ -136,7 +139,6 @@ impl ClipScrollNode {
     ) -> Self {
         ClipScrollNode {
             local_viewport_rect: *rect,
-            local_clip_rect: *rect,
             world_viewport_transform: LayerToWorldTransform::identity(),
             world_content_transform: LayerToWorldTransform::identity(),
             parent: parent_id,
@@ -144,8 +146,9 @@ impl ClipScrollNode {
             pipeline_id,
             node_type: node_type,
             clip_chain_node: None,
-            combined_clip_outer_bounds: DeviceIntRect::max_rect(),
+            invertible: true,
             coordinate_system_id: CoordinateSystemId(0),
+            coordinate_system_relative_transform: TransformOrOffset::zero(),
             node_data_index: ClipScrollNodeIndex(0),
         }
     }
@@ -187,10 +190,11 @@ impl ClipScrollNode {
     ) -> Self {
         let identity = LayoutTransform::identity();
         let info = ReferenceFrameInfo {
-            resolved_transform: LayerToScrollTransform::identity(),
+            resolved_transform: LayerTransform::identity(),
             source_transform: source_transform.unwrap_or(PropertyBinding::Value(identity)),
             source_perspective: source_perspective.unwrap_or(identity),
             origin_in_parent_reference_frame,
+            invertible: true,
         };
         Self::new(pipeline_id, parent_id, frame_rect, NodeType::ReferenceFrame(info))
     }
@@ -264,60 +268,26 @@ impl ClipScrollNode {
         true
     }
 
-    pub fn update_to_empty_rect(&mut self) {
-        self.combined_clip_outer_bounds = DeviceIntRect::zero();
+    pub fn mark_uninvertible(&mut self) {
+        self.invertible = false;
         self.world_content_transform = LayerToWorldTransform::identity();
         self.world_viewport_transform = LayerToWorldTransform::identity();
         self.clip_chain_node = None;
     }
 
-    pub fn push_gpu_node_data(
-        &mut self,
-        state: &TransformUpdateState,
-        node_data: &mut Vec<ClipScrollNodeData>
-    ) {
-        if self.combined_clip_outer_bounds.is_empty() {
+    pub fn push_gpu_node_data(&mut self, node_data: &mut Vec<ClipScrollNodeData>) {
+        if !self.invertible {
             node_data.push(ClipScrollNodeData::invalid());
             return;
         }
 
-        let local_clip_rect = match self.node_type {
-            _ if self.world_content_transform.has_perspective_component() => LayerRect::max_rect(),
-            NodeType::ReferenceFrame(ref info) => {
-                info.resolved_transform.with_destination::<LayerPixel>()
-                    .inverse_rect_footprint(&state.parent_combined_viewport_rect)
-            }
-            NodeType::Clip(_) | NodeType::ScrollFrame(_) => {
-                state.parent_combined_viewport_rect
-                    .intersection(&self.local_clip_rect)
-                    .unwrap_or(LayerRect::zero())
-            }
-            NodeType::StickyFrame(ref sticky_info) => {
-                state.parent_combined_viewport_rect
-                    .translate(&-sticky_info.current_offset)
-                    .intersection(&self.local_clip_rect)
-                    .unwrap_or(LayerRect::zero())
-            }
-        };
-
         let transform_kind = if self.world_content_transform.preserves_2d_axis_alignment() {
             TransformedRectKind::AxisAligned
         } else {
             TransformedRectKind::Complex
         };
-
-        let reference_frame_relative_scroll_offset = match self.node_type {
-            NodeType::ReferenceFrame(_) => LayerVector2D::zero(),
-            NodeType::Clip(_) | NodeType::ScrollFrame(_) => state.parent_accumulated_scroll_offset,
-            NodeType::StickyFrame(ref sticky_info) =>
-                    state.parent_accumulated_scroll_offset + sticky_info.current_offset,
-        };
-
         let data = ClipScrollNodeData {
             transform: self.world_content_transform,
-            local_clip_rect,
-            reference_frame_relative_scroll_offset,
-            scroll_offset: self.scroll_offset(),
             transform_kind: transform_kind as u32 as f32,
             padding: [0.0; 3],
         };
@@ -330,7 +300,8 @@ impl ClipScrollNode {
         &mut self,
         state: &mut TransformUpdateState,
         next_coordinate_system_id: &mut CoordinateSystemId,
-        device_pixel_ratio: f32,
+        screen_rect: &DeviceIntRect,
+        device_pixel_scale: DevicePixelScale,
         clip_store: &mut ClipStore,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
@@ -338,52 +309,53 @@ impl ClipScrollNode {
     ) {
         // If any of our parents was not rendered, we are not rendered either and can just
         // quit here.
-        if state.combined_outer_clip_bounds.is_empty() {
-            self.update_to_empty_rect();
+        if !state.invertible {
+            self.mark_uninvertible();
             return;
         }
 
+        self.update_transform(state, next_coordinate_system_id, scene_properties);
+
         // If this node is a reference frame, we check if the determinant is 0, which means it
         // has a non-invertible matrix. For non-reference-frames we assume that they will
         // produce only additional translations which should be invertible.
-        if self.node_type.is_reference_frame() {
-            if self.world_content_transform.determinant() == 0.0 {
-                self.update_to_empty_rect();
+        match self.node_type {
+            NodeType::ReferenceFrame(info) if !info.invertible => {
+                self.mark_uninvertible();
                 return;
             }
+            _ => self.invertible = true,
         }
 
-        self.update_transform(state, next_coordinate_system_id, scene_properties);
         self.update_clip_work_item(
             state,
-            device_pixel_ratio,
+            screen_rect,
+            device_pixel_scale,
             clip_store,
             resource_cache,
             gpu_cache,
         );
-
-        // This indicates that we are entirely clipped out.
-        if state.combined_outer_clip_bounds.is_empty() {
-            self.update_to_empty_rect();
-            return;
-        }
-
     }
 
     pub fn update_clip_work_item(
         &mut self,
         state: &mut TransformUpdateState,
-        device_pixel_ratio: f32,
+        screen_rect: &DeviceIntRect,
+        device_pixel_scale: DevicePixelScale,
         clip_store: &mut ClipStore,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
     ) {
-        let mut current_clip_chain = state.parent_clip_chain.clone();
+        let current_clip_chain = state.parent_clip_chain.clone();
+        let combined_outer_screen_rect = current_clip_chain.as_ref().map_or(
+            *screen_rect, |clip| clip.combined_outer_screen_rect,
+        );
+
         let clip_sources_handle = match self.node_type {
             NodeType::Clip(ref handle) => handle,
             _ => {
-                self.clip_chain_node = current_clip_chain;
-                self.combined_clip_outer_bounds = state.combined_outer_clip_bounds;
+                self.clip_chain_node = current_clip_chain.clone();
+                self.invertible = true;
                 return;
             }
         };
@@ -391,51 +363,39 @@ impl ClipScrollNode {
         let clip_sources = clip_store.get_mut(clip_sources_handle);
         clip_sources.update(gpu_cache, resource_cache);
         let (screen_inner_rect, screen_outer_rect) =
-            clip_sources.get_screen_bounds(&self.world_viewport_transform, device_pixel_ratio);
+            clip_sources.get_screen_bounds(&self.world_viewport_transform, device_pixel_scale);
+
+        // All clipping ClipScrollNodes should have outer rectangles, because they never
+        // use the BorderCorner clip type and they always have at last one non-ClipOut
+        // Rectangle ClipSource.
+        let screen_outer_rect = screen_outer_rect.expect("Clipping node didn't have outer rect.");
+        let local_outer_rect = clip_sources.local_outer_rect.expect(
+            "Clipping node didn't have outer rect."
+        );
 
         // If this clip's inner rectangle completely surrounds the existing clip
         // chain's outer rectangle, we can discard this clip entirely since it isn't
         // going to affect anything.
-        if screen_inner_rect.contains_rect(&state.combined_outer_clip_bounds) {
+        if screen_inner_rect.contains_rect(&combined_outer_screen_rect) {
             self.clip_chain_node = current_clip_chain;
-            self.combined_clip_outer_bounds = state.combined_outer_clip_bounds;
             return;
         }
 
-        let combined_outer_screen_rect = match screen_outer_rect {
-            Some(outer_rect) => {
-                // If this clips outer rectangle is completely enclosed by the clip
-                // chain's inner rectangle, then the only clip that matters from this point
-                // on is this clip. We can disconnect this clip from the parent clip chain.
-                if state.combined_inner_clip_bounds.contains_rect(&outer_rect) {
-                    current_clip_chain = None;
-                }
-                outer_rect.intersection(&state.combined_outer_clip_bounds)
-                    .unwrap_or_else(DeviceIntRect::zero)
-            }
-            None => state.combined_outer_clip_bounds,
+        let work_item = ClipWorkItem {
+            scroll_node_data_index: self.node_data_index,
+            clip_sources: clip_sources_handle.weak(),
+            coordinate_system_id: state.current_coordinate_system_id,
         };
 
-        let combined_inner_screen_rect =
-            state.combined_inner_clip_bounds.intersection(&screen_inner_rect)
-            .unwrap_or_else(DeviceIntRect::zero);
-
-        state.combined_outer_clip_bounds = combined_outer_screen_rect;
-        state.combined_inner_clip_bounds = combined_inner_screen_rect;
-        self.combined_clip_outer_bounds = combined_outer_screen_rect;
-
-        self.clip_chain_node = Some(Rc::new(ClipChainNode {
-            work_item: ClipWorkItem {
-                scroll_node_data_index: self.node_data_index,
-                clip_sources: clip_sources_handle.weak(),
-                coordinate_system_id: state.current_coordinate_system_id,
-            },
+        let clip_chain_node = ClipChainNode::new(
+            work_item,
+            self.coordinate_system_relative_transform.apply(&local_outer_rect),
+            screen_outer_rect,
             screen_inner_rect,
-            combined_outer_screen_rect,
-            combined_inner_screen_rect,
-            prev: current_clip_chain,
-        }));
+            current_clip_chain
+        );
 
+        self.clip_chain_node = Some(Rc::new(clip_chain_node));
         state.parent_clip_chain = self.clip_chain_node.clone();
     }
 
@@ -479,6 +439,10 @@ impl ClipScrollNode {
             self.world_viewport_transform
         };
 
+        let added_offset = state.parent_accumulated_scroll_offset + sticky_offset + scroll_offset;
+        self.coordinate_system_relative_transform =
+            state.coordinate_system_relative_transform.offset(added_offset);
+
         match self.node_type {
             NodeType::StickyFrame(ref mut info) => info.current_offset = sticky_offset,
             _ => {},
@@ -500,30 +464,41 @@ impl ClipScrollNode {
 
         // Resolve the transform against any property bindings.
         let source_transform = scene_properties.resolve_layout_transform(&info.source_transform);
-        info.resolved_transform = LayerToScrollTransform::create_translation(
+        info.resolved_transform = LayerTransform::create_translation(
             info.origin_in_parent_reference_frame.x,
             info.origin_in_parent_reference_frame.y,
             0.0
         ).pre_mul(&source_transform)
          .pre_mul(&info.source_perspective);
 
-        if !info.resolved_transform.preserves_2d_axis_alignment() ||
-           info.resolved_transform.has_perspective_component() {
-            state.current_coordinate_system_id = *next_coordinate_system_id;
-            next_coordinate_system_id.advance();
-        }
-        self.coordinate_system_id = state.current_coordinate_system_id;
-
         // The transformation for this viewport in world coordinates is the transformation for
         // our parent reference frame, plus any accumulated scrolling offsets from nodes
         // between our reference frame and this node. Finally, we also include
         // whatever local transformation this reference frame provides. This can be combined
         // with the local_viewport_rect to get its position in world space.
-        self.world_viewport_transform = state
-            .parent_reference_frame_transform
-            .pre_translate(state.parent_accumulated_scroll_offset.to_3d())
-            .pre_mul(&info.resolved_transform.with_destination::<LayerPixel>());
+        let relative_transform = info.resolved_transform
+            .post_translate(state.parent_accumulated_scroll_offset.to_3d());
+        self.world_viewport_transform = state.parent_reference_frame_transform
+            .pre_mul(&relative_transform.with_destination::<LayerPixel>());
         self.world_content_transform = self.world_viewport_transform;
+
+        info.invertible = relative_transform.determinant() != 0.0;
+        if !info.invertible {
+            return;
+        }
+
+        // Try to update our compatible coordinate system transform. If we cannot, start a new
+        // incompatible coordinate system.
+        match state.coordinate_system_relative_transform.update(relative_transform) {
+            Some(offset) => self.coordinate_system_relative_transform = offset,
+            None => {
+                self.coordinate_system_relative_transform = TransformOrOffset::zero();
+                state.current_coordinate_system_id = *next_coordinate_system_id;
+                next_coordinate_system_id.advance();
+            }
+        }
+
+        self.coordinate_system_id = state.current_coordinate_system_id;
     }
 
     fn calculate_sticky_offset(
@@ -635,21 +610,13 @@ impl ClipScrollNode {
         sticky_offset
     }
 
-    pub fn prepare_state_for_children(
-        &self,
-        state: &mut TransformUpdateState,
-        node_data: &Vec<ClipScrollNodeData>
-    ) {
-        if self.combined_clip_outer_bounds.is_empty() {
-            state.parent_combined_viewport_rect = LayerRect::zero();
-            state.combined_outer_clip_bounds = DeviceIntRect::zero();
+    pub fn prepare_state_for_children(&self, state: &mut TransformUpdateState) {
+        if !self.invertible {
+            state.invertible = false;
             state.parent_clip_chain = None;
             return;
         }
 
-        let combined_local_viewport_rect =
-            node_data[self.node_data_index.0 as usize].local_clip_rect;
-
         // The transformation we are passing is the transformation of the parent
         // reference frame and the offset is the accumulated offset of all the nodes
         // between us and the parent reference frame. If we are a reference frame,
@@ -657,19 +624,16 @@ impl ClipScrollNode {
         match self.node_type {
             NodeType::ReferenceFrame(ref info) => {
                 state.parent_reference_frame_transform = self.world_viewport_transform;
-                state.parent_combined_viewport_rect = combined_local_viewport_rect;
                 state.parent_accumulated_scroll_offset = LayerVector2D::zero();
+                state.coordinate_system_relative_transform =
+                    self.coordinate_system_relative_transform.clone();
                 let translation = -info.origin_in_parent_reference_frame;
                 state.nearest_scrolling_ancestor_viewport =
                     state.nearest_scrolling_ancestor_viewport
                        .translate(&translation);
             }
-            NodeType::Clip(..) => {
-                state.parent_combined_viewport_rect = combined_local_viewport_rect;
-            },
+            NodeType::Clip(..) => { }
             NodeType::ScrollFrame(ref scrolling) => {
-                state.parent_combined_viewport_rect =
-                        combined_local_viewport_rect.translate(&-scrolling.offset);
                 state.parent_accumulated_scroll_offset =
                     scrolling.offset + state.parent_accumulated_scroll_offset;
                 state.nearest_scrolling_ancestor_offset = scrolling.offset;
@@ -679,7 +643,6 @@ impl ClipScrollNode {
                 // We don't translate the combined rect by the sticky offset, because sticky
                 // offsets actually adjust the node position itself, whereas scroll offsets
                 // only apply to contents inside the node.
-                state.parent_combined_viewport_rect = combined_local_viewport_rect;
                 state.parent_accumulated_scroll_offset =
                     info.current_offset + state.parent_accumulated_scroll_offset;
             }
@@ -817,7 +780,13 @@ impl ClipScrollNode {
     }
 
     pub fn is_visible(&self) -> bool {
-        self.combined_clip_outer_bounds != DeviceIntRect::zero()
+        if !self.invertible {
+            return false;
+        }
+        match self.clip_chain_node {
+            Some(ref node) if node.combined_outer_screen_rect.is_empty() => false,
+            _ => true,
+        }
     }
 }
 
@@ -898,7 +867,7 @@ impl ScrollingState {
 pub struct ReferenceFrameInfo {
     /// The transformation that establishes this reference frame, relative to the parent
     /// reference frame. The origin of the reference frame is included in the transformation.
-    pub resolved_transform: LayerToScrollTransform,
+    pub resolved_transform: LayerTransform,
 
     /// The source transform and perspective matrices provided by the stacking context
     /// that forms this reference frame. We maintain the property binding information
@@ -911,4 +880,7 @@ pub struct ReferenceFrameInfo {
     /// origin of this reference frame. This is already rolled into the `transform' property, but
     /// we also store it here to properly transform the viewport for sticky positioning.
     pub origin_in_parent_reference_frame: LayerVector2D,
+
+    /// True if the resolved transform is invertible.
+    pub invertible: bool,
 }
diff --git a/gfx/webrender/src/clip_scroll_tree.rs b/gfx/webrender/src/clip_scroll_tree.rs
index 30751b1ab8c0..71936c972daa 100644
--- a/gfx/webrender/src/clip_scroll_tree.rs
+++ b/gfx/webrender/src/clip_scroll_tree.rs
@@ -2,7 +2,7 @@
  * 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/. */
 
-use api::{ClipId, DeviceIntRect, LayerPoint, LayerRect};
+use api::{ClipId, DeviceIntRect, DevicePixelScale, LayerPoint, LayerRect};
 use api::{LayerToWorldTransform, LayerVector2D, PipelineId, ScrollClamping, ScrollEventPhase};
 use api::{PropertyBinding, LayoutTransform, ScrollLayerState, ScrollLocation, WorldPoint};
 use clip::ClipStore;
@@ -14,7 +14,7 @@ use print_tree::{PrintTree, PrintTreePrinter};
 use render_task::ClipChain;
 use resource_cache::ResourceCache;
 use scene::SceneProperties;
-use util::MaxRect;
+use util::TransformOrOffset;
 
 pub type ScrollStates = FastHashMap<ClipId, ScrollingState>;
 
@@ -26,11 +26,11 @@ pub type ScrollStates = FastHashMap<ClipId, ScrollingState>;
 pub struct CoordinateSystemId(pub u32);
 
 impl CoordinateSystemId {
-    pub fn root() -> CoordinateSystemId {
+    pub fn root() -> Self {
         CoordinateSystemId(0)
     }
 
-    pub fn next(&self) -> CoordinateSystemId {
+    pub fn next(&self) -> Self {
         let CoordinateSystemId(id) = *self;
         CoordinateSystemId(id + 1)
     }
@@ -69,19 +69,24 @@ pub struct ClipScrollTree {
 #[derive(Clone)]
 pub struct TransformUpdateState {
     pub parent_reference_frame_transform: LayerToWorldTransform,
-    pub parent_combined_viewport_rect: LayerRect,
     pub parent_accumulated_scroll_offset: LayerVector2D,
     pub nearest_scrolling_ancestor_offset: LayerVector2D,
     pub nearest_scrolling_ancestor_viewport: LayerRect,
     pub parent_clip_chain: ClipChain,
-    pub combined_outer_clip_bounds: DeviceIntRect,
-    pub combined_inner_clip_bounds: DeviceIntRect,
 
     /// An id for keeping track of the axis-aligned space of this node. This is used in
     /// order to to track what kinds of clip optimizations can be done for a particular
     /// display list item, since optimizations can usually only be done among
     /// coordinate systems which are relatively axis aligned.
     pub current_coordinate_system_id: CoordinateSystemId,
+
+    /// Transform from the coordinate system that started this compatible coordinate system.
+    pub coordinate_system_relative_transform: TransformOrOffset,
+
+    /// True if this node is transformed by an invertible transform.  If not, display items
+    /// transformed by this node will not be displayed and display items not transformed by this
+    /// node will not be clipped by clips that are transformed by this node.
+    pub invertible: bool,
 }
 
 impl ClipScrollTree {
@@ -198,11 +203,6 @@ impl ClipScrollTree {
             }
         };
 
-        if !node.local_clip_rect.contains(&transformed_point) {
-            cache.insert(*node_id, None);
-            return false;
-        }
-
         for &(ref clip, _) in clip_store.get(&clip_sources_handle).clips() {
             if !clip.contains(&transformed_point) {
                 cache.insert(*node_id, None);
@@ -337,11 +337,11 @@ impl ClipScrollTree {
     pub fn update_tree(
         &mut self,
         screen_rect: &DeviceIntRect,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         clip_store: &mut ClipStore,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
-        pan: LayerPoint,
+        pan: WorldPoint,
         node_data: &mut Vec<ClipScrollNodeData>,
         scene_properties: &SceneProperties,
     ) {
@@ -350,29 +350,27 @@ impl ClipScrollTree {
         }
 
         let root_reference_frame_id = self.root_reference_frame_id();
-        let root_viewport = self.nodes[&root_reference_frame_id].local_clip_rect;
-
         let mut state = TransformUpdateState {
             parent_reference_frame_transform: LayerToWorldTransform::create_translation(
                 pan.x,
                 pan.y,
                 0.0,
             ),
-            parent_combined_viewport_rect: root_viewport,
             parent_accumulated_scroll_offset: LayerVector2D::zero(),
             nearest_scrolling_ancestor_offset: LayerVector2D::zero(),
             nearest_scrolling_ancestor_viewport: LayerRect::zero(),
             parent_clip_chain: None,
-            combined_outer_clip_bounds: *screen_rect,
-            combined_inner_clip_bounds: DeviceIntRect::max_rect(),
             current_coordinate_system_id: CoordinateSystemId::root(),
+            coordinate_system_relative_transform: TransformOrOffset::zero(),
+            invertible: true,
         };
         let mut next_coordinate_system_id = state.current_coordinate_system_id.next();
         self.update_node(
             root_reference_frame_id,
             &mut state,
             &mut next_coordinate_system_id,
-            device_pixel_ratio,
+            screen_rect,
+            device_pixel_scale,
             clip_store,
             resource_cache,
             gpu_cache,
@@ -386,7 +384,8 @@ impl ClipScrollTree {
         layer_id: ClipId,
         state: &mut TransformUpdateState,
         next_coordinate_system_id: &mut CoordinateSystemId,
-        device_pixel_ratio: f32,
+        screen_rect: &DeviceIntRect,
+        device_pixel_scale: DevicePixelScale,
         clip_store: &mut ClipStore,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
@@ -408,29 +407,32 @@ impl ClipScrollTree {
             node.update(
                 &mut state,
                 next_coordinate_system_id,
-                device_pixel_ratio,
+                screen_rect,
+                device_pixel_scale,
                 clip_store,
                 resource_cache,
                 gpu_cache,
                 scene_properties,
             );
 
-            node.push_gpu_node_data(&state, gpu_node_data);
+            node.push_gpu_node_data(gpu_node_data);
 
             if node.children.is_empty() {
                 return;
             }
 
-            node.prepare_state_for_children(&mut state, gpu_node_data);
+
+            node.prepare_state_for_children(&mut state);
             node.children.clone()
         };
 
-        for child_layer_id in node_children {
+        for child_node_id in node_children {
             self.update_node(
-                child_layer_id,
+                child_node_id,
                 &mut state,
                 next_coordinate_system_id,
-                device_pixel_ratio,
+                screen_rect,
+                device_pixel_scale,
                 clip_store,
                 resource_cache,
                 gpu_cache,
@@ -566,7 +568,6 @@ impl ClipScrollTree {
             "local_viewport_rect: {:?}",
             node.local_viewport_rect
         ));
-        pt.add_item(format!("local_clip_rect: {:?}", node.local_clip_rect));
         pt.add_item(format!(
             "world_viewport_transform: {:?}",
             node.world_viewport_transform
@@ -575,6 +576,10 @@ impl ClipScrollTree {
             "world_content_transform: {:?}",
             node.world_content_transform
         ));
+        pt.add_item(format!(
+            "coordinate_system_id: {:?}",
+            node.coordinate_system_id
+        ));
 
         for child_id in &node.children {
             self.print_node(child_id, pt, clip_store);
diff --git a/gfx/webrender/src/device.rs b/gfx/webrender/src/device.rs
index c8e14ca39181..0444ff32a346 100644
--- a/gfx/webrender/src/device.rs
+++ b/gfx/webrender/src/device.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::shader_source;
-use api::{ColorF, ImageFormat};
+use api::{ColorF, ImageDescriptor, ImageFormat};
 use api::{DeviceIntPoint, DeviceIntRect, DeviceUintRect, DeviceUintSize};
 use euclid::Transform3D;
 use gleam::gl;
@@ -223,21 +223,6 @@ pub fn build_shader_strings(
     vs_source.push_str(&shared_result);
     fs_source.push_str(&shared_result);
 
-    // Append legacy (.vs and .fs) files if they exist.
-    // TODO(gw): Once all shaders are ported to just use the
-    //           .glsl file, we can remove this code.
-    let vs_name = format!("{}.vs", base_filename);
-    if let Some(old_vs_source) = get_shader_source(&vs_name, override_path) {
-        vs_source.push_str(SHADER_LINE_MARKER);
-        vs_source.push_str(&old_vs_source);
-    }
-
-    let fs_name = format!("{}.fs", base_filename);
-    if let Some(old_fs_source) = get_shader_source(&fs_name, override_path) {
-        fs_source.push_str(SHADER_LINE_MARKER);
-        fs_source.push_str(&old_fs_source);
-    }
-
     (vs_source, fs_source)
 }
 
@@ -473,7 +458,6 @@ impl Texture {
     pub fn get_bpp(&self) -> u32 {
         match self.format {
             ImageFormat::A8 => 1,
-            ImageFormat::RGB8 => 3,
             ImageFormat::BGRA8 => 4,
             ImageFormat::RG8 => 2,
             ImageFormat::RGBAF32 => 16,
@@ -675,6 +659,9 @@ pub struct Device {
     // Frame counter. This is used to map between CPU
     // frames and GPU frames.
     frame_id: FrameId,
+
+    // GL extensions
+    extensions: Vec<String>,
 }
 
 impl Device {
@@ -688,6 +675,12 @@ impl Device {
         let max_texture_size = gl.get_integer_v(gl::MAX_TEXTURE_SIZE) as u32;
         let renderer_name = gl.get_string(gl::RENDERER);
 
+        let mut extensions = Vec::new();
+        let extension_count = gl.get_integer_v(gl::NUM_EXTENSIONS) as gl::GLuint;
+        for i in 0 .. extension_count {
+            extensions.push(gl.get_string_i(gl::EXTENSIONS, i));
+        }
+
         Device {
             gl,
             resource_override_path,
@@ -713,6 +706,7 @@ impl Device {
             renderer_name,
             cached_programs,
             frame_id: FrameId(0),
+            extensions,
         }
     }
 
@@ -1495,12 +1489,16 @@ impl Device {
         }
     }
 
-    pub fn read_pixels(&mut self, width: i32, height: i32) -> Vec<u8> {
+    pub fn read_pixels(&mut self, desc: &ImageDescriptor) -> Vec<u8> {
+        let (_, gl_format) = gl_texture_formats_for_image_format(self.gl(), desc.format);
+        let type_ = gl_type_for_texture_format(desc.format);
+
         self.gl.read_pixels(
             0, 0,
-            width as i32, height as i32,
-            gl::RGBA,
-            gl::UNSIGNED_BYTE
+            desc.width as i32,
+            desc.height as i32,
+            gl_format,
+            type_,
         )
     }
 
@@ -1911,6 +1909,13 @@ impl Device {
             .blend_func(gl::CONSTANT_COLOR, gl::ONE_MINUS_SRC_COLOR);
         self.gl.blend_equation(gl::FUNC_ADD);
     }
+    pub fn set_blend_mode_subpixel_dual_source(&self) {
+        self.gl.blend_func(gl::ONE, gl::ONE_MINUS_SRC1_COLOR);
+    }
+
+    pub fn supports_extension(&self, extension: &str) -> bool {
+        self.extensions.iter().any(|s| s == extension)
+    }
 }
 
 /// return (gl_internal_format, gl_format)
@@ -1924,7 +1929,6 @@ fn gl_texture_formats_for_image_format(
         } else {
             (GL_FORMAT_A as gl::GLint, GL_FORMAT_A)
         },
-        ImageFormat::RGB8 => (gl::RGB as gl::GLint, gl::RGB),
         ImageFormat::BGRA8 => match gl.get_type() {
             gl::GlType::Gl => (gl::RGBA as gl::GLint, get_gl_format_bgra(gl)),
             gl::GlType::Gles => (get_gl_format_bgra(gl) as gl::GLint, get_gl_format_bgra(gl)),
@@ -2050,7 +2054,6 @@ impl<'a> UploadTarget<'a> {
     fn update_impl(&mut self, chunk: UploadChunk) {
         let (gl_format, bpp, data_type) = match self.texture.format {
             ImageFormat::A8 => (GL_FORMAT_A, 1, gl::UNSIGNED_BYTE),
-            ImageFormat::RGB8 => (gl::RGB, 3, gl::UNSIGNED_BYTE),
             ImageFormat::BGRA8 => (get_gl_format_bgra(self.gl), 4, gl::UNSIGNED_BYTE),
             ImageFormat::RG8 => (gl::RG, 2, gl::UNSIGNED_BYTE),
             ImageFormat::RGBAF32 => (gl::RGBA, 16, gl::FLOAT),
diff --git a/gfx/webrender/src/frame.rs b/gfx/webrender/src/frame.rs
index 71e158fbc7fe..31610f86c323 100644
--- a/gfx/webrender/src/frame.rs
+++ b/gfx/webrender/src/frame.rs
@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{BuiltDisplayListIter, ClipAndScrollInfo, ClipId, ColorF, ComplexClipRegion};
-use api::{DeviceUintRect, DeviceUintSize, DisplayItemRef, DocumentLayer, Epoch, FilterOp};
+use api::{DevicePixelScale, DeviceUintRect, DeviceUintSize};
+use api::{DisplayItemRef, DocumentLayer, Epoch, FilterOp};
 use api::{ImageDisplayItem, ItemRange, LayerPoint, LayerPrimitiveInfo, LayerRect};
 use api::{LayerSize, LayerVector2D, LayoutSize};
 use api::{LocalClip, PipelineId, ScrollClamping, ScrollEventPhase, ScrollLayerState};
@@ -17,7 +18,6 @@ use euclid::rect;
 use frame_builder::{FrameBuilder, FrameBuilderConfig, ScrollbarInfo};
 use gpu_cache::GpuCache;
 use internal_types::{FastHashMap, FastHashSet, RenderedDocument};
-use prim_store::{BrushAntiAliasMode};
 use profiler::{GpuCacheProfileCounters, TextureCacheProfileCounters};
 use resource_cache::{FontInstanceMap,ResourceCache, TiledImageMap};
 use scene::{Scene, StackingContextHelpers, ScenePipeline, SceneProperties};
@@ -106,7 +106,6 @@ impl<'a> FlattenContext<'a> {
                         &info,
                         bg_color,
                         None,
-                        BrushAntiAliasMode::Primitive,
                     );
                 }
             }
@@ -448,7 +447,6 @@ impl<'a> FlattenContext<'a> {
                     &prim_info,
                     info.color,
                     None,
-                    BrushAntiAliasMode::Primitive,
                 );
             }
             SpecificDisplayItem::ClearRectangle => {
@@ -930,7 +928,7 @@ pub struct FrameContext {
     clip_scroll_tree: ClipScrollTree,
     pipeline_epoch_map: FastHashMap<PipelineId, Epoch>,
     id: FrameId,
-    frame_builder_config: FrameBuilderConfig,
+    pub frame_builder_config: FrameBuilderConfig,
 }
 
 impl FrameContext {
@@ -992,7 +990,7 @@ impl FrameContext {
         resource_cache: &mut ResourceCache,
         window_size: DeviceUintSize,
         inner_rect: DeviceUintRect,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         output_pipelines: &FastHashSet<PipelineId>,
     ) -> FrameBuilder {
         let root_pipeline_id = match scene.root_pipeline_id {
@@ -1043,9 +1041,8 @@ impl FrameContext {
             );
 
             roller.builder.setup_viewport_offset(
-                window_size,
                 inner_rect,
-                device_pixel_ratio,
+                device_pixel_scale,
                 roller.clip_scroll_tree,
             );
 
@@ -1080,9 +1077,9 @@ impl FrameContext {
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
         pipelines: &FastHashMap<PipelineId, ScenePipeline>,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         layer: DocumentLayer,
-        pan: LayerPoint,
+        pan: WorldPoint,
         texture_cache_profile: &mut TextureCacheProfileCounters,
         gpu_cache_profile: &mut GpuCacheProfileCounters,
 		scene_properties: &SceneProperties,
@@ -1094,7 +1091,7 @@ impl FrameContext {
             &mut self.clip_scroll_tree,
             pipelines,
             self.window_size,
-            device_pixel_ratio,
+            device_pixel_scale,
             layer,
             pan,
             texture_cache_profile,
diff --git a/gfx/webrender/src/frame_builder.rs b/gfx/webrender/src/frame_builder.rs
index 7e9f5f45e925..2907929249b1 100644
--- a/gfx/webrender/src/frame_builder.rs
+++ b/gfx/webrender/src/frame_builder.rs
@@ -2,16 +2,15 @@
  * 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/. */
 
-use api::{BorderDetails, BorderDisplayItem, BuiltDisplayList};
-use api::{ClipAndScrollInfo, ClipId, ColorF, ColorU, PropertyBinding};
-use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize};
-use api::{DocumentLayer, ExtendMode, FontRenderMode, LayoutTransform};
-use api::{GlyphInstance, GlyphOptions, GradientStop, HitTestFlags, HitTestItem, HitTestResult};
-use api::{ImageKey, ImageRendering, ItemRange, ItemTag, LayerPoint, LayerPrimitiveInfo, LayerRect};
-use api::{LayerSize, LayerToScrollTransform, LayerVector2D, LayoutVector2D, LineOrientation};
-use api::{LineStyle, LocalClip, PipelineId, RepeatMode};
-use api::{ScrollSensitivity, Shadow, TileOffset, TransformStyle};
-use api::{PremultipliedColorF, WorldPoint, YuvColorSpace, YuvData};
+use api::{BorderDetails, BorderDisplayItem, BuiltDisplayList, ClipAndScrollInfo, ClipId, ColorF};
+use api::{ColorU, DeviceIntPoint, DevicePixelScale, DeviceUintPoint, DeviceUintRect};
+use api::{DeviceUintSize, DocumentLayer, ExtendMode, FontRenderMode, GlyphInstance, GlyphOptions};
+use api::{GradientStop, HitTestFlags, HitTestItem, HitTestResult, ImageKey, ImageRendering};
+use api::{ItemRange, ItemTag, LayerPoint, LayerPrimitiveInfo, LayerRect, LayerSize};
+use api::{LayerTransform, LayerVector2D, LayoutTransform, LayoutVector2D, LineOrientation};
+use api::{LineStyle, LocalClip, PipelineId, PremultipliedColorF, PropertyBinding, RepeatMode};
+use api::{ScrollSensitivity, Shadow, TileOffset, TransformStyle, WorldPoint, YuvColorSpace};
+use api::YuvData;
 use app_units::Au;
 use border::ImageBorderSegment;
 use clip::{ClipRegion, ClipSource, ClipSources, ClipStore, Contains};
@@ -21,10 +20,10 @@ use euclid::{SideOffsets2D, vec2};
 use frame::FrameId;
 use glyph_rasterizer::FontInstance;
 use gpu_cache::GpuCache;
-use gpu_types::ClipScrollNodeData;
+use gpu_types::{ClipScrollNodeData, PictureType};
 use internal_types::{FastHashMap, FastHashSet, RenderPassIndex};
-use picture::{PictureCompositeMode, PictureKind, PicturePrimitive, RasterizationSpace};
-use prim_store::{BrushAntiAliasMode, BrushKind, BrushPrimitive, TexelRect, YuvImagePrimitiveCpu};
+use picture::{ContentOrigin, PictureCompositeMode, PictureKind, PicturePrimitive};
+use prim_store::{BrushKind, BrushPrimitive, TexelRect, YuvImagePrimitiveCpu};
 use prim_store::{GradientPrimitiveCpu, ImagePrimitiveCpu, LinePrimitive, PrimitiveKind};
 use prim_store::{PrimitiveContainer, PrimitiveIndex, SpecificPrimitiveIndex};
 use prim_store::{PrimitiveStore, RadialGradientPrimitiveCpu};
@@ -69,10 +68,13 @@ struct StackingContext {
 }
 
 #[derive(Clone, Copy)]
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct FrameBuilderConfig {
     pub enable_scrollbars: bool,
     pub default_font_render_mode: FontRenderMode,
     pub debug: bool,
+    pub dual_source_blending_is_supported: bool,
+    pub dual_source_blending_is_enabled: bool,
 }
 
 #[derive(Debug)]
@@ -125,7 +127,7 @@ pub struct FrameBuilder {
 }
 
 pub struct PrimitiveContext<'a> {
-    pub device_pixel_ratio: f32,
+    pub device_pixel_scale: DevicePixelScale,
     pub display_list: &'a BuiltDisplayList,
     pub clip_node: &'a ClipScrollNode,
     pub scroll_node: &'a ClipScrollNode,
@@ -133,13 +135,13 @@ pub struct PrimitiveContext<'a> {
 
 impl<'a> PrimitiveContext<'a> {
     pub fn new(
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         display_list: &'a BuiltDisplayList,
         clip_node: &'a ClipScrollNode,
         scroll_node: &'a ClipScrollNode,
     ) -> Self {
         PrimitiveContext {
-            device_pixel_ratio,
+            device_pixel_scale,
             display_list,
             clip_node,
             scroll_node,
@@ -165,6 +167,8 @@ impl FrameBuilder {
                 enable_scrollbars: false,
                 default_font_render_mode: FontRenderMode::Mono,
                 debug: false,
+                dual_source_blending_is_enabled: true,
+                dual_source_blending_is_supported: false,
             },
         }
     }
@@ -587,46 +591,20 @@ impl FrameBuilder {
 
     pub fn setup_viewport_offset(
         &mut self,
-        window_size: DeviceUintSize,
         inner_rect: DeviceUintRect,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         clip_scroll_tree: &mut ClipScrollTree,
     ) {
-        let inner_origin = inner_rect.origin.to_f32();
-        let viewport_offset = LayerPoint::new(
-            (inner_origin.x / device_pixel_ratio).round(),
-            (inner_origin.y / device_pixel_ratio).round(),
-        );
-        let outer_size = window_size.to_f32();
-        let outer_size = LayerSize::new(
-            (outer_size.width / device_pixel_ratio).round(),
-            (outer_size.height / device_pixel_ratio).round(),
-        );
-        let clip_size = LayerSize::new(
-            outer_size.width + 2.0 * viewport_offset.x,
-            outer_size.height + 2.0 * viewport_offset.y,
-        );
-
-        let viewport_clip = LayerRect::new(
-            LayerPoint::new(-viewport_offset.x, -viewport_offset.y),
-            LayerSize::new(clip_size.width, clip_size.height),
-        );
-
+        let viewport_offset = (inner_rect.origin.to_vector().to_f32() / device_pixel_scale).round();
         let root_id = clip_scroll_tree.root_reference_frame_id();
         if let Some(root_node) = clip_scroll_tree.nodes.get_mut(&root_id) {
             if let NodeType::ReferenceFrame(ref mut info) = root_node.node_type {
-                info.resolved_transform = LayerToScrollTransform::create_translation(
+                info.resolved_transform = LayerTransform::create_translation(
                     viewport_offset.x,
                     viewport_offset.y,
                     0.0,
                 );
             }
-            root_node.local_clip_rect = viewport_clip;
-        }
-
-        let clip_id = clip_scroll_tree.topmost_scrolling_node_id();
-        if let Some(root_node) = clip_scroll_tree.nodes.get_mut(&clip_id) {
-            root_node.local_clip_rect = viewport_clip;
         }
     }
 
@@ -758,8 +736,7 @@ impl FrameBuilder {
         clip_and_scroll: ClipAndScrollInfo,
         info: &LayerPrimitiveInfo,
         color: ColorF,
-        segments: Option<Box<BrushSegmentDescriptor>>,
-        aa_mode: BrushAntiAliasMode,
+        segments: Option<BrushSegmentDescriptor>,
     ) {
         if color.a == 0.0 {
             // Don't add transparent rectangles to the draw list, but do consider them for hit
@@ -773,7 +750,6 @@ impl FrameBuilder {
                 color,
             },
             segments,
-            aa_mode,
         );
 
         self.add_primitive(
@@ -792,7 +768,6 @@ impl FrameBuilder {
         let prim = BrushPrimitive::new(
             BrushKind::Clear,
             None,
-            BrushAntiAliasMode::Primitive,
         );
 
         self.add_primitive(
@@ -819,7 +794,6 @@ impl FrameBuilder {
                 color,
             },
             None,
-            BrushAntiAliasMode::Primitive,
         );
 
         let prim_index = self.add_primitive(
@@ -1585,9 +1559,10 @@ impl FrameBuilder {
         gpu_cache: &mut GpuCache,
         render_tasks: &mut RenderTaskTree,
         profile_counters: &mut FrameProfileCounters,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         scene_properties: &SceneProperties,
         node_data: &[ClipScrollNodeData],
+        local_rects: &mut Vec<LayerRect>,
     ) -> Option<RenderTaskId> {
         profile_scope!("cull");
 
@@ -1605,7 +1580,7 @@ impl FrameBuilder {
             .display_list;
 
         let root_prim_context = PrimitiveContext::new(
-            device_pixel_ratio,
+            device_pixel_scale,
             display_list,
             root_clip_scroll_node,
             root_clip_scroll_node,
@@ -1631,6 +1606,7 @@ impl FrameBuilder {
             SpecificPrimitiveIndex(0),
             &self.screen_rect.to_i32(),
             node_data,
+            local_rects,
         );
 
         let pic = &mut self.prim_store.cpu_pictures[0];
@@ -1640,13 +1616,12 @@ impl FrameBuilder {
             None,
             PrimitiveIndex(0),
             RenderTargetKind::Color,
-            0.0,
-            0.0,
+            ContentOrigin::Screen(DeviceIntPoint::zero()),
             PremultipliedColorF::TRANSPARENT,
             ClearMode::Transparent,
-            RasterizationSpace::Screen,
             child_tasks,
             None,
+            PictureType::Image,
         );
 
         pic.render_task_id = Some(render_tasks.add(root_render_task));
@@ -1690,9 +1665,9 @@ impl FrameBuilder {
         clip_scroll_tree: &mut ClipScrollTree,
         pipelines: &FastHashMap<PipelineId, ScenePipeline>,
         window_size: DeviceUintSize,
-        device_pixel_ratio: f32,
+        device_pixel_scale: DevicePixelScale,
         layer: DocumentLayer,
-        pan: LayerPoint,
+        pan: WorldPoint,
         texture_cache_profile: &mut TextureCacheProfileCounters,
         gpu_cache_profile: &mut GpuCacheProfileCounters,
         scene_properties: &SceneProperties,
@@ -1712,9 +1687,14 @@ impl FrameBuilder {
         gpu_cache.begin_frame();
 
         let mut node_data = Vec::with_capacity(clip_scroll_tree.nodes.len());
+        let total_prim_runs =
+            self.prim_store.cpu_pictures.iter().fold(1, |count, ref pic| count + pic.runs.len());
+        let mut clip_chain_local_clip_rects = Vec::with_capacity(total_prim_runs);
+        clip_chain_local_clip_rects.push(LayerRect::max_rect());
+
         clip_scroll_tree.update_tree(
             &self.screen_rect.to_i32(),
-            device_pixel_ratio,
+            device_pixel_scale,
             &mut self.clip_store,
             resource_cache,
             gpu_cache,
@@ -1734,9 +1714,10 @@ impl FrameBuilder {
             gpu_cache,
             &mut render_tasks,
             &mut profile_counters,
-            device_pixel_ratio,
+            device_pixel_scale,
             scene_properties,
             &node_data,
+            &mut clip_chain_local_clip_rects,
         );
 
         let mut passes = Vec::new();
@@ -1762,14 +1743,17 @@ impl FrameBuilder {
         }
 
         let mut deferred_resolves = vec![];
+        let use_dual_source_blending = self.config.dual_source_blending_is_enabled &&
+                                       self.config.dual_source_blending_is_supported;
 
         for (pass_index, pass) in passes.iter_mut().enumerate() {
             let ctx = RenderTargetContext {
-                device_pixel_ratio,
+                device_pixel_scale,
                 prim_store: &self.prim_store,
                 resource_cache,
                 node_data: &node_data,
                 clip_scroll_tree,
+                use_dual_source_blending,
             };
 
             pass.build(
@@ -1791,12 +1775,13 @@ impl FrameBuilder {
         Frame {
             window_size,
             inner_rect: self.screen_rect,
-            device_pixel_ratio,
+            device_pixel_ratio: device_pixel_scale.0,
             background_color: self.background_color,
             layer,
             profile_counters,
             passes,
             node_data,
+            clip_chain_local_clip_rects,
             render_tasks,
             deferred_resolves,
             gpu_cache_updates: Some(gpu_cache_updates),
diff --git a/gfx/webrender/src/glyph_rasterizer.rs b/gfx/webrender/src/glyph_rasterizer.rs
index 05bca07b6649..9bf21bf7a7b7 100644
--- a/gfx/webrender/src/glyph_rasterizer.rs
+++ b/gfx/webrender/src/glyph_rasterizer.rs
@@ -25,8 +25,11 @@ use std::mem;
 use std::sync::{Arc, Mutex, MutexGuard};
 use std::sync::mpsc::{channel, Receiver, Sender};
 use texture_cache::{TextureCache, TextureCacheHandle};
+#[cfg(test)]
+use thread_profiler::register_thread_with_profiler;
 
 #[derive(Clone, Copy, Debug, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct FontTransform {
     pub scale_x: f32,
     pub skew_x: f32,
@@ -99,25 +102,17 @@ impl FontTransform {
         )
     }
 
-    #[allow(dead_code)]
-    pub fn inverse(&self) -> Option<Self> {
-        let det = self.determinant();
-        if det != 0.0 {
-            let inv_det = det.recip() as f32;
-            Some(FontTransform::new(
-                self.scale_y * inv_det,
-                -self.skew_x * inv_det,
-                -self.skew_y * inv_det,
-                self.scale_x * inv_det
-            ))
-        } else {
-            None
-        }
+    pub fn invert_scale(&self, x_scale: f64, y_scale: f64) -> Self {
+        self.pre_scale(x_scale.recip() as f32, y_scale.recip() as f32)
     }
 
-    #[allow(dead_code)]
-    pub fn apply(&self, x: f32, y: f32) -> (f32, f32) {
-        (self.scale_x * x + self.skew_x * y, self.skew_y * x + self.scale_y * y)
+    pub fn synthesize_italics(&self, skew_factor: f32) -> Self {
+        FontTransform::new(
+            self.scale_x,
+            self.skew_x - self.scale_x * skew_factor,
+            self.skew_y,
+            self.scale_y - self.skew_y * skew_factor,
+        )
     }
 }
 
@@ -128,6 +123,7 @@ impl<'a> From<&'a LayerToWorldTransform> for FontTransform {
 }
 
 #[derive(Clone, Hash, PartialEq, Eq, Debug, Ord, PartialOrd)]
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct FontInstance {
     pub font_key: FontKey,
     // The font size is in *device* pixels, not logical pixels.
@@ -567,6 +563,13 @@ impl GlyphRasterizer {
             });
         }
     }
+
+    #[cfg(feature = "capture")]
+    pub fn reset(&mut self) {
+        //TODO: any signals need to be sent to the workers?
+        self.pending_glyphs.clear();
+        self.fonts_to_remove.clear();
+    }
 }
 
 impl FontContext {
@@ -603,7 +606,7 @@ struct GlyphRasterJob {
 }
 
 #[test]
-fn raterize_200_glyphs() {
+fn rasterize_200_glyphs() {
     // This test loads a font from disc, the renders 4 requests containing
     // 50 glyphs each, deletes the font and waits for the result.
 
@@ -611,7 +614,12 @@ fn raterize_200_glyphs() {
     use std::fs::File;
     use std::io::Read;
 
-    let workers = Arc::new(ThreadPool::new(Configuration::new()).unwrap());
+    let worker_config = Configuration::new()
+        .thread_name(|idx|{ format!("WRWorker#{}", idx) })
+        .start_handler(move |idx| {
+            register_thread_with_profiler(format!("WRWorker#{}", idx));
+        });
+    let workers = Arc::new(ThreadPool::new(worker_config).unwrap());
     let mut glyph_rasterizer = GlyphRasterizer::new(workers);
     let mut glyph_cache = GlyphCache::new();
     let mut gpu_cache = GpuCache::new();
diff --git a/gfx/webrender/src/gpu_types.rs b/gfx/webrender/src/gpu_types.rs
index 293fe76d74e0..5116f58f95ef 100644
--- a/gfx/webrender/src/gpu_types.rs
+++ b/gfx/webrender/src/gpu_types.rs
@@ -2,7 +2,7 @@
  * 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/. */
 
-use api::{LayerVector2D, LayerRect, LayerToWorldTransform};
+use api::{LayerRect, LayerToWorldTransform};
 use gpu_cache::GpuCacheAddress;
 use render_task::RenderTaskAddress;
 
@@ -47,7 +47,7 @@ pub struct SimplePrimitiveInstance {
     pub specific_prim_address: GpuCacheAddress,
     pub task_address: RenderTaskAddress,
     pub clip_task_address: RenderTaskAddress,
-    pub clip_id: ClipScrollNodeIndex,
+    pub clip_chain_rect_index: ClipChainRectIndex,
     pub scroll_id: ClipScrollNodeIndex,
     pub z_sort_index: i32,
 }
@@ -57,7 +57,7 @@ impl SimplePrimitiveInstance {
         specific_prim_address: GpuCacheAddress,
         task_address: RenderTaskAddress,
         clip_task_address: RenderTaskAddress,
-        clip_id: ClipScrollNodeIndex,
+        clip_chain_rect_index: ClipChainRectIndex,
         scroll_id: ClipScrollNodeIndex,
         z_sort_index: i32,
     ) -> SimplePrimitiveInstance {
@@ -65,7 +65,7 @@ impl SimplePrimitiveInstance {
             specific_prim_address,
             task_address,
             clip_task_address,
-            clip_id,
+            clip_chain_rect_index,
             scroll_id,
             z_sort_index,
         }
@@ -77,7 +77,7 @@ impl SimplePrimitiveInstance {
                 self.specific_prim_address.as_int(),
                 self.task_address.0 as i32,
                 self.clip_task_address.0 as i32,
-                ((self.clip_id.0 as i32) << 16) | self.scroll_id.0 as i32,
+                ((self.clip_chain_rect_index.0 as i32) << 16) | self.scroll_id.0 as i32,
                 self.z_sort_index,
                 data0,
                 data1,
@@ -150,11 +150,11 @@ impl From<CompositePrimitiveInstance> for PrimitiveInstance {
 pub struct BrushInstance {
     pub picture_address: RenderTaskAddress,
     pub prim_address: GpuCacheAddress,
-    pub clip_id: ClipScrollNodeIndex,
+    pub clip_chain_rect_index: ClipChainRectIndex,
     pub scroll_id: ClipScrollNodeIndex,
     pub clip_task_address: RenderTaskAddress,
     pub z: i32,
-    pub segment_kind: i32,
+    pub segment_index: i32,
     pub user_data0: i32,
     pub user_data1: i32,
 }
@@ -165,10 +165,10 @@ impl From<BrushInstance> for PrimitiveInstance {
             data: [
                 instance.picture_address.0 as i32,
                 instance.prim_address.as_int(),
-                ((instance.clip_id.0 as i32) << 16) | instance.scroll_id.0 as i32,
+                ((instance.clip_chain_rect_index.0 as i32) << 16) | instance.scroll_id.0 as i32,
                 instance.clip_task_address.0 as i32,
                 instance.z,
-                instance.segment_kind,
+                instance.segment_index,
                 instance.user_data0,
                 instance.user_data1,
             ]
@@ -195,20 +195,6 @@ pub struct ClipScrollNodeIndex(pub u32);
 #[repr(C)]
 pub struct ClipScrollNodeData {
     pub transform: LayerToWorldTransform,
-
-    /// Viewport rectangle clipped against parent viewport rectangles.  This is
-    /// in the coordinate system of the node origin.  Precisely, it combines the
-    /// local clipping rectangles of all the parent nodes on the way to the root,
-    /// including those of `ClipRegion` rectangles.  The combined clip is reset to
-    /// maximum when an incompatible coordinate system is encountered.
-    pub local_clip_rect: LayerRect,
-
-    /// The scroll offset of all the nodes between us and our parent reference frame.
-    /// This is used to calculate intersections between us and content or nodes that
-    /// are also direct children of our reference frame.
-    pub reference_frame_relative_scroll_offset: LayerVector2D,
-
-    pub scroll_offset: LayerVector2D,
     pub transform_kind: f32,
     pub padding: [f32; 3],
 }
@@ -217,11 +203,20 @@ impl ClipScrollNodeData {
     pub fn invalid() -> ClipScrollNodeData {
         ClipScrollNodeData {
             transform: LayerToWorldTransform::identity(),
-            local_clip_rect: LayerRect::zero(),
-            reference_frame_relative_scroll_offset: LayerVector2D::zero(),
-            scroll_offset: LayerVector2D::zero(),
             transform_kind: 0.0,
             padding: [0.0; 3],
         }
     }
 }
+
+#[derive(Copy, Debug, Clone, PartialEq)]
+#[repr(C)]
+pub struct ClipChainRectIndex(pub usize);
+
+#[derive(Copy, Debug, Clone, PartialEq)]
+#[repr(C)]
+pub enum PictureType {
+    Image = 1,
+    TextShadow = 2,
+    BoxShadow = 3,
+}
diff --git a/gfx/webrender/src/internal_types.rs b/gfx/webrender/src/internal_types.rs
index 1e04fb8da53f..3fe6498dacc9 100644
--- a/gfx/webrender/src/internal_types.rs
+++ b/gfx/webrender/src/internal_types.rs
@@ -5,6 +5,8 @@
 use api::{ClipId, DevicePoint, DeviceUintRect, DocumentId, Epoch};
 use api::{ExternalImageData, ExternalImageId};
 use api::{ImageFormat, PipelineId};
+#[cfg(feature = "capture")]
+use api::ImageDescriptor;
 use api::DebugCommand;
 use device::TextureFilter;
 use fxhash::FxHasher;
@@ -57,37 +59,6 @@ pub enum SourceTexture {
 pub const ORTHO_NEAR_PLANE: f32 = -1000000.0;
 pub const ORTHO_FAR_PLANE: f32 = 1000000.0;
 
-/// Optional textures that can be used as a source in the shaders.
-/// Textures that are not used by the batch are equal to TextureId::invalid().
-#[derive(Copy, Clone, Debug)]
-pub struct BatchTextures {
-    pub colors: [SourceTexture; 3],
-}
-
-impl BatchTextures {
-    pub fn no_texture() -> Self {
-        BatchTextures {
-            colors: [SourceTexture::Invalid; 3],
-        }
-    }
-
-    pub fn render_target_cache() -> Self {
-        BatchTextures {
-            colors: [
-                SourceTexture::CacheRGBA8,
-                SourceTexture::CacheA8,
-                SourceTexture::Invalid,
-            ],
-        }
-    }
-
-    pub fn color(texture: SourceTexture) -> Self {
-        BatchTextures {
-            colors: [texture, SourceTexture::Invalid, SourceTexture::Invalid],
-        }
-    }
-}
-
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct RenderTargetInfo {
     pub has_depth: bool,
@@ -171,9 +142,20 @@ impl RenderedDocument {
     }
 }
 
+#[cfg(feature = "capture")]
+pub struct ExternalCaptureImage {
+    pub short_path: String,
+    pub descriptor: ImageDescriptor,
+    pub external: ExternalImageData,
+}
+
 pub enum DebugOutput {
     FetchDocuments(String),
     FetchClipScrollTree(String),
+    #[cfg(feature = "capture")]
+    SaveCapture(PathBuf, Vec<ExternalCaptureImage>),
+    #[cfg(feature = "capture")]
+    LoadCapture,
 }
 
 pub enum ResultMsg {
diff --git a/gfx/webrender/src/lib.rs b/gfx/webrender/src/lib.rs
index ccc1f954210a..0ade76834a39 100644
--- a/gfx/webrender/src/lib.rs
+++ b/gfx/webrender/src/lib.rs
@@ -48,7 +48,11 @@ extern crate lazy_static;
 extern crate log;
 #[macro_use]
 extern crate thread_profiler;
+#[cfg(any(feature = "debugger", feature = "capture"))]
+#[macro_use]
+extern crate serde;
 
+mod batch;
 mod border;
 mod box_shadow;
 mod clip;
@@ -83,6 +87,7 @@ mod render_task;
 mod renderer;
 mod resource_cache;
 mod scene;
+mod segment;
 mod spring;
 mod texture_allocator;
 mod texture_cache;
@@ -139,9 +144,8 @@ extern crate gleam;
 extern crate num_traits;
 extern crate plane_split;
 extern crate rayon;
-#[cfg(feature = "debugger")]
-#[macro_use]
-extern crate serde_derive;
+#[cfg(feature = "capture")]
+extern crate ron;
 #[cfg(feature = "debugger")]
 extern crate serde_json;
 extern crate smallvec;
diff --git a/gfx/webrender/src/picture.rs b/gfx/webrender/src/picture.rs
index 60cbc93b548c..ca41acdcf10f 100644
--- a/gfx/webrender/src/picture.rs
+++ b/gfx/webrender/src/picture.rs
@@ -3,13 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{ColorF, ClipAndScrollInfo, FilterOp, MixBlendMode};
-use api::{device_length, DeviceIntRect, DeviceIntSize, PipelineId};
-use api::{BoxShadowClipMode, LayerPoint, LayerRect, LayerSize, LayerVector2D, Shadow};
+use api::{DeviceIntPoint, DeviceIntRect, LayerToWorldScale, PipelineId};
+use api::{BoxShadowClipMode, LayerPoint, LayerRect, LayerVector2D, Shadow};
 use api::{ClipId, PremultipliedColorF};
 use box_shadow::{BLUR_SAMPLE_SCALE, BoxShadowCacheKey};
 use frame_builder::PrimitiveContext;
 use gpu_cache::GpuDataRequest;
-use gpu_types::BrushImageKind;
+use gpu_types::{BrushImageKind, PictureType};
 use prim_store::{PrimitiveIndex, PrimitiveRun, PrimitiveRunLocalRect};
 use render_task::{ClearMode, RenderTask, RenderTaskId, RenderTaskTree};
 use scene::{FilterOpHelpers, SceneProperties};
@@ -38,13 +38,12 @@ pub enum PictureCompositeMode {
     Blit,
 }
 
-/// Configure whether the primitives on this picture
-/// should be rasterized in screen space or local space.
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum RasterizationSpace {
-    Local = 0,
-    Screen = 1,
+/// Configure whether the content to be drawn by a picture
+/// in local space rasterization or the screen space.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum ContentOrigin {
+    Local(LayerPoint),
+    Screen(DeviceIntPoint),
 }
 
 #[derive(Debug)]
@@ -108,10 +107,6 @@ pub struct PicturePrimitive {
     // picture. For text shadows and box shadows, we want to
     // unconditionally draw them.
     pub cull_children: bool,
-
-    /// Configure whether the primitives on this picture
-    /// should be rasterized in screen space or local space.
-    pub rasterization_kind: RasterizationSpace,
 }
 
 impl PicturePrimitive {
@@ -127,7 +122,6 @@ impl PicturePrimitive {
             },
             pipeline_id,
             cull_children: false,
-            rasterization_kind: RasterizationSpace::Local,
         }
     }
 
@@ -175,7 +169,6 @@ impl PicturePrimitive {
             },
             pipeline_id,
             cull_children: false,
-            rasterization_kind: RasterizationSpace::Local,
         }
     }
 
@@ -185,7 +178,7 @@ impl PicturePrimitive {
         pipeline_id: PipelineId,
         reference_frame_id: ClipId,
         frame_output_pipeline_id: Option<PipelineId>,
-    ) -> PicturePrimitive {
+    ) -> Self {
         PicturePrimitive {
             runs: Vec::new(),
             render_task_id: None,
@@ -199,9 +192,6 @@ impl PicturePrimitive {
             },
             pipeline_id,
             cull_children: true,
-            // TODO(gw): Make this configurable based on an
-            //           exposed API parameter in StackingContext.
-            rasterization_kind: RasterizationSpace::Screen,
         }
     }
 
@@ -262,46 +252,48 @@ impl PicturePrimitive {
             }
             PictureKind::BoxShadow { blur_radius, clip_mode, image_kind, ref mut content_rect, .. } => {
                 // We need to inflate the content rect if outset.
-                match clip_mode {
+                *content_rect = match clip_mode {
                     BoxShadowClipMode::Outset => {
-                        let blur_offset = blur_radius * BLUR_SAMPLE_SCALE;
-
-                        // If the radii are uniform, we can render just the top
-                        // left corner and mirror it across the primitive. In
-                        // this case, shift the content rect to leave room
-                        // for the blur to take effect.
                         match image_kind {
                             BrushImageKind::Mirror => {
-                                let origin = LayerPoint::new(
-                                    local_content_rect.origin.x - blur_offset,
-                                    local_content_rect.origin.y - blur_offset,
-                                );
-                                let size = LayerSize::new(
-                                    local_content_rect.size.width + blur_offset,
-                                    local_content_rect.size.height + blur_offset,
-                                );
-                                *content_rect = LayerRect::new(origin, size);
+                                let half_offset = 0.5 * blur_radius * BLUR_SAMPLE_SCALE;
+                                // If the radii are uniform, we can render just the top
+                                // left corner and mirror it across the primitive. In
+                                // this case, shift the content rect to leave room
+                                // for the blur to take effect.
+                                local_content_rect
+                                    .translate(&-LayerVector2D::new(half_offset, half_offset))
+                                    .inflate(half_offset, half_offset)
                             }
                             BrushImageKind::NinePatch | BrushImageKind::Simple => {
+                                let full_offset = blur_radius * BLUR_SAMPLE_SCALE;
                                 // For a non-uniform radii, we need to expand
                                 // the content rect on all sides for the blur.
-                                *content_rect = local_content_rect.inflate(
-                                    blur_offset,
-                                    blur_offset,
-                                );
+                                local_content_rect.inflate(
+                                    full_offset,
+                                    full_offset,
+                                )
                             }
                         }
                     }
                     BoxShadowClipMode::Inset => {
-                        *content_rect = local_content_rect;
+                        local_content_rect
                     }
-                }
+                };
 
                 prim_local_rect
             }
         }
     }
 
+    pub fn picture_type(&self) -> PictureType {
+        match self.kind {
+            PictureKind::Image { .. } => PictureType::Image,
+            PictureKind::BoxShadow { .. } => PictureType::BoxShadow,
+            PictureKind::TextShadow { .. } => PictureType::TextShadow,
+        }
+    }
+
     pub fn prepare_for_render(
         &mut self,
         prim_index: PrimitiveIndex,
@@ -311,29 +303,30 @@ impl PicturePrimitive {
         child_tasks: Vec<RenderTaskId>,
         parent_tasks: &mut Vec<RenderTaskId>,
     ) {
+        let content_scale = LayerToWorldScale::new(1.0) * prim_context.device_pixel_scale;
+
         match self.kind {
             PictureKind::Image {
                 ref mut secondary_render_task_id,
                 composite_mode,
                 ..
             } => {
+                let content_origin = ContentOrigin::Screen(prim_screen_rect.origin);
                 match composite_mode {
                     Some(PictureCompositeMode::Filter(FilterOp::Blur(blur_radius))) => {
                         let picture_task = RenderTask::new_picture(
                             Some(prim_screen_rect.size),
                             prim_index,
                             RenderTargetKind::Color,
-                            prim_screen_rect.origin.x as f32,
-                            prim_screen_rect.origin.y as f32,
+                            content_origin,
                             PremultipliedColorF::TRANSPARENT,
                             ClearMode::Transparent,
-                            self.rasterization_kind,
                             child_tasks,
                             None,
+                            PictureType::Image,
                         );
 
-                        let blur_radius = device_length(blur_radius, prim_context.device_pixel_ratio);
-                        let blur_std_deviation = blur_radius.0 as f32;
+                        let blur_std_deviation = blur_radius * prim_context.device_pixel_scale.0;
                         let picture_task_id = render_tasks.add(picture_task);
 
                         let blur_render_task = RenderTask::new_blur(
@@ -351,24 +344,24 @@ impl PicturePrimitive {
                         self.render_task_id = Some(blur_render_task_id);
                     }
                     Some(PictureCompositeMode::Filter(FilterOp::DropShadow(offset, blur_radius, color))) => {
+                        let screen_offset = (offset * content_scale).round().to_i32();
                         let picture_task = RenderTask::new_picture(
                             Some(prim_screen_rect.size),
                             prim_index,
                             RenderTargetKind::Color,
-                            prim_screen_rect.origin.x as f32 - offset.x,
-                            prim_screen_rect.origin.y as f32 - offset.y,
+                            ContentOrigin::Screen(prim_screen_rect.origin - screen_offset),
                             PremultipliedColorF::TRANSPARENT,
                             ClearMode::Transparent,
-                            self.rasterization_kind,
                             child_tasks,
                             None,
+                            PictureType::Image,
                         );
 
-                        let blur_std_deviation = blur_radius * prim_context.device_pixel_ratio;
+                        let blur_std_deviation = blur_radius * prim_context.device_pixel_scale.0;
                         let picture_task_id = render_tasks.add(picture_task);
 
                         let blur_render_task = RenderTask::new_blur(
-                            blur_std_deviation,
+                            blur_std_deviation.round(),
                             picture_task_id,
                             render_tasks,
                             RenderTargetKind::Color,
@@ -386,13 +379,12 @@ impl PicturePrimitive {
                             Some(prim_screen_rect.size),
                             prim_index,
                             RenderTargetKind::Color,
-                            prim_screen_rect.origin.x as f32,
-                            prim_screen_rect.origin.y as f32,
+                            content_origin,
                             PremultipliedColorF::TRANSPARENT,
                             ClearMode::Transparent,
-                            self.rasterization_kind,
                             child_tasks,
                             None,
+                            PictureType::Image,
                         );
 
                         let readback_task_id = render_tasks.add(RenderTask::new_readback(*prim_screen_rect));
@@ -416,13 +408,12 @@ impl PicturePrimitive {
                                 Some(prim_screen_rect.size),
                                 prim_index,
                                 RenderTargetKind::Color,
-                                prim_screen_rect.origin.x as f32,
-                                prim_screen_rect.origin.y as f32,
+                                content_origin,
                                 PremultipliedColorF::TRANSPARENT,
                                 ClearMode::Transparent,
-                                self.rasterization_kind,
                                 child_tasks,
                                 None,
+                                PictureType::Image,
                             );
 
                             self.render_task_id = Some(render_tasks.add(picture_task));
@@ -433,13 +424,12 @@ impl PicturePrimitive {
                             Some(prim_screen_rect.size),
                             prim_index,
                             RenderTargetKind::Color,
-                            prim_screen_rect.origin.x as f32,
-                            prim_screen_rect.origin.y as f32,
+                            content_origin,
                             PremultipliedColorF::TRANSPARENT,
                             ClearMode::Transparent,
-                            self.rasterization_kind,
                             child_tasks,
                             None,
+                            PictureType::Image,
                         );
 
                         self.render_task_id = Some(render_tasks.add(picture_task));
@@ -456,35 +446,29 @@ impl PicturePrimitive {
                 // blur to that text run in order to build the actual primitive
                 // which will be blitted to the framebuffer.
 
-                let blur_radius = device_length(blur_radius, prim_context.device_pixel_ratio);
-
                 // TODO(gw): Rounding the content rect here to device pixels is not
                 // technically correct. Ideally we should ceil() here, and ensure that
                 // the extra part pixel in the case of fractional sizes is correctly
                 // handled. For now, just use rounding which passes the existing
                 // Gecko tests.
-                let cache_width =
-                    (content_rect.size.width * prim_context.device_pixel_ratio).round() as i32;
-                let cache_height =
-                    (content_rect.size.height * prim_context.device_pixel_ratio).round() as i32;
-                let cache_size = DeviceIntSize::new(cache_width, cache_height);
+                let cache_size = (content_rect.size * content_scale).round().to_i32();
 
                 // Quote from https://drafts.csswg.org/css-backgrounds-3/#shadow-blur
                 // "the image that would be generated by applying to the shadow a
                 // Gaussian blur with a standard deviation equal to half the blur radius."
-                let blur_std_deviation = blur_radius.0 as f32 * 0.5;
+                let device_radius = (blur_radius * prim_context.device_pixel_scale.0).round();
+                let blur_std_deviation = device_radius * 0.5;
 
                 let picture_task = RenderTask::new_picture(
                     Some(cache_size),
                     prim_index,
                     RenderTargetKind::Color,
-                    content_rect.origin.x,
-                    content_rect.origin.y,
+                    ContentOrigin::Local(content_rect.origin),
                     color.premultiplied(),
                     ClearMode::Transparent,
-                    self.rasterization_kind,
                     Vec::new(),
                     None,
+                    PictureType::TextShadow,
                 );
 
                 let picture_task_id = render_tasks.add(picture_task);
@@ -503,23 +487,18 @@ impl PicturePrimitive {
                 self.render_task_id = Some(render_tasks.add(render_task));
             }
             PictureKind::BoxShadow { blur_radius, clip_mode, ref blur_regions, color, content_rect, cache_key, .. } => {
-                let blur_radius = device_length(blur_radius, prim_context.device_pixel_ratio);
-
                 // TODO(gw): Rounding the content rect here to device pixels is not
                 // technically correct. Ideally we should ceil() here, and ensure that
                 // the extra part pixel in the case of fractional sizes is correctly
                 // handled. For now, just use rounding which passes the existing
                 // Gecko tests.
-                let cache_width =
-                    (content_rect.size.width * prim_context.device_pixel_ratio).round() as i32;
-                let cache_height =
-                    (content_rect.size.height * prim_context.device_pixel_ratio).round() as i32;
-                let cache_size = DeviceIntSize::new(cache_width, cache_height);
+                let cache_size = (content_rect.size * content_scale).round().to_i32();
 
                 // Quote from https://drafts.csswg.org/css-backgrounds-3/#shadow-blur
                 // "the image that would be generated by applying to the shadow a
                 // Gaussian blur with a standard deviation equal to half the blur radius."
-                let blur_std_deviation = blur_radius.0 as f32 * 0.5;
+                let device_radius = (blur_radius * prim_context.device_pixel_scale.0).round();
+                let blur_std_deviation = device_radius * 0.5;
 
                 let blur_clear_mode = match clip_mode {
                     BoxShadowClipMode::Outset => {
@@ -534,13 +513,12 @@ impl PicturePrimitive {
                     Some(cache_size),
                     prim_index,
                     RenderTargetKind::Alpha,
-                    content_rect.origin.x,
-                    content_rect.origin.y,
+                    ContentOrigin::Local(content_rect.origin),
                     color.premultiplied(),
                     ClearMode::Zero,
-                    self.rasterization_kind,
                     Vec::new(),
                     Some(cache_key),
+                    PictureType::BoxShadow,
                 );
 
                 let picture_task_id = render_tasks.add(picture_task);
diff --git a/gfx/webrender/src/platform/macos/font.rs b/gfx/webrender/src/platform/macos/font.rs
index 83d7c211fb12..9d3d70658cb7 100644
--- a/gfx/webrender/src/platform/macos/font.rs
+++ b/gfx/webrender/src/platform/macos/font.rs
@@ -22,7 +22,7 @@ use core_text;
 use core_text::font::{CTFont, CTFontRef};
 use core_text::font_descriptor::{kCTFontDefaultOrientation, kCTFontColorGlyphsTrait};
 use gamma_lut::{ColorLut, GammaLut};
-use glyph_rasterizer::{FontInstance, GlyphFormat, RasterizedGlyph};
+use glyph_rasterizer::{FontInstance, FontTransform, GlyphFormat, RasterizedGlyph};
 use internal_types::FastHashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Arc;
@@ -264,6 +264,9 @@ fn is_bitmap_font(ct_font: &CTFont) -> bool {
     (traits & kCTFontColorGlyphsTrait) != 0
 }
 
+// Skew factor matching Gecko/CG.
+const OBLIQUE_SKEW_FACTOR: f32 = 0.25;
+
 impl FontContext {
     pub fn new() -> FontContext {
         debug!("Test for subpixel AA support: {}", supports_subpixel_aa());
@@ -358,7 +361,28 @@ impl FontContext {
                 let glyph = key.index as CGGlyph;
                 let bitmap = is_bitmap_font(ct_font);
                 let (x_offset, y_offset) = if bitmap { (0.0, 0.0) } else { font.get_subpx_offset(key) };
-                let metrics = get_glyph_metrics(ct_font, None, glyph, x_offset, y_offset, 0.0);
+                let transform = if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+                    let shape = FontTransform::identity().synthesize_italics(OBLIQUE_SKEW_FACTOR);
+                    Some(CGAffineTransform {
+                        a: shape.scale_x as f64,
+                        b: -shape.skew_y as f64,
+                        c: -shape.skew_x as f64,
+                        d: shape.scale_y as f64,
+                        tx: 0.0,
+                        ty: 0.0,
+                    })
+                } else {
+                    None
+                };
+                let extra_strikes = font.get_extra_strikes(1.0);
+                let metrics = get_glyph_metrics(
+                    ct_font,
+                    transform.as_ref(),
+                    glyph,
+                    x_offset,
+                    y_offset,
+                    extra_strikes as f64,
+                );
                 if metrics.rasterized_width == 0 || metrics.rasterized_height == 0 {
                     None
                 } else {
@@ -454,22 +478,28 @@ impl FontContext {
         };
 
         let bitmap = is_bitmap_font(&ct_font);
-        let shape = font.transform.pre_scale(y_scale.recip() as f32, y_scale.recip() as f32);
-        let transform = if bitmap || shape.is_identity() {
-            None
+        let (mut shape, (x_offset, y_offset)) = if bitmap {
+            (FontTransform::identity(), (0.0, 0.0))
         } else {
+            (font.transform.invert_scale(y_scale, y_scale), font.get_subpx_offset(key))
+        };
+        if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+            shape = shape.synthesize_italics(OBLIQUE_SKEW_FACTOR);
+        }
+        let transform = if !shape.is_identity() {
             Some(CGAffineTransform {
                 a: shape.scale_x as f64,
                 b: -shape.skew_y as f64,
                 c: -shape.skew_x as f64,
                 d: shape.scale_y as f64,
                 tx: 0.0,
-                ty: 0.0
+                ty: 0.0,
             })
+        } else {
+            None
         };
 
         let glyph = key.index as CGGlyph;
-        let (x_offset, y_offset) = if bitmap { (0.0, 0.0) } else { font.get_subpx_offset(key) };
         let (strike_scale, pixel_step) = if bitmap { (y_scale, 1.0) } else { (x_scale, y_scale / x_scale) };
         let extra_strikes = font.get_extra_strikes(strike_scale);
         let metrics = get_glyph_metrics(
diff --git a/gfx/webrender/src/platform/unix/font.rs b/gfx/webrender/src/platform/unix/font.rs
index e55567e79090..814466183543 100644
--- a/gfx/webrender/src/platform/unix/font.rs
+++ b/gfx/webrender/src/platform/unix/font.rs
@@ -53,7 +53,56 @@ unsafe impl Send for FontContext {}
 
 extern "C" {
     fn FT_GlyphSlot_Embolden(slot: FT_GlyphSlot);
-    fn FT_GlyphSlot_Oblique(slot: FT_GlyphSlot);
+}
+
+// Skew factor matching Gecko/FreeType.
+const OBLIQUE_SKEW_FACTOR: f32 = 0.2;
+
+fn get_skew_bounds(bottom: i32, top: i32) -> (f32, f32) {
+    let skew_min = ((bottom as f32 + 0.5) * OBLIQUE_SKEW_FACTOR).floor();
+    let skew_max = ((top as f32 - 0.5) * OBLIQUE_SKEW_FACTOR).ceil();
+    (skew_min, skew_max)
+}
+
+fn skew_bitmap(bitmap: &[u8], width: usize, height: usize, left: i32, top: i32) -> (Vec<u8>, usize, i32) {
+    let stride = width * 4;
+    // Calculate the skewed horizontal offsets of the bottom and top of the glyph.
+    let (skew_min, skew_max) = get_skew_bounds(top - height as i32, top);
+    // Allocate enough extra width for the min/max skew offsets.
+    let skew_width = width + (skew_max - skew_min) as usize;
+    let mut skew_buffer = vec![0u8; skew_width * height * 4];
+    for y in 0 .. height {
+        // Calculate a skew offset at the vertical center of the current row.
+        let offset = (top as f32 - y as f32 - 0.5) * OBLIQUE_SKEW_FACTOR - skew_min;
+        // Get a blend factor in 0..256 constant across all pixels in the row.
+        let blend = (offset.fract() * 256.0) as u32;
+        let src_row = y * stride;
+        let dest_row = (y * skew_width + offset.floor() as usize) * 4;
+        let mut prev_px = [0u32; 4];
+        for (src, dest) in
+            bitmap[src_row .. src_row + stride].chunks(4).zip(
+                skew_buffer[dest_row .. dest_row + stride].chunks_mut(4)
+            ) {
+            let px = [src[0] as u32, src[1] as u32, src[2] as u32, src[3] as u32];
+            // Blend current pixel with previous pixel based on blend factor.
+            let next_px = [px[0] * blend, px[1] * blend, px[2] * blend, px[3] * blend];
+            dest[0] = ((((px[0] << 8) - next_px[0]) + prev_px[0] + 128) >> 8) as u8;
+            dest[1] = ((((px[1] << 8) - next_px[1]) + prev_px[1] + 128) >> 8) as u8;
+            dest[2] = ((((px[2] << 8) - next_px[2]) + prev_px[2] + 128) >> 8) as u8;
+            dest[3] = ((((px[3] << 8) - next_px[3]) + prev_px[3] + 128) >> 8) as u8;
+            // Save the remainder for blending onto the next pixel.
+            prev_px = next_px;
+        }
+        // If the skew misaligns the final pixel, write out the remainder.
+        if blend > 0 {
+            let dest = &mut skew_buffer[dest_row + stride .. dest_row + stride + 4];
+            dest[0] = ((prev_px[0] + 128) >> 8) as u8;
+            dest[1] = ((prev_px[1] + 128) >> 8) as u8;
+            dest[2] = ((prev_px[2] + 128) >> 8) as u8;
+            dest[3] = ((prev_px[3] + 128) >> 8) as u8;
+        }
+    }
+    (skew_buffer, skew_width, left + skew_min as i32)
 }
 
 impl FontContext {
@@ -151,7 +200,13 @@ impl FontContext {
         let face = self.faces.get(&font.font_key).unwrap();
 
         let mut load_flags = FT_LOAD_DEFAULT;
-        let FontInstancePlatformOptions { hinting, .. } = font.platform_options.unwrap_or_default();
+        let FontInstancePlatformOptions { mut hinting, .. } = font.platform_options.unwrap_or_default();
+        // Disable hinting if there is a non-axis-aligned transform.
+        if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) ||
+           ((font.transform.scale_x != 0.0 || font.transform.scale_y != 0.0) &&
+            (font.transform.skew_x != 0.0 || font.transform.skew_y != 0.0)) {
+            hinting = FontHinting::None;
+        }
         match (hinting, font.render_mode) {
             (FontHinting::None, _) => load_flags |= FT_LOAD_NO_HINTING,
             (FontHinting::Mono, _) => load_flags = FT_LOAD_TARGET_MONO,
@@ -194,7 +249,10 @@ impl FontContext {
             unsafe { FT_Set_Transform(face.face, ptr::null_mut(), ptr::null_mut()) };
             self.choose_bitmap_size(face.face, req_size * y_scale)
         } else {
-            let shape = font.transform.pre_scale(x_scale.recip() as f32, y_scale.recip() as f32);
+            let mut shape = font.transform.invert_scale(x_scale, y_scale);
+            if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+                shape = shape.synthesize_italics(OBLIQUE_SKEW_FACTOR);
+            };
             let mut ft_shape = FT_Matrix {
                 xx: (shape.scale_x * 65536.0) as FT_Fixed,
                 xy: (shape.skew_x * -65536.0) as FT_Fixed,
@@ -305,40 +363,42 @@ impl FontContext {
         slot: FT_GlyphSlot,
         font: &FontInstance,
         glyph: &GlyphKey,
-        scale_bitmaps: bool,
+        transform_bitmaps: bool,
     ) -> Option<GlyphDimensions> {
         let metrics = unsafe { &(*slot).metrics };
 
-        let advance = metrics.horiAdvance as f32 / 64.0;
+        let mut advance = metrics.horiAdvance as f32 / 64.0;
         match unsafe { (*slot).format } {
             FT_Glyph_Format::FT_GLYPH_FORMAT_BITMAP => {
-                let left = unsafe { (*slot).bitmap_left };
-                let top = unsafe { (*slot).bitmap_top };
-                let width = unsafe { (*slot).bitmap.width };
-                let height = unsafe { (*slot).bitmap.rows };
-                if scale_bitmaps {
+                let mut left = unsafe { (*slot).bitmap_left };
+                let mut top = unsafe { (*slot).bitmap_top };
+                let mut width = unsafe { (*slot).bitmap.width };
+                let mut height = unsafe { (*slot).bitmap.rows };
+                if transform_bitmaps {
                     let y_size = unsafe { (*(*(*slot).face).size).metrics.y_ppem };
                     let scale = font.size.to_f32_px() / y_size as f32;
                     let x0 = left as f32 * scale;
                     let x1 = width as f32 * scale + x0;
                     let y1 = top as f32 * scale;
                     let y0 = y1 - height as f32 * scale;
-                    Some(GlyphDimensions {
-                        left: x0.round() as i32,
-                        top: y1.round() as i32,
-                        width: (x1.ceil() - x0.floor()) as u32,
-                        height: (y1.ceil() - y0.floor()) as u32,
-                        advance: advance * scale,
-                    })
-                } else {
-                    Some(GlyphDimensions {
-                        left,
-                        top,
-                        width,
-                        height,
-                        advance,
-                    })
+                    left = x0.round() as i32;
+                    top = y1.round() as i32;
+                    width = (x1.ceil() - x0.floor()) as u32;
+                    height = (y1.ceil() - y0.floor()) as u32;
+                    advance *= scale;
+                    if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+                        let (skew_min, skew_max) = get_skew_bounds(top - height as i32, top);
+                        left += skew_min as i32;
+                        width += (skew_max - skew_min) as u32;
+                    }
                 }
+                Some(GlyphDimensions {
+                    left,
+                    top,
+                    width,
+                    height,
+                    advance,
+                })
             }
             FT_Glyph_Format::FT_GLYPH_FORMAT_OUTLINE => {
                 let cbox = self.get_bounding_box(slot, font, glyph);
@@ -429,10 +489,6 @@ impl FontContext {
                 dx - ((cbox.xMin + dx) & !63),
                 dy - ((cbox.yMin + dy) & !63),
             );
-
-            if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
-                FT_GlyphSlot_Oblique(slot);
-            }
         }
 
         if font.render_mode == FontRenderMode::Subpixel {
@@ -514,23 +570,23 @@ impl FontContext {
 
         let bitmap = unsafe { &(*slot).bitmap };
         let pixel_mode = unsafe { mem::transmute(bitmap.pixel_mode as u32) };
-        let (actual_width, actual_height) = match pixel_mode {
+        let (mut actual_width, actual_height) = match pixel_mode {
             FT_Pixel_Mode::FT_PIXEL_MODE_LCD => {
                 assert!(bitmap.width % 3 == 0);
-                ((bitmap.width / 3) as i32, bitmap.rows as i32)
+                ((bitmap.width / 3) as usize, bitmap.rows as usize)
             }
             FT_Pixel_Mode::FT_PIXEL_MODE_LCD_V => {
                 assert!(bitmap.rows % 3 == 0);
-                (bitmap.width as i32, (bitmap.rows / 3) as i32)
+                (bitmap.width as usize, (bitmap.rows / 3) as usize)
             }
             FT_Pixel_Mode::FT_PIXEL_MODE_MONO |
             FT_Pixel_Mode::FT_PIXEL_MODE_GRAY |
             FT_Pixel_Mode::FT_PIXEL_MODE_BGRA => {
-                (bitmap.width as i32, bitmap.rows as i32)
+                (bitmap.width as usize, bitmap.rows as usize)
             }
             _ => panic!("Unsupported {:?}", pixel_mode),
         };
-        let mut final_buffer = vec![0; (actual_width * actual_height * 4) as usize];
+        let mut final_buffer = vec![0u8; actual_width * actual_height * 4];
 
         // Extract the final glyph from FT format into BGRA8 format, which is
         // what WR expects.
@@ -539,7 +595,7 @@ impl FontContext {
         let mut dest: usize = 0;
         while dest < final_buffer.len() {
             let mut src = src_row;
-            let row_end = dest + actual_width as usize * 4;
+            let row_end = dest + actual_width * 4;
             match pixel_mode {
                 FT_Pixel_Mode::FT_PIXEL_MODE_MONO => {
                     while dest < row_end {
@@ -613,10 +669,19 @@ impl FontContext {
         }
 
         match format {
+            FT_Glyph_Format::FT_GLYPH_FORMAT_BITMAP => {
+                if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+                    let (skew_buffer, skew_width, skew_left) =
+                        skew_bitmap(&final_buffer, actual_width, actual_height, left, top);
+                    final_buffer = skew_buffer;
+                    actual_width = skew_width;
+                    left = skew_left;
+                }
+            }
             FT_Glyph_Format::FT_GLYPH_FORMAT_OUTLINE => {
                 unsafe {
                     left += (*slot).bitmap_left;
-                    top += (*slot).bitmap_top - actual_height;
+                    top += (*slot).bitmap_top - height as i32;
                 }
             }
             _ => {}
diff --git a/gfx/webrender/src/platform/windows/font.rs b/gfx/webrender/src/platform/windows/font.rs
index 2f71d61645c0..326800280445 100644
--- a/gfx/webrender/src/platform/windows/font.rs
+++ b/gfx/webrender/src/platform/windows/font.rs
@@ -6,7 +6,7 @@ use api::{FontInstanceFlags, FontKey, FontRenderMode};
 use api::{ColorU, GlyphDimensions, GlyphKey, SubpixelDirection};
 use dwrote;
 use gamma_lut::{ColorLut, GammaLut};
-use glyph_rasterizer::{FontInstance, GlyphFormat, RasterizedGlyph};
+use glyph_rasterizer::{FontInstance, FontTransform, GlyphFormat, RasterizedGlyph};
 use internal_types::FastHashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Arc;
@@ -86,6 +86,9 @@ fn is_bitmap_font(font: &FontInstance) -> bool {
         font.flags.contains(FontInstanceFlags::EMBEDDED_BITMAPS)
 }
 
+// Skew factor matching Gecko/DWrite.
+const OBLIQUE_SKEW_FACTOR: f32 = 0.3;
+
 impl FontContext {
     pub fn new() -> FontContext {
         // These are the default values we use in Gecko.
@@ -160,16 +163,10 @@ impl FontContext {
         &mut self,
         font: &FontInstance,
     ) -> &dwrote::FontFace {
-        if !font.flags.intersects(FontInstanceFlags::SYNTHETIC_BOLD | FontInstanceFlags::SYNTHETIC_ITALICS) {
+        if !font.flags.contains(FontInstanceFlags::SYNTHETIC_BOLD) {
             return self.fonts.get(&font.font_key).unwrap();
         }
-        let mut sims = dwrote::DWRITE_FONT_SIMULATIONS_NONE;
-        if font.flags.contains(FontInstanceFlags::SYNTHETIC_BOLD) {
-            sims = sims | dwrote::DWRITE_FONT_SIMULATIONS_BOLD;
-        }
-        if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
-            sims = sims | dwrote::DWRITE_FONT_SIMULATIONS_OBLIQUE;
-        }
+        let sims = dwrote::DWRITE_FONT_SIMULATIONS_BOLD;
         match self.simulations.entry((font.font_key, sims)) {
             Entry::Occupied(entry) => entry.into_mut(),
             Entry::Vacant(entry) => {
@@ -239,7 +236,20 @@ impl FontContext {
     ) -> Option<GlyphDimensions> {
         let size = font.size.to_f32_px();
         let bitmaps = is_bitmap_font(font);
-        let analysis = self.create_glyph_analysis(font, key, size, None, bitmaps);
+        let transform = if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+            let shape = FontTransform::identity().synthesize_italics(OBLIQUE_SKEW_FACTOR);
+            Some(dwrote::DWRITE_MATRIX {
+                m11: shape.scale_x,
+                m12: shape.skew_y,
+                m21: shape.skew_x,
+                m22: shape.scale_y,
+                dx: 0.0,
+                dy: 0.0,
+            })
+        } else {
+            None
+        };
+        let analysis = self.create_glyph_analysis(font, key, size, transform, bitmaps);
 
         let texture_type = dwrite_texture_type(font.render_mode);
 
@@ -344,11 +354,15 @@ impl FontContext {
         let (.., y_scale) = font.transform.compute_scale().unwrap_or((1.0, 1.0));
         let size = (font.size.to_f64_px() * y_scale) as f32;
         let bitmaps = is_bitmap_font(font);
-        let transform = if bitmaps {
-            None
+        let (mut shape, (x_offset, y_offset)) = if bitmaps {
+            (FontTransform::identity(), (0.0, 0.0))
         } else {
-            let (x_offset, y_offset) = font.get_subpx_offset(key);
-            let shape = font.transform.pre_scale(y_scale.recip() as f32, y_scale.recip() as f32);
+            (font.transform.invert_scale(y_scale, y_scale), font.get_subpx_offset(key))
+        };
+        if font.flags.contains(FontInstanceFlags::SYNTHETIC_ITALICS) {
+            shape = shape.synthesize_italics(OBLIQUE_SKEW_FACTOR);
+        }
+        let transform = if !shape.is_identity() || (x_offset, y_offset) != (0.0, 0.0) {
             Some(dwrote::DWRITE_MATRIX {
                 m11: shape.scale_x,
                 m12: shape.skew_y,
@@ -357,6 +371,8 @@ impl FontContext {
                 dx: x_offset as f32,
                 dy: y_offset as f32,
             })
+        } else {
+            None
         };
 
         let analysis = self.create_glyph_analysis(font, key, size, transform, bitmaps);
diff --git a/gfx/webrender/src/prim_store.rs b/gfx/webrender/src/prim_store.rs
index 37cb1e3035f8..2f9ae00498ed 100644
--- a/gfx/webrender/src/prim_store.rs
+++ b/gfx/webrender/src/prim_store.rs
@@ -3,30 +3,33 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{BorderRadius, BuiltDisplayList, ClipAndScrollInfo, ClipId, ClipMode, ColorF, ColorU};
-use api::{ComplexClipRegion, DeviceIntRect, DevicePoint, ExtendMode, FontRenderMode};
+use api::{DeviceIntRect, DevicePixelScale, DevicePoint};
+use api::{ComplexClipRegion, ExtendMode, FontRenderMode};
 use api::{GlyphInstance, GlyphKey, GradientStop, ImageKey, ImageRendering, ItemRange, ItemTag};
 use api::{LayerPoint, LayerRect, LayerSize, LayerToWorldTransform, LayerVector2D, LineOrientation};
 use api::{LineStyle, PipelineId, PremultipliedColorF, TileOffset, WorldToLayerTransform};
 use api::{YuvColorSpace, YuvFormat};
 use border::BorderCornerInstance;
 use clip_scroll_tree::{CoordinateSystemId, ClipScrollTree};
+use clip_scroll_node::ClipScrollNode;
 use clip::{ClipSource, ClipSourcesHandle, ClipStore};
 use frame_builder::PrimitiveContext;
 use glyph_rasterizer::{FontInstance, FontTransform};
 use internal_types::{FastHashMap};
 use gpu_cache::{GpuBlockData, GpuCache, GpuCacheAddress, GpuCacheHandle, GpuDataRequest,
                 ToGpuBlocks};
-use gpu_types::ClipScrollNodeData;
-use picture::{PictureKind, PicturePrimitive, RasterizationSpace};
+use gpu_types::{ClipChainRectIndex, ClipScrollNodeData};
+use picture::{PictureKind, PicturePrimitive};
 use profiler::FrameProfileCounters;
 use render_task::{ClipChain, ClipChainNode, ClipChainNodeIter, ClipWorkItem, RenderTask};
 use render_task::{RenderTaskId, RenderTaskTree};
 use renderer::{BLOCKS_PER_UV_RECT, MAX_VERTEX_TEXTURE_WIDTH};
 use resource_cache::{ImageProperties, ResourceCache};
 use scene::{ScenePipeline, SceneProperties};
-use std::{mem, u16, usize};
+use segment::SegmentBuilder;
+use std::{mem, usize};
 use std::rc::Rc;
-use util::{MatrixHelpers, calculate_screen_bounding_rect, extract_inner_rect_safe, pack_as_float};
+use util::{MatrixHelpers, calculate_screen_bounding_rect, pack_as_float};
 use util::recycle_vec;
 
 
@@ -183,6 +186,7 @@ pub struct PrimitiveMetadata {
     //           storing them here.
     pub local_rect: LayerRect,
     pub local_clip_rect: LayerRect,
+    pub clip_chain_rect_index: ClipChainRectIndex,
     pub is_backface_visible: bool,
     pub screen_rect: Option<DeviceIntRect>,
 
@@ -219,167 +223,77 @@ impl BrushKind {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
-#[repr(u32)]
-pub enum BrushAntiAliasMode {
-    Primitive = 0,
-    Segment = 1,
-}
-
-#[allow(dead_code)]
-#[derive(Debug, Copy, Clone)]
-#[repr(C)]
-pub enum BrushSegmentKind {
-    TopLeft = 0,
-    TopRight,
-    BottomRight,
-    BottomLeft,
-
-    TopMid,
-    MidRight,
-    BottomMid,
-    MidLeft,
-
-    Center,
+bitflags! {
+    /// Each bit of the edge AA mask is:
+    /// 0, when the edge of the primitive needs to be considered for AA
+    /// 1, when the edge of the segment needs to be considered for AA
+    ///
+    /// *Note*: the bit values have to match the shader logic in
+    /// `write_transform_vertex()` function.
+    pub struct EdgeAaSegmentMask: u8 {
+        const LEFT = 0x1;
+        const TOP = 0x2;
+        const RIGHT = 0x4;
+        const BOTTOM = 0x8;
+    }
 }
 
 #[derive(Debug)]
 pub struct BrushSegment {
     pub local_rect: LayerRect,
     pub clip_task_id: Option<RenderTaskId>,
+    pub may_need_clip_mask: bool,
+    pub edge_flags: EdgeAaSegmentMask,
 }
 
 impl BrushSegment {
-    fn new(
+    pub fn new(
         origin: LayerPoint,
         size: LayerSize,
+        may_need_clip_mask: bool,
+        edge_flags: EdgeAaSegmentMask,
     ) -> BrushSegment {
         BrushSegment {
             local_rect: LayerRect::new(origin, size),
             clip_task_id: None,
+            may_need_clip_mask,
+            edge_flags,
         }
     }
 }
 
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum BrushClipMaskKind {
+    Unknown,
+    Individual,
+    Global,
+}
+
 #[derive(Debug)]
 pub struct BrushSegmentDescriptor {
-    pub top_left_offset: LayerVector2D,
-    pub bottom_right_offset: LayerVector2D,
-    pub segments: [BrushSegment; 9],
-    pub enabled_segments: u16,
-    pub can_optimize_clip_mask: bool,
-}
-
-impl BrushSegmentDescriptor {
-    pub fn new(
-        outer_rect: &LayerRect,
-        inner_rect: &LayerRect,
-        valid_segments: Option<&[BrushSegmentKind]>,
-    ) -> BrushSegmentDescriptor {
-        let p0 = outer_rect.origin;
-        let p1 = inner_rect.origin;
-        let p2 = inner_rect.bottom_right();
-        let p3 = outer_rect.bottom_right();
-
-        let enabled_segments = match valid_segments {
-            Some(valid_segments) => {
-                valid_segments.iter().fold(
-                    0,
-                    |acc, segment| acc | 1 << *segment as u32
-                )
-            }
-            None => u16::MAX,
-        };
-
-        BrushSegmentDescriptor {
-            enabled_segments,
-            can_optimize_clip_mask: false,
-            top_left_offset: p1 - p0,
-            bottom_right_offset: p3 - p2,
-            segments: [
-                BrushSegment::new(
-                    LayerPoint::new(p0.x, p0.y),
-                    LayerSize::new(p1.x - p0.x, p1.y - p0.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p2.x, p0.y),
-                    LayerSize::new(p3.x - p2.x, p1.y - p0.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p2.x, p2.y),
-                    LayerSize::new(p3.x - p2.x, p3.y - p2.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p0.x, p2.y),
-                    LayerSize::new(p1.x - p0.x, p3.y - p2.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p1.x, p0.y),
-                    LayerSize::new(p2.x - p1.x, p1.y - p0.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p2.x, p1.y),
-                    LayerSize::new(p3.x - p2.x, p2.y - p1.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p1.x, p2.y),
-                    LayerSize::new(p2.x - p1.x, p3.y - p2.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p0.x, p1.y),
-                    LayerSize::new(p1.x - p0.x, p2.y - p1.y),
-                ),
-                BrushSegment::new(
-                    LayerPoint::new(p1.x, p1.y),
-                    LayerSize::new(p2.x - p1.x, p2.y - p1.y),
-                ),
-            ],
-        }
-    }
+    pub segments: Vec<BrushSegment>,
+    pub clip_mask_kind: BrushClipMaskKind,
 }
 
 #[derive(Debug)]
 pub struct BrushPrimitive {
     pub kind: BrushKind,
-    pub segment_desc: Option<Box<BrushSegmentDescriptor>>,
-    pub aa_mode: BrushAntiAliasMode,
+    pub segment_desc: Option<BrushSegmentDescriptor>,
 }
 
 impl BrushPrimitive {
     pub fn new(
         kind: BrushKind,
-        segment_desc: Option<Box<BrushSegmentDescriptor>>,
-        aa_mode: BrushAntiAliasMode,
+        segment_desc: Option<BrushSegmentDescriptor>,
     ) -> BrushPrimitive {
         BrushPrimitive {
             kind,
             segment_desc,
-            aa_mode,
         }
     }
-}
 
-impl ToGpuBlocks for BrushPrimitive {
-    fn write_gpu_blocks(&self, mut request: GpuDataRequest) {
-        match self.segment_desc {
-            Some(ref segment_desc) => {
-                request.push([
-                    segment_desc.top_left_offset.x,
-                    segment_desc.top_left_offset.y,
-                    segment_desc.bottom_right_offset.x,
-                    segment_desc.bottom_right_offset.y,
-                ]);
-            }
-            None => {
-                request.push([0.0; 4]);
-            }
-        }
-        request.push([
-            self.aa_mode as u32 as f32,
-            0.0,
-            0.0,
-            0.0,
-        ]);
+    fn write_gpu_blocks(&self, request: &mut GpuDataRequest) {
+        // has to match VECS_PER_SPECIFIC_BRUSH
         match self.kind {
             BrushKind::Solid { color } => {
                 request.push(color.premultiplied());
@@ -430,8 +344,8 @@ pub struct LinePrimitive {
     pub orientation: LineOrientation,
 }
 
-impl ToGpuBlocks for LinePrimitive {
-    fn write_gpu_blocks(&self, mut request: GpuDataRequest) {
+impl LinePrimitive {
+    fn write_gpu_blocks(&self, request: &mut GpuDataRequest) {
         request.push(self.color);
         request.push([
             self.wavy_line_thickness,
@@ -746,13 +660,12 @@ pub struct TextRunPrimitiveCpu {
 impl TextRunPrimitiveCpu {
     pub fn get_font(
         &self,
-        device_pixel_ratio: f32,
-        transform: &LayerToWorldTransform,
-        rasterization_kind: RasterizationSpace,
+        device_pixel_scale: DevicePixelScale,
+        transform: Option<&LayerToWorldTransform>,
     ) -> FontInstance {
         let mut font = self.font.clone();
-        font.size = font.size.scale_by(device_pixel_ratio);
-        if rasterization_kind == RasterizationSpace::Screen {
+        font.size = font.size.scale_by(device_pixel_scale.0);
+        if let Some(transform) = transform {
             if transform.has_perspective_component() || !transform.has_2d_inverse() {
                 font.render_mode = font.render_mode.limit_by(FontRenderMode::Alpha);
             } else {
@@ -769,13 +682,12 @@ impl TextRunPrimitiveCpu {
     fn prepare_for_render(
         &mut self,
         resource_cache: &mut ResourceCache,
-        device_pixel_ratio: f32,
-        transform: &LayerToWorldTransform,
+        device_pixel_scale: DevicePixelScale,
+        transform: Option<&LayerToWorldTransform>,
         display_list: &BuiltDisplayList,
         gpu_cache: &mut GpuCache,
-        rasterization_kind: RasterizationSpace,
     ) {
-        let font = self.get_font(device_pixel_ratio, transform, rasterization_kind);
+        let font = self.get_font(device_pixel_scale, transform);
 
         // Cache the glyph positions, if not in the cache already.
         // TODO(gw): In the future, remove `glyph_instances`
@@ -1098,6 +1010,7 @@ impl PrimitiveStore {
             clip_task_id: None,
             local_rect: *local_rect,
             local_clip_rect: *local_clip_rect,
+            clip_chain_rect_index: ClipChainRectIndex(0),
             is_backface_visible: is_backface_visible,
             screen_rect: None,
             tag,
@@ -1269,13 +1182,20 @@ impl PrimitiveStore {
             PrimitiveKind::TextRun => {
                 let pic = &self.cpu_pictures[pic_index.0];
                 let text = &mut self.cpu_text_runs[metadata.cpu_prim_index.0];
+                // The transform only makes sense for screen space rasterization
+                let transform = match pic.kind {
+                    PictureKind::BoxShadow { .. } => None,
+                    PictureKind::TextShadow { .. } => None,
+                    PictureKind::Image { .. } => {
+                        Some(&prim_context.scroll_node.world_content_transform)
+                    },
+                };
                 text.prepare_for_render(
                     resource_cache,
-                    prim_context.device_pixel_ratio,
-                    &prim_context.scroll_node.world_content_transform,
+                    prim_context.device_pixel_scale,
+                    transform,
                     prim_context.display_list,
                     gpu_cache,
-                    pic.rasterization_kind,
                 );
             }
             PrimitiveKind::Image => {
@@ -1322,13 +1242,29 @@ impl PrimitiveStore {
 
         // Mark this GPU resource as required for this frame.
         if let Some(mut request) = gpu_cache.request(&mut metadata.gpu_location) {
+            // has to match VECS_PER_BRUSH_PRIM
             request.push(metadata.local_rect);
             request.push(metadata.local_clip_rect);
 
             match metadata.prim_kind {
                 PrimitiveKind::Line => {
                     let line = &self.cpu_lines[metadata.cpu_prim_index.0];
-                    line.write_gpu_blocks(request);
+                    line.write_gpu_blocks(&mut request);
+
+                    // TODO(gw): This is a bit of a hack. The Line type
+                    //           is drawn by the brush_line shader, so the
+                    //           layout here needs to conform to the same
+                    //           BrushPrimitive layout. We should tidy this
+                    //           up in the future so it's enforced that these
+                    //           types use a shared function to write out the
+                    //           GPU blocks...
+                    request.push(metadata.local_rect);
+                    request.push([
+                        EdgeAaSegmentMask::empty().bits() as f32,
+                        0.0,
+                        0.0,
+                        0.0
+                    ]);
                 }
                 PrimitiveKind::Border => {
                     let border = &self.cpu_borders[metadata.cpu_prim_index.0];
@@ -1359,6 +1295,9 @@ impl PrimitiveStore {
                     text.write_gpu_blocks(&mut request);
                 }
                 PrimitiveKind::Picture => {
+                    self.cpu_pictures[metadata.cpu_prim_index.0]
+                        .write_gpu_blocks(&mut request);
+
                     // TODO(gw): This is a bit of a hack. The Picture type
                     //           is drawn by the brush_image shader, so the
                     //           layout here needs to conform to the same
@@ -1366,26 +1305,46 @@ impl PrimitiveStore {
                     //           up in the future so it's enforced that these
                     //           types use a shared function to write out the
                     //           GPU blocks...
-                    request.push([0.0; 4]);
+                    request.push(metadata.local_rect);
                     request.push([
-                        BrushAntiAliasMode::Primitive as u32 as f32,
-                        0.0,
+                        EdgeAaSegmentMask::empty().bits() as f32,
                         0.0,
                         0.0,
+                        0.0
                     ]);
-
-                    self.cpu_pictures[metadata.cpu_prim_index.0]
-                        .write_gpu_blocks(&mut request);
                 }
                 PrimitiveKind::Brush => {
                     let brush = &self.cpu_brushes[metadata.cpu_prim_index.0];
-                    brush.write_gpu_blocks(request);
+                    brush.write_gpu_blocks(&mut request);
+                    match brush.segment_desc {
+                        Some(ref segment_desc) => {
+                            for segment in &segment_desc.segments {
+                                // has to match VECS_PER_SEGMENT
+                                request.push(segment.local_rect);
+                                request.push([
+                                    segment.edge_flags.bits() as f32,
+                                    0.0,
+                                    0.0,
+                                    0.0
+                                ]);
+                            }
+                        }
+                        None => {
+                            request.push(metadata.local_rect);
+                            request.push([
+                                EdgeAaSegmentMask::empty().bits() as f32,
+                                0.0,
+                                0.0,
+                                0.0
+                            ]);
+                        }
+                    }
                 }
             }
         }
     }
 
-    fn write_brush_nine_patch_segment_description(
+    fn write_brush_segment_description(
         &mut self,
         prim_index: PrimitiveIndex,
         prim_context: &PrimitiveContext,
@@ -1395,75 +1354,124 @@ impl PrimitiveStore {
     ) {
         debug_assert!(self.cpu_metadata[prim_index.0].prim_kind == PrimitiveKind::Brush);
 
-        if clips.len() != 1 {
-            return;
-        }
-
-        let clip_item = clips.first().unwrap();
-        if clip_item.coordinate_system_id != prim_context.scroll_node.coordinate_system_id {
-            return;
-        }
-
         let metadata = &self.cpu_metadata[prim_index.0];
         let brush = &mut self.cpu_brushes[metadata.cpu_prim_index.0];
-        if brush.segment_desc.is_some() {
-            return;
-        }
-        if !brush.kind.is_solid() {
-            return;
-        }
-        if metadata.local_rect.size.area() <= MIN_BRUSH_SPLIT_AREA {
-            return;
-        }
 
-        let local_clips = clip_store.get_opt(&clip_item.clip_sources).expect("bug");
-        let mut selected_clip = None;
-        for &(ref clip, _) in &local_clips.clips {
-            match *clip {
-                ClipSource::RoundedRectangle(rect, radii, ClipMode::Clip) => {
-                    if selected_clip.is_some() {
-                        selected_clip = None;
-                        break;
-                    }
-                    selected_clip = Some((rect, radii, clip_item.scroll_node_data_index));
+        match brush.segment_desc {
+            Some(ref segment_desc) => {
+                // If we already have a segment descriptor, only run through the
+                // clips list if we haven't already determined the mask kind.
+                if segment_desc.clip_mask_kind != BrushClipMaskKind::Unknown {
+                    return;
                 }
-                ClipSource::Rectangle(..) => {}
-                ClipSource::RoundedRectangle(_, _, ClipMode::ClipOut) |
-                ClipSource::BorderCorner(..) |
-                ClipSource::Image(..) => {
-                    selected_clip = None;
-                    break;
+            }
+            None => {
+                // If no segment descriptor built yet, see if it is a brush
+                // type that wants to be segmented.
+                if !brush.kind.is_solid() {
+                    return;
+                }
+                if metadata.local_rect.size.area() <= MIN_BRUSH_SPLIT_AREA {
+                    return;
                 }
             }
         }
 
-        if let Some((rect, radii, clip_scroll_node_data_index)) = selected_clip {
-            // If the scroll node transforms are different between the clip
-            // node and the primitive, we need to get the clip rect in the
-            // local space of the primitive, in order to generate correct
-            // local segments.
-            let local_clip_rect = if clip_scroll_node_data_index == prim_context.scroll_node.node_data_index {
-                rect
-            } else {
-                let clip_transform_data = &node_data[clip_scroll_node_data_index.0 as usize];
-                let prim_transform = &prim_context.scroll_node.world_content_transform;
+        let mut segment_builder = SegmentBuilder::new(
+            metadata.local_rect,
+            metadata.local_clip_rect
+        );
 
-                let relative_transform = prim_transform
-                    .inverse()
-                    .unwrap_or(WorldToLayerTransform::identity())
-                    .pre_mul(&clip_transform_data.transform);
+        // If true, we need a clip mask for the entire primitive. This
+        // is either because we don't handle segmenting this clip source,
+        // or we have a clip source from a different coordinate system.
+        let mut clip_mask_kind = BrushClipMaskKind::Individual;
 
-                relative_transform.transform_rect(&rect)
-            };
-            brush.segment_desc = create_nine_patch(
-                &metadata.local_rect,
-                &local_clip_rect,
-                &radii
-            );
+        // Segment the primitive on all the local-space clip sources
+        // that we can.
+        for clip_item in clips {
+            if clip_item.coordinate_system_id != prim_context.scroll_node.coordinate_system_id {
+                clip_mask_kind = BrushClipMaskKind::Global;
+                continue;
+            }
+
+            let local_clips = clip_store.get_opt(&clip_item.clip_sources).expect("bug");
+
+            for &(ref clip, _) in &local_clips.clips {
+                let (local_clip_rect, radius, mode) = match *clip {
+                    ClipSource::RoundedRectangle(rect, radii, clip_mode) => {
+                        (rect, Some(radii), clip_mode)
+                    }
+                    ClipSource::Rectangle(rect) => {
+                        (rect, None, ClipMode::Clip)
+                    }
+                    ClipSource::BorderCorner(..) |
+                    ClipSource::Image(..) => {
+                        // TODO(gw): We can easily extend the segment builder
+                        //           to support these clip sources in the
+                        //           future, but they are rarely used.
+                        clip_mask_kind = BrushClipMaskKind::Global;
+                        continue;
+                    }
+                };
+
+                // If the scroll node transforms are different between the clip
+                // node and the primitive, we need to get the clip rect in the
+                // local space of the primitive, in order to generate correct
+                // local segments.
+                let local_clip_rect = if clip_item.scroll_node_data_index == prim_context.scroll_node.node_data_index {
+                    local_clip_rect
+                } else {
+                    let clip_transform_data = &node_data[clip_item.scroll_node_data_index.0 as usize];
+                    let prim_transform = &prim_context.scroll_node.world_content_transform;
+
+                    let relative_transform = prim_transform
+                        .inverse()
+                        .unwrap_or(WorldToLayerTransform::identity())
+                        .pre_mul(&clip_transform_data.transform);
+
+                    relative_transform.transform_rect(&local_clip_rect)
+                };
+
+                segment_builder.push_rect(
+                    local_clip_rect,
+                    radius,
+                    mode
+                );
+            }
+        }
+
+        match brush.segment_desc {
+            Some(ref mut segment_desc) => {
+                segment_desc.clip_mask_kind = clip_mask_kind;
+            }
+            None => {
+                // TODO(gw): We can probably make the allocation
+                //           patterns of this and the segment
+                //           builder significantly better, by
+                //           retaining it across primitives.
+                let mut segments = Vec::new();
+
+                segment_builder.build(|segment| {
+                    segments.push(
+                        BrushSegment::new(
+                            segment.rect.origin,
+                            segment.rect.size,
+                            segment.has_mask,
+                            segment.edge_flags,
+                        ),
+                    );
+                });
+
+                brush.segment_desc = Some(BrushSegmentDescriptor {
+                    segments,
+                    clip_mask_kind,
+                });
+            }
         }
     }
 
-    fn update_nine_patch_clip_task_for_brush(
+    fn update_clip_task_for_brush(
         &mut self,
         prim_context: &PrimitiveContext,
         prim_index: PrimitiveIndex,
@@ -1478,7 +1486,7 @@ impl PrimitiveStore {
             return false;
         }
 
-        self.write_brush_nine_patch_segment_description(
+        self.write_brush_segment_description(
             prim_index,
             prim_context,
             clip_store,
@@ -1492,24 +1500,14 @@ impl PrimitiveStore {
             Some(ref mut description) => description,
             None => return false,
         };
+        let clip_mask_kind = segment_desc.clip_mask_kind;
 
-        let enabled_segments = segment_desc.enabled_segments;
-        let can_optimize_clip_mask = segment_desc.can_optimize_clip_mask;
-
-        for (i, segment) in segment_desc.segments.iter_mut().enumerate() {
-            // We only build clips for the corners. The ordering of the
-            // BrushSegmentKind enum is such that corners come first, then
-            // edges, then inner.
-            let segment_enabled = ((1 << i) & enabled_segments) != 0;
-            let create_clip_task =
-               segment_enabled &&
-               (!can_optimize_clip_mask || i <= BrushSegmentKind::BottomLeft as usize);
-
-            segment.clip_task_id = if create_clip_task {
+        for segment in &mut segment_desc.segments {
+            segment.clip_task_id = if segment.may_need_clip_mask || clip_mask_kind == BrushClipMaskKind::Global {
                 let segment_screen_rect = calculate_screen_bounding_rect(
                     &prim_context.scroll_node.world_content_transform,
                     &segment.local_rect,
-                    prim_context.device_pixel_ratio
+                    prim_context.device_pixel_scale,
                 );
 
                 combined_outer_rect.intersection(&segment_screen_rect).map(|bounds| {
@@ -1570,7 +1568,7 @@ impl PrimitiveStore {
             if prim_clips.has_clips() {
                 prim_clips.update(gpu_cache, resource_cache);
                 let (screen_inner_rect, screen_outer_rect) =
-                    prim_clips.get_screen_bounds(transform, prim_context.device_pixel_ratio);
+                    prim_clips.get_screen_bounds(transform, prim_context.device_pixel_scale);
 
                 if let Some(outer) = screen_outer_rect {
                     combined_outer_rect = combined_outer_rect.and_then(|r| r.intersection(&outer));
@@ -1582,7 +1580,13 @@ impl PrimitiveStore {
                         clip_sources: metadata.clip_sources.weak(),
                         coordinate_system_id: prim_coordinate_system_id,
                     },
+                    // The local_clip_rect a property of ClipChain nodes that are ClipScrollNodes.
+                    // It's used to calculate a local clipping rectangle before we reach this
+                    // point, so we can set it to zero here. It should be unused from this point
+                    // on.
+                    local_clip_rect: LayerRect::zero(),
                     screen_inner_rect,
+                    screen_outer_rect: screen_outer_rect.unwrap_or(prim_screen_rect),
                     combined_outer_screen_rect:
                         combined_outer_rect.unwrap_or_else(DeviceIntRect::zero),
                     combined_inner_screen_rect: DeviceIntRect::zero(),
@@ -1633,8 +1637,8 @@ impl PrimitiveStore {
            return true;
         }
 
-        // First try to  render this primitive's mask using optimized nine-patch brush rendering.
-        if self.update_nine_patch_clip_task_for_brush(
+        // First try to  render this primitive's mask using optimized brush rendering.
+        if self.update_clip_task_for_brush(
             prim_context,
             prim_index,
             render_tasks,
@@ -1677,7 +1681,9 @@ impl PrimitiveStore {
         profile_counters: &mut FrameProfileCounters,
         pic_index: SpecificPrimitiveIndex,
         screen_rect: &DeviceIntRect,
+        clip_chain_rect_index: ClipChainRectIndex,
         node_data: &[ClipScrollNodeData],
+        local_rects: &mut Vec<LayerRect>,
     ) -> Option<LayerRect> {
         // Reset the visibility of this primitive.
         // Do some basic checks first, that can early out
@@ -1745,6 +1751,7 @@ impl PrimitiveStore {
                 cpu_prim_index,
                 screen_rect,
                 node_data,
+                local_rects,
             );
 
             let metadata = &mut self.cpu_metadata[prim_index.0];
@@ -1767,7 +1774,7 @@ impl PrimitiveStore {
                 return None;
             }
 
-            let local_rect = metadata.local_rect.intersection(&metadata.local_clip_rect);
+            let local_rect = metadata.local_clip_rect.intersection(&metadata.local_rect);
             let local_rect = match local_rect {
                 Some(local_rect) => local_rect,
                 None if perform_culling => return None,
@@ -1777,16 +1784,21 @@ impl PrimitiveStore {
             let screen_bounding_rect = calculate_screen_bounding_rect(
                 &prim_context.scroll_node.world_content_transform,
                 &local_rect,
-                prim_context.device_pixel_ratio
+                prim_context.device_pixel_scale,
             );
 
-            let clip_bounds = &prim_context.clip_node.combined_clip_outer_bounds;
-            metadata.screen_rect = screen_bounding_rect.intersection(clip_bounds);
+            let clip_bounds = match prim_context.clip_node.clip_chain_node {
+                Some(ref node) => node.combined_outer_screen_rect,
+                None => *screen_rect,
+            };
+            metadata.screen_rect = screen_bounding_rect.intersection(&clip_bounds);
 
             if metadata.screen_rect.is_none() && perform_culling {
                 return None;
             }
 
+            metadata.clip_chain_rect_index = clip_chain_rect_index;
+
             (local_rect, screen_bounding_rect)
         };
 
@@ -1846,6 +1858,7 @@ impl PrimitiveStore {
         pic_index: SpecificPrimitiveIndex,
         screen_rect: &DeviceIntRect,
         node_data: &[ClipScrollNodeData],
+        local_rects: &mut Vec<LayerRect>,
     ) -> PrimitiveRunLocalRect {
         let mut result = PrimitiveRunLocalRect {
             local_rect_in_actual_parent_space: LayerRect::zero(),
@@ -1889,12 +1902,28 @@ impl PrimitiveStore {
                 .display_list;
 
             let child_prim_context = PrimitiveContext::new(
-                parent_prim_context.device_pixel_ratio,
+                parent_prim_context.device_pixel_scale,
                 display_list,
                 clip_node,
                 scroll_node,
             );
 
+
+            let clip_chain_rect = match perform_culling {
+                true => get_local_clip_rect_for_nodes(scroll_node, clip_node),
+                false => None,
+            };
+
+            let clip_chain_rect_index = match clip_chain_rect {
+                Some(rect) if rect.is_empty() => continue,
+                Some(rect) => {
+                    local_rects.push(rect);
+                    ClipChainRectIndex(local_rects.len() - 1)
+                }
+                None => ClipChainRectIndex(0), // This is no clipping.
+            };
+
+
             for i in 0 .. run.count {
                 let prim_index = PrimitiveIndex(run.base_prim_index.0 + i);
 
@@ -1913,7 +1942,9 @@ impl PrimitiveStore {
                     profile_counters,
                     pic_index,
                     screen_rect,
+                    clip_chain_rect_index,
                     node_data,
+                    local_rects,
                 ) {
                     profile_counters.visible_primitives.inc();
 
@@ -1961,23 +1992,6 @@ impl InsideTest<ComplexClipRegion> for ComplexClipRegion {
     }
 }
 
-fn create_nine_patch(
-    local_rect: &LayerRect,
-    local_clip_rect: &LayerRect,
-    radii: &BorderRadius
-) -> Option<Box<BrushSegmentDescriptor>> {
-    extract_inner_rect_safe(local_clip_rect, radii).map(|inner| {
-        let mut desc = BrushSegmentDescriptor::new(
-            local_rect,
-            &inner,
-            None,
-        );
-        desc.can_optimize_clip_mask = true;
-
-        Box::new(desc)
-    })
-}
-
 fn convert_clip_chain_to_clip_vector(
     clip_chain: ClipChain,
     extra_clip: ClipChain,
@@ -2007,3 +2021,29 @@ fn convert_clip_chain_to_clip_vector(
         })
         .collect()
 }
+
+fn get_local_clip_rect_for_nodes(
+    scroll_node: &ClipScrollNode,
+    clip_node: &ClipScrollNode,
+) -> Option<LayerRect> {
+    let local_rect = ClipChainNodeIter { current: clip_node.clip_chain_node.clone() }.fold(
+        None,
+        |combined_local_clip_rect: Option<LayerRect>, node| {
+            if node.work_item.coordinate_system_id != scroll_node.coordinate_system_id {
+                return combined_local_clip_rect;
+            }
+
+            Some(match combined_local_clip_rect {
+                Some(combined_rect) =>
+                    combined_rect.intersection(&node.local_clip_rect).unwrap_or_else(LayerRect::zero),
+                None => node.local_clip_rect,
+            })
+        }
+    );
+
+    match local_rect {
+        Some(local_rect) =>
+            Some(scroll_node.coordinate_system_relative_transform.unapply(&local_rect)),
+        None => None,
+    }
+}
diff --git a/gfx/webrender/src/profiler.rs b/gfx/webrender/src/profiler.rs
index b14df5b1b392..8a045e7aea2d 100644
--- a/gfx/webrender/src/profiler.rs
+++ b/gfx/webrender/src/profiler.rs
@@ -314,20 +314,16 @@ impl FrameProfileCounters {
 #[derive(Clone)]
 pub struct TextureCacheProfileCounters {
     pub pages_a8_linear: ResourceProfileCounter,
-    pub pages_rgb8_linear: ResourceProfileCounter,
     pub pages_rgba8_linear: ResourceProfileCounter,
     pub pages_rgba8_nearest: ResourceProfileCounter,
-    pub pages_rg8_linear: ResourceProfileCounter,
 }
 
 impl TextureCacheProfileCounters {
     pub fn new() -> Self {
         TextureCacheProfileCounters {
             pages_a8_linear: ResourceProfileCounter::new("Texture A8 cached pages"),
-            pages_rgb8_linear: ResourceProfileCounter::new("Texture RGB8 cached pages"),
             pages_rgba8_linear: ResourceProfileCounter::new("Texture RGBA8 cached pages (L)"),
             pages_rgba8_nearest: ResourceProfileCounter::new("Texture RGBA8 cached pages (N)"),
-            pages_rg8_linear: ResourceProfileCounter::new("Texture RG8 cached pages"),
         }
     }
 }
@@ -998,10 +994,8 @@ impl Profiler {
         Profiler::draw_counters(
             &[
                 &backend_profile.resources.texture_cache.pages_a8_linear,
-                &backend_profile.resources.texture_cache.pages_rgb8_linear,
                 &backend_profile.resources.texture_cache.pages_rgba8_linear,
                 &backend_profile.resources.texture_cache.pages_rgba8_nearest,
-                &backend_profile.resources.texture_cache.pages_rg8_linear,
                 &backend_profile.ipc.display_lists,
             ],
             debug_renderer,
diff --git a/gfx/webrender/src/render_backend.rs b/gfx/webrender/src/render_backend.rs
index b4b8ec358429..ee0fb4ef32f4 100644
--- a/gfx/webrender/src/render_backend.rs
+++ b/gfx/webrender/src/render_backend.rs
@@ -5,9 +5,9 @@
 use api::{ApiMsg, BlobImageRenderer, BuiltDisplayList, DebugCommand, DeviceIntPoint};
 #[cfg(feature = "debugger")]
 use api::{BuiltDisplayListIter, SpecificDisplayItem};
-use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize};
+use api::{DevicePixelScale, DeviceUintPoint, DeviceUintRect, DeviceUintSize};
 use api::{DocumentId, DocumentLayer, DocumentMsg};
-use api::{IdNamespace, LayerPoint, PipelineId, RenderNotifier};
+use api::{IdNamespace, PipelineId, RenderNotifier};
 use api::channel::{MsgReceiver, PayloadReceiver, PayloadReceiverHelperMethods};
 use api::channel::{PayloadSender, PayloadSenderHelperMethods};
 #[cfg(feature = "debugger")]
@@ -16,13 +16,21 @@ use frame::FrameContext;
 use frame_builder::{FrameBuilder, FrameBuilderConfig};
 use gpu_cache::GpuCache;
 use internal_types::{DebugOutput, FastHashMap, FastHashSet, RenderedDocument, ResultMsg};
+#[cfg(feature = "capture")]
+use internal_types::ExternalCaptureImage;
 use profiler::{BackendProfileCounters, ResourceProfileCounters};
 use rayon::ThreadPool;
 use record::ApiRecordingReceiver;
 use resource_cache::ResourceCache;
+#[cfg(feature = "capture")]
+use resource_cache::PlainResources;
 use scene::Scene;
+#[cfg(feature = "serialize")]
+use serde::{Serialize, Serializer};
 #[cfg(feature = "debugger")]
 use serde_json;
+#[cfg(feature = "capture")]
+use std::path::PathBuf;
 use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::sync::mpsc::Sender;
@@ -30,11 +38,9 @@ use std::u32;
 use texture_cache::TextureCache;
 use time::precise_time_ns;
 
-struct Document {
-    scene: Scene,
-    frame_ctx: FrameContext,
-    // the `Option` here is only to deal with borrow checker
-    frame_builder: Option<FrameBuilder>,
+
+#[cfg_attr(feature = "capture", derive(Clone, Serialize, Deserialize))]
+struct DocumentView {
     window_size: DeviceUintSize,
     inner_rect: DeviceUintRect,
     layer: DocumentLayer,
@@ -42,6 +48,24 @@ struct Document {
     device_pixel_ratio: f32,
     page_zoom_factor: f32,
     pinch_zoom_factor: f32,
+}
+
+impl DocumentView {
+    fn accumulated_scale_factor(&self) -> DevicePixelScale {
+        DevicePixelScale::new(
+            self.device_pixel_ratio *
+            self.page_zoom_factor *
+            self.pinch_zoom_factor
+        )
+    }
+}
+
+struct Document {
+    scene: Scene,
+    view: DocumentView,
+    frame_ctx: FrameContext,
+    // the `Option` here is only to deal with borrow checker
+    frame_builder: Option<FrameBuilder>,
     // A set of pipelines that the caller has requested be
     // made available as output textures.
     output_pipelines: FastHashSet<PipelineId>,
@@ -68,36 +92,31 @@ impl Document {
         };
         Document {
             scene: Scene::new(),
+            view: DocumentView {
+                window_size,
+                inner_rect: DeviceUintRect::new(DeviceUintPoint::zero(), window_size),
+                layer,
+                pan: DeviceIntPoint::zero(),
+                page_zoom_factor: 1.0,
+                pinch_zoom_factor: 1.0,
+                device_pixel_ratio: default_device_pixel_ratio,
+            },
             frame_ctx: FrameContext::new(config),
             frame_builder: Some(FrameBuilder::empty()),
-            window_size,
-            inner_rect: DeviceUintRect::new(DeviceUintPoint::zero(), window_size),
-            layer,
-            pan: DeviceIntPoint::zero(),
-            page_zoom_factor: 1.0,
-            pinch_zoom_factor: 1.0,
-            device_pixel_ratio: default_device_pixel_ratio,
             render_on_scroll,
             output_pipelines: FastHashSet::default(),
         }
     }
 
-    fn accumulated_scale_factor(&self) -> f32 {
-        self.device_pixel_ratio *
-        self.page_zoom_factor *
-        self.pinch_zoom_factor
-    }
-
     fn build_scene(&mut self, resource_cache: &mut ResourceCache) {
-        let accumulated_scale_factor = self.accumulated_scale_factor();
         // this code is why we have `Option`, which is never `None`
         let frame_builder = self.frame_ctx.create(
             self.frame_builder.take().unwrap(),
             &self.scene,
             resource_cache,
-            self.window_size,
-            self.inner_rect,
-            accumulated_scale_factor,
+            self.view.window_size,
+            self.view.inner_rect,
+            self.view.accumulated_scale_factor(),
             &self.output_pipelines,
         );
         self.frame_builder = Some(frame_builder);
@@ -109,18 +128,15 @@ impl Document {
         gpu_cache: &mut GpuCache,
         resource_profile: &mut ResourceProfileCounters,
     ) -> RenderedDocument {
-        let accumulated_scale_factor = self.accumulated_scale_factor();
-        let pan = LayerPoint::new(
-            self.pan.x as f32 / accumulated_scale_factor,
-            self.pan.y as f32 / accumulated_scale_factor,
-        );
+        let accumulated_scale_factor = self.view.accumulated_scale_factor();
+        let pan = self.view.pan.to_f32() / accumulated_scale_factor;
         self.frame_ctx.build_rendered_document(
             self.frame_builder.as_mut().unwrap(),
             resource_cache,
             gpu_cache,
             &self.scene.pipelines,
             accumulated_scale_factor,
-            self.layer,
+            self.view.layer,
             pan,
             &mut resource_profile.texture_cache,
             &mut resource_profile.gpu_cache,
@@ -140,6 +156,16 @@ enum DocumentOp {
 /// The unique id for WR resource identification.
 static NEXT_NAMESPACE_ID: AtomicUsize = ATOMIC_USIZE_INIT;
 
+#[cfg(feature = "capture")]
+#[derive(Serialize, Deserialize)]
+struct PlainRenderBackend {
+    default_device_pixel_ratio: f32,
+    enable_render_on_scroll: bool,
+    frame_config: FrameBuilderConfig,
+    documents: FastHashMap<DocumentId, DocumentView>,
+    resources: PlainResources,
+}
+
 /// The render backend is responsible for transforming high level display lists into
 /// GPU-friendly work which is then submitted to the renderer in the form of a frame::Frame.
 ///
@@ -210,8 +236,9 @@ impl RenderBackend {
         let doc = self.documents.get_mut(&document_id).expect("No document?");
 
         match message {
+            //TODO: move view-related messages in a separate enum?
             DocumentMsg::SetPageZoom(factor) => {
-                doc.page_zoom_factor = factor.get();
+                doc.view.page_zoom_factor = factor.get();
                 DocumentOp::Nop
             }
             DocumentMsg::EnableFrameOutput(pipeline_id, enable) => {
@@ -223,11 +250,11 @@ impl RenderBackend {
                 DocumentOp::Nop
             }
             DocumentMsg::SetPinchZoom(factor) => {
-                doc.pinch_zoom_factor = factor.get();
+                doc.view.pinch_zoom_factor = factor.get();
                 DocumentOp::Nop
             }
             DocumentMsg::SetPan(pan) => {
-                doc.pan = pan;
+                doc.view.pan = pan;
                 DocumentOp::Nop
             }
             DocumentMsg::SetWindowParameters {
@@ -235,9 +262,9 @@ impl RenderBackend {
                 inner_rect,
                 device_pixel_ratio,
             } => {
-                doc.window_size = window_size;
-                doc.inner_rect = inner_rect;
-                doc.device_pixel_ratio = device_pixel_ratio;
+                doc.view.window_size = window_size;
+                doc.view.inner_rect = inner_rect;
+                doc.view.device_pixel_ratio = device_pixel_ratio;
                 DocumentOp::Nop
             }
             DocumentMsg::SetDisplayList {
@@ -550,6 +577,34 @@ impl RenderBackend {
                             let json = self.get_clip_scroll_tree_for_debugger();
                             ResultMsg::DebugOutput(DebugOutput::FetchClipScrollTree(json))
                         }
+                        #[cfg(feature = "capture")]
+                        DebugCommand::SaveCapture(root) => {
+                            let deferred = self.save_capture(&root);
+                            ResultMsg::DebugOutput(DebugOutput::SaveCapture(root, deferred))
+                        },
+                        #[cfg(feature = "capture")]
+                        DebugCommand::LoadCapture(root) => {
+                            NEXT_NAMESPACE_ID.fetch_add(1, Ordering::Relaxed);
+                            frame_counter += 1;
+                            self.load_capture(&root, &mut profile_counters);
+                            ResultMsg::DebugOutput(DebugOutput::LoadCapture)
+                        },
+                        DebugCommand::EnableDualSourceBlending(enable) => {
+                            // Set in the config used for any future documents
+                            // that are created.
+                            self.frame_config
+                                .dual_source_blending_is_enabled = enable;
+
+                            // Set for any existing documents.
+                            for (_, doc) in &mut self.documents {
+                                doc.frame_ctx
+                                   .frame_builder_config
+                                   .dual_source_blending_is_enabled = enable;
+                            }
+
+                            // We don't want to forward this message to the renderer.
+                            continue;
+                        }
                         _ => ResultMsg::DebugCommand(option),
                     };
                     self.result_tx.send(msg).unwrap();
@@ -717,3 +772,107 @@ impl ToDebugString for SpecificDisplayItem {
         }
     }
 }
+
+
+#[cfg(feature = "capture")]
+impl RenderBackend {
+    // Note: the mutable `self` is only needed here for resolving blob images
+    fn save_capture(&mut self, root: &PathBuf) -> Vec<ExternalCaptureImage> {
+        use ron::ser::pretty;
+        use std::fs;
+        use std::io::Write;
+
+        info!("capture: saving {}", root.to_string_lossy());
+        let (resources, deferred) = self.resource_cache.save_capture(root);
+
+        for (&id, doc) in &self.documents {
+            info!("\tdocument {:?}", id);
+            let ron = pretty::to_string(&doc.scene).unwrap();
+            let file_name = format!("scene-{}-{}.ron", (id.0).0, id.1);
+            let ron_path = root.clone().join(file_name);
+            let mut file = fs::File::create(ron_path).unwrap();
+            write!(file, "{}\n", ron).unwrap();
+        }
+
+        info!("\tbackend");
+        let serial = PlainRenderBackend {
+            default_device_pixel_ratio: self.default_device_pixel_ratio,
+            enable_render_on_scroll: self.enable_render_on_scroll,
+            frame_config: self.frame_config.clone(),
+            documents: self.documents
+                .iter()
+                .map(|(id, doc)| (*id, doc.view.clone()))
+                .collect(),
+            resources,
+        };
+
+        let ron = pretty::to_string(&serial).unwrap();
+        let ron_path = root.clone().join("backend.ron");
+        let mut file = fs::File::create(ron_path).unwrap();
+        write!(file, "{}\n", ron).unwrap();
+
+        deferred
+    }
+
+    fn load_capture(
+        &mut self,
+        root: &PathBuf,
+        profile_counters: &mut BackendProfileCounters,
+    ) {
+        use ron::de;
+        use std::fs::File;
+        use std::io::Read;
+
+        let mut string = String::new();
+        info!("capture: loading {}", root.to_string_lossy());
+
+        File::open(root.join("backend.ron"))
+            .unwrap()
+            .read_to_string(&mut string)
+            .unwrap();
+        let backend: PlainRenderBackend = de::from_str(&string)
+            .unwrap();
+
+        // Note: it would be great to have RenderBackend to be split
+        // rather explicitly on what's used before and after scene building
+        // so that, for example, we never miss anything in the code below:
+
+        self.resource_cache.load_capture(backend.resources, root);
+        self.gpu_cache = GpuCache::new();
+        self.documents.clear();
+        self.default_device_pixel_ratio = backend.default_device_pixel_ratio;
+        self.frame_config = backend.frame_config;
+        self.enable_render_on_scroll = backend.enable_render_on_scroll;
+
+        for (id, view) in backend.documents {
+            info!("\tdocument {:?}", id);
+            string.clear();
+            let file_name = format!("scene-{}-{}.ron", (id.0).0, id.1);
+            File::open(root.join(file_name))
+                .expect(&format!("Unable to open scene {:?}", id))
+                .read_to_string(&mut string)
+                .unwrap();
+            let scene: Scene = de::from_str(&string)
+                .unwrap();
+
+            let mut doc = Document {
+                scene,
+                view,
+                frame_ctx: FrameContext::new(self.frame_config.clone()),
+                frame_builder: Some(FrameBuilder::empty()),
+                output_pipelines: FastHashSet::default(),
+                render_on_scroll: None,
+            };
+
+            doc.build_scene(&mut self.resource_cache);
+            let render_doc = doc.render(
+                &mut self.resource_cache,
+                &mut self.gpu_cache,
+                &mut profile_counters.resources,
+            );
+            self.publish_document_and_notify_compositor(id, render_doc, profile_counters);
+
+            self.documents.insert(id, doc);
+        }
+    }
+}
diff --git a/gfx/webrender/src/render_task.rs b/gfx/webrender/src/render_task.rs
index e2a743bc934b..18fd5d438828 100644
--- a/gfx/webrender/src/render_task.rs
+++ b/gfx/webrender/src/render_task.rs
@@ -2,15 +2,14 @@
  * 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/. */
 
-use api::{ClipId, DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixel};
-use api::{LayerPoint, LayerRect, PremultipliedColorF};
+use api::{ClipId, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use api::{LayerRect, PremultipliedColorF};
 use box_shadow::BoxShadowCacheKey;
 use clip::{ClipSourcesWeakHandle};
 use clip_scroll_tree::CoordinateSystemId;
-use euclid::TypedSize2D;
-use gpu_types::{ClipScrollNodeIndex};
+use gpu_types::{ClipScrollNodeIndex, PictureType};
 use internal_types::RenderPassIndex;
-use picture::RasterizationSpace;
+use picture::ContentOrigin;
 use prim_store::{PrimitiveIndex};
 #[cfg(feature = "debugger")]
 use print_tree::{PrintTreePrinter};
@@ -41,12 +40,59 @@ pub type ClipChain = Option<Rc<ClipChainNode>>;
 #[derive(Debug)]
 pub struct ClipChainNode {
     pub work_item: ClipWorkItem,
+    pub local_clip_rect: LayerRect,
+    pub screen_outer_rect: DeviceIntRect,
     pub screen_inner_rect: DeviceIntRect,
     pub combined_outer_screen_rect: DeviceIntRect,
     pub combined_inner_screen_rect: DeviceIntRect,
     pub prev: ClipChain,
 }
 
+impl ClipChainNode {
+    pub fn new(
+        work_item: ClipWorkItem,
+        local_clip_rect: LayerRect,
+        screen_outer_rect: DeviceIntRect,
+        screen_inner_rect: DeviceIntRect,
+        parent_chain: ClipChain,
+    ) -> ClipChainNode {
+        let mut node = ClipChainNode {
+            work_item,
+            local_clip_rect,
+            screen_outer_rect,
+            screen_inner_rect,
+            combined_outer_screen_rect: screen_outer_rect,
+            combined_inner_screen_rect: screen_inner_rect,
+            prev: None,
+        };
+        node.set_parent(parent_chain);
+        node
+    }
+
+    fn set_parent(&mut self, new_parent: ClipChain) {
+        self.prev = new_parent.clone();
+
+        let parent_node = match new_parent {
+            Some(ref parent_node) => parent_node,
+            None => return,
+        };
+
+        // If this clip's outer rectangle is completely enclosed by the clip
+        // chain's inner rectangle, then the only clip that matters from this point
+        // on is this clip. We can disconnect this clip from the parent clip chain.
+        if parent_node.combined_inner_screen_rect.contains_rect(&self.screen_outer_rect) {
+            self.prev = None;
+        }
+
+        self.combined_outer_screen_rect =
+            parent_node.combined_outer_screen_rect.intersection(&self.screen_outer_rect)
+            .unwrap_or_else(DeviceIntRect::zero);
+        self.combined_inner_screen_rect =
+            parent_node.combined_inner_screen_rect.intersection(&self.screen_inner_rect)
+            .unwrap_or_else(DeviceIntRect::zero);
+    }
+}
+
 pub struct ClipChainNodeIter {
     pub current: ClipChain,
 }
@@ -154,7 +200,7 @@ impl ops::IndexMut<RenderTaskId> for RenderTaskTree {
 pub enum RenderTaskKey {
     /// Draw the alpha mask for a shared clip.
     CacheMask(ClipId),
-    CacheScaling(BoxShadowCacheKey, TypedSize2D<i32, DevicePixel>),
+    CacheScaling(BoxShadowCacheKey, DeviceIntSize),
     CacheBlur(BoxShadowCacheKey, i32),
     CachePicture(BoxShadowCacheKey),
 }
@@ -183,9 +229,9 @@ pub struct CacheMaskTask {
 pub struct PictureTask {
     pub prim_index: PrimitiveIndex,
     pub target_kind: RenderTargetKind,
-    pub content_origin: LayerPoint,
+    pub content_origin: ContentOrigin,
     pub color: PremultipliedColorF,
-    pub rasterization_kind: RasterizationSpace,
+    pub pic_type: PictureType,
 }
 
 #[derive(Debug)]
@@ -250,13 +296,12 @@ impl RenderTask {
         size: Option<DeviceIntSize>,
         prim_index: PrimitiveIndex,
         target_kind: RenderTargetKind,
-        content_origin_x: f32,
-        content_origin_y: f32,
+        content_origin: ContentOrigin,
         color: PremultipliedColorF,
         clear_mode: ClearMode,
-        rasterization_kind: RasterizationSpace,
         children: Vec<RenderTaskId>,
         box_shadow_cache_key: Option<BoxShadowCacheKey>,
+        pic_type: PictureType,
     ) -> Self {
         let location = match size {
             Some(size) => RenderTaskLocation::Dynamic(None, size),
@@ -273,9 +318,9 @@ impl RenderTask {
             kind: RenderTaskKind::Picture(PictureTask {
                 prim_index,
                 target_kind,
-                content_origin: LayerPoint::new(content_origin_x, content_origin_y),
+                content_origin,
                 color,
-                rasterization_kind,
+                pic_type,
             }),
             clear_mode,
             pass_index: None,
@@ -443,11 +488,20 @@ impl RenderTask {
         let (data1, data2) = match self.kind {
             RenderTaskKind::Picture(ref task) => {
                 (
-                    [
-                        task.content_origin.x,
-                        task.content_origin.y,
-                        task.rasterization_kind as u32 as f32,
-                    ],
+                    // Note: has to match `PICTURE_TYPE_*` in shaders
+                    // TODO(gw): Instead of using the sign of the picture
+                    //           type here, we should consider encoding it
+                    //           as a set of flags that get casted here
+                    //           and in the shader. This is a bit tidier
+                    //           and allows for future expansion of flags.
+                    match task.content_origin {
+                        ContentOrigin::Local(point) => [
+                            point.x, point.y, task.pic_type as u32 as f32,
+                        ],
+                        ContentOrigin::Screen(point) => [
+                            point.x as f32, point.y as f32, -(task.pic_type as u32 as f32),
+                        ],
+                    },
                     task.color.to_array()
                 )
             }
@@ -592,7 +646,6 @@ impl RenderTask {
             RenderTaskKind::Picture(ref task) => {
                 pt.new_level(format!("Picture of {:?}", task.prim_index));
                 pt.add_item(format!("kind: {:?}", task.target_kind));
-                pt.add_item(format!("space: {:?}", task.rasterization_kind));
             }
             RenderTaskKind::CacheMask(ref task) => {
                 pt.new_level(format!("CacheMask with {} clips", task.clips.len()));
diff --git a/gfx/webrender/src/renderer.rs b/gfx/webrender/src/renderer.rs
index 058875400e7e..537a543d79a0 100644
--- a/gfx/webrender/src/renderer.rs
+++ b/gfx/webrender/src/renderer.rs
@@ -9,18 +9,17 @@
 //!
 //! [renderer]: struct.Renderer.html
 
-use api::{channel, BlobImageRenderer, FontRenderMode};
-use api::{ColorF, DocumentId, Epoch, PipelineId, RenderApiSender, RenderNotifier};
-use api::{DevicePixel, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
-use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize, ColorU};
-use api::{ExternalImageId, ExternalImageType, ImageFormat};
-use api::{YUV_COLOR_SPACES, YUV_FORMATS};
-use api::{YuvColorSpace, YuvFormat};
+use api::{BlobImageRenderer, ColorF, ColorU, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use api::{DeviceUintPoint, DeviceUintRect, DeviceUintSize, DocumentId, Epoch, ExternalImageId};
+use api::{ExternalImageType, FontRenderMode, ImageFormat, PipelineId, RenderApiSender};
+use api::{RenderNotifier, YUV_COLOR_SPACES, YUV_FORMATS, YuvColorSpace, YuvFormat, channel};
 #[cfg(not(feature = "debugger"))]
 use api::ApiMsg;
 use api::DebugCommand;
 #[cfg(not(feature = "debugger"))]
 use api::channel::MsgSender;
+use batch::{BatchKey, BatchKind, BatchTextures, BrushBatchKind};
+use batch::{BrushImageSourceKind, TransformBatchKind};
 use debug_colors;
 use debug_render::DebugRenderer;
 #[cfg(feature = "debugger")]
@@ -32,15 +31,16 @@ use device::{get_gl_format_bgra, ExternalTexture, FBOId, TextureSlot, VertexAttr
 use device::{FileWatcherHandler, ShaderError, TextureFilter, TextureTarget,
              VertexUsageHint, VAO, VBO, CustomVAO};
 use device::ProgramCache;
-use euclid::{rect, TypedScale, Transform3D};
+use euclid::{rect, Transform3D};
 use frame_builder::FrameBuilderConfig;
 use gleam::gl;
 use glyph_rasterizer::GlyphFormat;
 use gpu_cache::{GpuBlockData, GpuCacheUpdate, GpuCacheUpdateList};
 use gpu_types::PrimitiveInstance;
-use internal_types::{BatchTextures, SourceTexture, ORTHO_FAR_PLANE, ORTHO_NEAR_PLANE};
+use internal_types::{SourceTexture, ORTHO_FAR_PLANE, ORTHO_NEAR_PLANE};
 use internal_types::{CacheTextureId, FastHashMap, RenderedDocument, ResultMsg, TextureUpdateOp};
 use internal_types::{DebugOutput, RenderPassIndex, RenderTargetInfo, TextureUpdateList, TextureUpdateSource};
+use picture::ContentOrigin;
 use profiler::{BackendProfileCounters, Profiler};
 use profiler::{GpuProfileTag, RendererProfileCounters, RendererProfileTimers};
 use query::{GpuProfiler, GpuTimer};
@@ -66,7 +66,7 @@ use texture_cache::TextureCache;
 use thread_profiler::{register_thread_with_profiler, write_profile};
 use tiling::{AlphaRenderTarget, ColorRenderTarget};
 use tiling::{RenderPass, RenderPassKind, RenderTargetList};
-use tiling::{BatchKey, BatchKind, BrushBatchKind, BrushImageSourceKind, Frame, RenderTarget, ScalingInfo, TransformBatchKind};
+use tiling::{Frame, RenderTarget, ScalingInfo};
 use time::precise_time_ns;
 use util::TransformedRectKind;
 
@@ -91,6 +91,10 @@ const GPU_TAG_BRUSH_IMAGE: GpuProfileTag = GpuProfileTag {
     label: "B_Image",
     color: debug_colors::SILVER,
 };
+const GPU_TAG_BRUSH_LINE: GpuProfileTag = GpuProfileTag {
+    label: "Line",
+    color: debug_colors::DARKRED,
+};
 const GPU_TAG_CACHE_CLIP: GpuProfileTag = GpuProfileTag {
     label: "C_Clip",
     color: debug_colors::PURPLE,
@@ -111,10 +115,6 @@ const GPU_TAG_SETUP_DATA: GpuProfileTag = GpuProfileTag {
     label: "data init",
     color: debug_colors::LIGHTGREY,
 };
-const GPU_TAG_PRIM_LINE: GpuProfileTag = GpuProfileTag {
-    label: "Line",
-    color: debug_colors::DARKRED,
-};
 const GPU_TAG_PRIM_IMAGE: GpuProfileTag = GpuProfileTag {
     label: "Image",
     color: debug_colors::GREEN,
@@ -198,13 +198,11 @@ impl TransformBatchKind {
             TransformBatchKind::RadialGradient => "RadialGradient",
             TransformBatchKind::BorderCorner => "BorderCorner",
             TransformBatchKind::BorderEdge => "BorderEdge",
-            TransformBatchKind::Line => "Line",
         }
     }
 
     fn gpu_sampler_tag(&self) -> GpuProfileTag {
         match *self {
-            TransformBatchKind::Line => GPU_TAG_PRIM_LINE,
             TransformBatchKind::TextRun(..) => GPU_TAG_PRIM_TEXT_RUN,
             TransformBatchKind::Image(..) => GPU_TAG_PRIM_IMAGE,
             TransformBatchKind::YuvImage(..) => GPU_TAG_PRIM_YUV_IMAGE,
@@ -229,6 +227,7 @@ impl BatchKind {
                 match kind {
                     BrushBatchKind::Image(..) => "Brush (Image)",
                     BrushBatchKind::Solid => "Brush (Solid)",
+                    BrushBatchKind::Line => "Brush (Line)",
                 }
             }
             BatchKind::Transformable(_, batch_kind) => batch_kind.debug_name(),
@@ -245,6 +244,7 @@ impl BatchKind {
                 match kind {
                     BrushBatchKind::Image(..) => GPU_TAG_BRUSH_IMAGE,
                     BrushBatchKind::Solid => GPU_TAG_BRUSH_SOLID,
+                    BrushBatchKind::Line => GPU_TAG_BRUSH_LINE,
                 }
             }
             BatchKind::Transformable(_, batch_kind) => batch_kind.gpu_sampler_tag(),
@@ -288,8 +288,9 @@ enum TextShaderMode {
     SubpixelWithBgColorPass0 = 4,
     SubpixelWithBgColorPass1 = 5,
     SubpixelWithBgColorPass2 = 6,
-    Bitmap = 7,
-    ColorBitmap = 8,
+    SubpixelDualSource = 7,
+    Bitmap = 8,
+    ColorBitmap = 9,
 }
 
 impl Into<ShaderMode> for TextShaderMode {
@@ -326,6 +327,7 @@ enum TextureSampler {
     // the *first* pass. Items rendered in this target are
     // available as inputs to tasks in any subsequent pass.
     SharedCacheA8,
+    LocalClipRects
 }
 
 impl TextureSampler {
@@ -354,6 +356,7 @@ impl Into<TextureSlot> for TextureSampler {
             TextureSampler::RenderTasks => TextureSlot(7),
             TextureSampler::Dither => TextureSlot(8),
             TextureSampler::SharedCacheA8 => TextureSlot(9),
+            TextureSampler::LocalClipRects => TextureSlot(10),
         }
     }
 }
@@ -433,7 +436,7 @@ const DESC_CLIP: VertexDescriptor = VertexDescriptor {
             kind: VertexAttributeKind::I32,
         },
         VertexAttribute {
-            name: "aClipLayerAddress",
+            name: "aScrollNodeId",
             count: 1,
             kind: VertexAttributeKind::I32,
         },
@@ -768,6 +771,7 @@ pub enum BlendMode {
     None,
     PremultipliedAlpha,
     PremultipliedDestOut,
+    SubpixelDualSource,
     SubpixelConstantTextColor(ColorF),
     SubpixelWithBgColor,
     SubpixelVariableTextColor,
@@ -1297,6 +1301,7 @@ impl BrushShader {
             }
             BlendMode::PremultipliedAlpha |
             BlendMode::PremultipliedDestOut |
+            BlendMode::SubpixelDualSource |
             BlendMode::SubpixelConstantTextColor(..) |
             BlendMode::SubpixelVariableTextColor |
             BlendMode::SubpixelWithBgColor => {
@@ -1491,6 +1496,7 @@ fn create_prim_shader(
                 ("sRenderTasks", TextureSampler::RenderTasks),
                 ("sResourceCache", TextureSampler::ResourceCache),
                 ("sSharedCacheA8", TextureSampler::SharedCacheA8),
+                ("sLocalClipRects", TextureSampler::LocalClipRects),
             ],
         );
     }
@@ -1518,6 +1524,7 @@ fn create_clip_shader(name: &'static str, device: &mut Device) -> Result<Program
                 ("sRenderTasks", TextureSampler::RenderTasks),
                 ("sResourceCache", TextureSampler::ResourceCache),
                 ("sSharedCacheA8", TextureSampler::SharedCacheA8),
+                ("sLocalClipRects", TextureSampler::LocalClipRects),
             ],
         );
     }
@@ -1570,7 +1577,6 @@ pub struct Renderer {
     // draw intermediate results to cache targets. The results
     // of these shaders are then used by the primitive shaders.
     cs_text_run: LazilyCompiledShader,
-    cs_line: LazilyCompiledShader,
     cs_blur_a8: LazilyCompiledShader,
     cs_blur_rgba8: LazilyCompiledShader,
 
@@ -1581,6 +1587,7 @@ pub struct Renderer {
     brush_image_rgba8_alpha_mask: BrushShader,
     brush_image_a8: BrushShader,
     brush_solid: BrushShader,
+    brush_line: BrushShader,
 
     /// These are "cache clip shaders". These shaders are used to
     /// draw clip instances into the cached clip mask. The results
@@ -1597,6 +1604,7 @@ pub struct Renderer {
     // output, and the cache_image shader blits the results of
     // a cache shader (e.g. blur) to the screen.
     ps_text_run: TextShader,
+    ps_text_run_dual_source: TextShader,
     ps_image: Vec<Option<PrimitiveShader>>,
     ps_yuv_image: Vec<Option<PrimitiveShader>>,
     ps_border_corner: PrimitiveShader,
@@ -1604,7 +1612,6 @@ pub struct Renderer {
     ps_gradient: PrimitiveShader,
     ps_angle_gradient: PrimitiveShader,
     ps_radial_gradient: PrimitiveShader,
-    ps_line: PrimitiveShader,
 
     ps_blend: LazilyCompiledShader,
     ps_hw_composite: LazilyCompiledShader,
@@ -1629,6 +1636,7 @@ pub struct Renderer {
     clip_vao: VAO,
 
     node_data_texture: VertexDataTexture,
+    local_clip_rects_texture: VertexDataTexture,
     render_task_texture: VertexDataTexture,
     gpu_cache_texture: CacheTexture,
 
@@ -1724,6 +1732,9 @@ impl Renderer {
             options.cached_programs,
         );
 
+        let ext_dual_source_blending = !options.disable_dual_source_blending &&
+            device.supports_extension("GL_ARB_blend_func_extended");
+
         let device_max_size = device.max_texture_size();
         // 512 is the minimum that the texture cache can work with.
         // Broken GL contexts can return a max texture size of zero (See #1260). Better to
@@ -1756,14 +1767,6 @@ impl Renderer {
                                       options.precache_shaders)
         };
 
-        let cs_line = try!{
-            LazilyCompiledShader::new(ShaderKind::Cache(VertexArrayKind::Primitive),
-                                      "ps_line",
-                                      &["CACHE"],
-                                      &mut device,
-                                      options.precache_shaders)
-        };
-
         let brush_mask_corner = try!{
             LazilyCompiledShader::new(ShaderKind::Brush,
                                       "brush_mask_corner",
@@ -1787,6 +1790,13 @@ impl Renderer {
                              options.precache_shaders)
         };
 
+        let brush_line = try!{
+            BrushShader::new("brush_line",
+                             &mut device,
+                             &[],
+                             options.precache_shaders)
+        };
+
         let brush_image_a8 = try!{
             BrushShader::new("brush_image",
                              &mut device,
@@ -1848,18 +1858,18 @@ impl Renderer {
                                       options.precache_shaders)
         };
 
-        let ps_line = try!{
-            PrimitiveShader::new("ps_line",
-                                 &mut device,
-                                 &[],
-                                 options.precache_shaders)
-        };
-
         let ps_text_run = try!{
             TextShader::new("ps_text_run",
                             &mut device,
                             &[],
-                           options.precache_shaders)
+                            options.precache_shaders)
+        };
+
+        let ps_text_run_dual_source = try!{
+            TextShader::new("ps_text_run",
+                            &mut device,
+                            &["DUAL_SOURCE_BLENDING"],
+                            options.precache_shaders)
         };
 
         // All image configuration.
@@ -2129,6 +2139,7 @@ impl Renderer {
         let texture_resolver = SourceTextureResolver::new(&mut device);
 
         let node_data_texture = VertexDataTexture::new(&mut device);
+        let local_clip_rects_texture = VertexDataTexture::new(&mut device);
         let render_task_texture = VertexDataTexture::new(&mut device);
 
         let gpu_cache_texture = CacheTexture::new(
@@ -2150,6 +2161,8 @@ impl Renderer {
             enable_scrollbars: options.enable_scrollbars,
             default_font_render_mode,
             debug: options.debug,
+            dual_source_blending_is_enabled: true,
+            dual_source_blending_is_supported: ext_dual_source_blending,
         };
 
         let device_pixel_ratio = options.device_pixel_ratio;
@@ -2223,7 +2236,6 @@ impl Renderer {
             pending_gpu_cache_updates: Vec::new(),
             pending_shader_updates: Vec::new(),
             cs_text_run,
-            cs_line,
             cs_blur_a8,
             cs_blur_rgba8,
             brush_mask_corner,
@@ -2232,10 +2244,12 @@ impl Renderer {
             brush_image_rgba8_alpha_mask,
             brush_image_a8,
             brush_solid,
+            brush_line,
             cs_clip_rectangle,
             cs_clip_border,
             cs_clip_image,
             ps_text_run,
+            ps_text_run_dual_source,
             ps_image,
             ps_yuv_image,
             ps_border_corner,
@@ -2247,7 +2261,6 @@ impl Renderer {
             ps_hw_composite,
             ps_split_composite,
             ps_composite,
-            ps_line,
             debug: debug_renderer,
             debug_flags,
             backend_profile_counters: BackendProfileCounters::new(),
@@ -2263,6 +2276,7 @@ impl Renderer {
             blur_vao,
             clip_vao,
             node_data_texture,
+            local_clip_rects_texture,
             render_task_texture,
             pipeline_epoch_map: FastHashMap::default(),
             dither_matrix_texture,
@@ -2376,6 +2390,48 @@ impl Renderer {
                     DebugOutput::FetchClipScrollTree(string) => {
                         self.debug_server.send(string);
                     }
+                    #[cfg(feature = "capture")]
+                    DebugOutput::SaveCapture(path, deferred)=> {
+                        use std::fs::File;
+                        use std::io::Write;
+                        use api::ExternalImageData;
+
+                        if deferred.is_empty() {
+                            continue
+                        }
+
+                        info!("saving external images");
+                        let handler = self.external_image_handler
+                            .as_mut()
+                            .expect("Unable to lock the external image handler!");
+                        for def in deferred {
+                            let ExternalImageData { id, channel_index, .. } = def.external;
+                            let data = match handler.lock(id, channel_index).source {
+                                ExternalImageSource::RawData(data) => data.to_vec(),
+                                ExternalImageSource::NativeTexture(_gl_id) => {
+                                    //TODO: make a read FBO with this GL texture
+                                    //self.device.read_pixels(&def.descriptor);
+                                    unimplemented!()
+                                }
+                                ExternalImageSource::Invalid => {
+                                    // Create a dummy buffer...
+                                    let stride = def.descriptor.compute_stride();
+                                    let total_size = def.descriptor.height * stride;
+                                    vec![0xFF; total_size as usize]
+                                }
+                            };
+                            handler.unlock(id, channel_index);
+
+                            let full_path = format!("{}/{}",
+                                path.to_string_lossy(), def.short_path);
+                            File::create(full_path)
+                                .expect(&format!("Unable to create {}", def.short_path))
+                                .write_all(&data)
+                                .unwrap();
+                        }
+                    }
+                    #[cfg(feature = "capture")]
+                    DebugOutput::LoadCapture => {}
                 },
                 ResultMsg::DebugCommand(command) => {
                     self.handle_debug_command(command);
@@ -2394,8 +2450,11 @@ impl Renderer {
 
     #[cfg(feature = "debugger")]
     fn get_screenshot_for_debugger(&mut self) -> String {
-        let data = self.device.read_pixels(1024, 768);
-        let screenshot = debug_server::Screenshot::new(1024, 768, data);
+        use api::ImageDescriptor;
+
+        let desc = ImageDescriptor::new(1024, 768, ImageFormat::BGRA8, true);
+        let data = self.device.read_pixels(&desc);
+        let screenshot = debug_server::Screenshot::new(desc.width, desc.height, data);
 
         serde_json::to_string(&screenshot).unwrap()
     }
@@ -2467,7 +2526,7 @@ impl Renderer {
             "Horizontal Blur",
             target.horizontal_blurs.len(),
         );
-        for (_, batch) in &target.text_run_cache_prims {
+        for (_, batch) in &target.alpha_batcher.text_run_cache_prims {
             debug_target.add(
                 debug_server::BatchKind::Cache,
                 "Text Shadow",
@@ -2477,7 +2536,7 @@ impl Renderer {
         debug_target.add(
             debug_server::BatchKind::Cache,
             "Lines",
-            target.line_cache_prims.len(),
+            target.alpha_batcher.line_cache_prims.len(),
         );
 
         for batch in target
@@ -2589,6 +2648,13 @@ impl Renderer {
                 let json = self.get_screenshot_for_debugger();
                 self.debug_server.send(json);
             }
+            DebugCommand::SaveCapture(_) |
+            DebugCommand::LoadCapture(_) => {
+                panic!("Capture commands are not welcome here!")
+            }
+            DebugCommand::EnableDualSourceBlending(_) => {
+                panic!("Should be handled by render backend");
+            }
         }
     }
 
@@ -3053,18 +3119,18 @@ impl Renderer {
                             &mut self.renderer_errors,
                         );
                     }
+                    BrushBatchKind::Line => {
+                        self.brush_line.bind(
+                            &mut self.device,
+                            key.blend_mode,
+                            projection,
+                            0,
+                            &mut self.renderer_errors,
+                        );
+                    }
                 }
             }
             BatchKind::Transformable(transform_kind, batch_kind) => match batch_kind {
-                TransformBatchKind::Line => {
-                    self.ps_line.bind(
-                        &mut self.device,
-                        transform_kind,
-                        projection,
-                        0,
-                        &mut self.renderer_errors,
-                    );
-                }
                 TransformBatchKind::TextRun(..) => {
                     unreachable!("bug: text batches are special cased");
                 }
@@ -3160,19 +3226,18 @@ impl Renderer {
 
             let (readback_rect, readback_layer) = readback.get_target_rect();
             let (backdrop_rect, _) = backdrop.get_target_rect();
-            let content_to_device_scale = TypedScale::<_, _, DevicePixel>::new(1i32);
             let backdrop_screen_origin = match backdrop.kind {
-                RenderTaskKind::Picture(ref task_info) => task_info
-                    .content_origin
-                    .to_i32()
-                    * content_to_device_scale,
+                RenderTaskKind::Picture(ref task_info) => match task_info.content_origin {
+                    ContentOrigin::Local(_) => panic!("bug: composite from a local-space rasterized picture?"),
+                    ContentOrigin::Screen(p) => p,
+                },
                 _ => panic!("bug: composite on non-picture?"),
             };
             let source_screen_origin = match source.kind {
-                RenderTaskKind::Picture(ref task_info) => task_info
-                    .content_origin
-                    .to_i32()
-                    * content_to_device_scale,
+                RenderTaskKind::Picture(ref task_info) => match task_info.content_origin {
+                    ContentOrigin::Local(_) => panic!("bug: composite from a local-space rasterized picture?"),
+                    ContentOrigin::Screen(p) => p,
+                },
                 _ => panic!("bug: composite on non-picture?"),
             };
 
@@ -3343,14 +3408,14 @@ impl Renderer {
         // considering using this for (some) other text runs, since
         // it removes the overhead of submitting many small glyphs
         // to multiple tiles in the normal text run case.
-        if !target.text_run_cache_prims.is_empty() {
+        if !target.alpha_batcher.text_run_cache_prims.is_empty() {
             self.device.set_blend(true);
             self.device.set_blend_mode_premultiplied_alpha();
 
             let _timer = self.gpu_profile.start_timer(GPU_TAG_CACHE_TEXT_RUN);
             self.cs_text_run
                 .bind(&mut self.device, projection, 0, &mut self.renderer_errors);
-            for (texture_id, instances) in &target.text_run_cache_prims {
+            for (texture_id, instances) in &target.alpha_batcher.text_run_cache_prims {
                 self.draw_instanced_batch(
                     instances,
                     VertexArrayKind::Primitive,
@@ -3359,17 +3424,22 @@ impl Renderer {
                 );
             }
         }
-        if !target.line_cache_prims.is_empty() {
+        if !target.alpha_batcher.line_cache_prims.is_empty() {
             // TODO(gw): Technically, we don't need blend for solid
             //           lines. We could check that here?
             self.device.set_blend(true);
             self.device.set_blend_mode_premultiplied_alpha();
 
             let _timer = self.gpu_profile.start_timer(GPU_TAG_CACHE_LINE);
-            self.cs_line
-                .bind(&mut self.device, projection, 0, &mut self.renderer_errors);
+            self.brush_line.bind(
+                &mut self.device,
+                BlendMode::PremultipliedAlpha,
+                projection,
+                0,
+                &mut self.renderer_errors,
+            );
             self.draw_instanced_batch(
-                &target.line_cache_prims,
+                &target.alpha_batcher.line_cache_prims,
                 VertexArrayKind::Primitive,
                 &BatchTextures::no_texture(),
                 stats,
@@ -3427,6 +3497,7 @@ impl Renderer {
                         BlendMode::SubpixelConstantTextColor(..) => debug_colors::GREEN,
                         BlendMode::SubpixelVariableTextColor => debug_colors::RED,
                         BlendMode::SubpixelWithBgColor => debug_colors::BLUE,
+                        BlendMode::SubpixelDualSource => debug_colors::YELLOW,
                     }.into();
                     for item_rect in &batch.item_rects {
                         self.debug.add_rect(item_rect, color);
@@ -3466,6 +3537,25 @@ impl Renderer {
                                     stats,
                                 );
                             }
+                            BlendMode::SubpixelDualSource => {
+                                self.device.set_blend_mode_subpixel_dual_source();
+
+                                self.ps_text_run_dual_source.bind(
+                                    &mut self.device,
+                                    glyph_format,
+                                    transform_kind,
+                                    projection,
+                                    TextShaderMode::SubpixelDualSource,
+                                    &mut self.renderer_errors,
+                                );
+
+                                self.draw_instanced_batch(
+                                    &batch.instances,
+                                    VertexArrayKind::Primitive,
+                                    &batch.key.textures,
+                                    stats,
+                                );
+                            }
                             BlendMode::SubpixelConstantTextColor(color) => {
                                 self.device.set_blend_mode_subpixel_constant_text_color(color);
 
@@ -3606,7 +3696,8 @@ impl Renderer {
                                 }
                                 BlendMode::SubpixelConstantTextColor(..) |
                                 BlendMode::SubpixelVariableTextColor |
-                                BlendMode::SubpixelWithBgColor => {
+                                BlendMode::SubpixelWithBgColor |
+                                BlendMode::SubpixelDualSource => {
                                     unreachable!("bug: subpx text handled earlier");
                                 }
                             }
@@ -4018,10 +4109,17 @@ impl Renderer {
             }
         }
 
-        self.node_data_texture
-            .update(&mut self.device, &mut frame.node_data);
-        self.device
-            .bind_texture(TextureSampler::ClipScrollNodes, &self.node_data_texture.texture);
+        self.node_data_texture.update(&mut self.device, &mut frame.node_data);
+        self.device.bind_texture(TextureSampler::ClipScrollNodes, &self.node_data_texture.texture);
+
+        self.local_clip_rects_texture.update(
+            &mut self.device,
+            &mut frame.clip_chain_local_clip_rects
+        );
+        self.device.bind_texture(
+            TextureSampler::LocalClipRects,
+            &self.local_clip_rects_texture.texture
+        );
 
         self.render_task_texture
             .update(&mut self.device, &mut frame.render_tasks.task_data);
@@ -4407,6 +4505,7 @@ impl Renderer {
             self.device.delete_texture(dither_matrix_texture);
         }
         self.node_data_texture.deinit(&mut self.device);
+        self.local_clip_rects_texture.deinit(&mut self.device);
         self.render_task_texture.deinit(&mut self.device);
         self.device.delete_pbo(self.texture_cache_upload_pbo);
         self.texture_resolver.deinit(&mut self.device);
@@ -4415,7 +4514,6 @@ impl Renderer {
         self.device.delete_vao(self.blur_vao);
         self.debug.deinit(&mut self.device);
         self.cs_text_run.deinit(&mut self.device);
-        self.cs_line.deinit(&mut self.device);
         self.cs_blur_a8.deinit(&mut self.device);
         self.cs_blur_rgba8.deinit(&mut self.device);
         self.brush_mask_rounded_rect.deinit(&mut self.device);
@@ -4424,10 +4522,12 @@ impl Renderer {
         self.brush_image_rgba8_alpha_mask.deinit(&mut self.device);
         self.brush_image_a8.deinit(&mut self.device);
         self.brush_solid.deinit(&mut self.device);
+        self.brush_line.deinit(&mut self.device);
         self.cs_clip_rectangle.deinit(&mut self.device);
         self.cs_clip_image.deinit(&mut self.device);
         self.cs_clip_border.deinit(&mut self.device);
         self.ps_text_run.deinit(&mut self.device);
+        self.ps_text_run_dual_source.deinit(&mut self.device);
         for shader in self.ps_image {
             if let Some(shader) = shader {
                 shader.deinit(&mut self.device);
@@ -4446,7 +4546,6 @@ impl Renderer {
         self.ps_gradient.deinit(&mut self.device);
         self.ps_angle_gradient.deinit(&mut self.device);
         self.ps_radial_gradient.deinit(&mut self.device);
-        self.ps_line.deinit(&mut self.device);
         self.ps_blend.deinit(&mut self.device);
         self.ps_hw_composite.deinit(&mut self.device);
         self.ps_split_composite.deinit(&mut self.device);
@@ -4533,6 +4632,7 @@ pub struct RendererOptions {
     pub cached_programs: Option<Rc<ProgramCache>>,
     pub debug_flags: DebugFlags,
     pub renderer_id: Option<u64>,
+    pub disable_dual_source_blending: bool,
 }
 
 impl Default for RendererOptions {
@@ -4564,6 +4664,7 @@ impl Default for RendererOptions {
             enable_render_on_scroll: true,
             renderer_id: None,
             cached_programs: None,
+            disable_dual_source_blending: false,
         }
     }
 }
diff --git a/gfx/webrender/src/resource_cache.rs b/gfx/webrender/src/resource_cache.rs
index e916503c95fa..2066656e26c8 100644
--- a/gfx/webrender/src/resource_cache.rs
+++ b/gfx/webrender/src/resource_cache.rs
@@ -12,6 +12,8 @@ use api::{FontInstanceOptions, FontInstancePlatformOptions, FontVariation};
 use api::{GlyphDimensions, GlyphKey, IdNamespace};
 use api::{ImageData, ImageDescriptor, ImageKey, ImageRendering};
 use api::{TileOffset, TileSize};
+#[cfg(feature = "capture")]
+use api::{NativeFontHandle};
 use app_units::Au;
 use device::TextureFilter;
 use frame::FrameId;
@@ -19,6 +21,8 @@ use glyph_cache::GlyphCache;
 use glyph_rasterizer::{FontInstance, GlyphFormat, GlyphRasterizer, GlyphRequest};
 use gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle};
 use internal_types::{FastHashMap, FastHashSet, SourceTexture, TextureUpdateList};
+#[cfg(feature = "capture")]
+use internal_types::ExternalCaptureImage;
 use profiler::{ResourceProfileCounters, TextureCacheProfileCounters};
 use rayon::ThreadPool;
 use std::collections::hash_map::Entry::{self, Occupied, Vacant};
@@ -26,9 +30,12 @@ use std::cmp;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::mem;
+#[cfg(feature = "capture")]
+use std::path::PathBuf;
 use std::sync::{Arc, RwLock};
 use texture_cache::{TextureCache, TextureCacheHandle};
 
+
 const DEFAULT_TILE_SIZE: TileSize = 512;
 
 pub struct GlyphFetchResult {
@@ -236,7 +243,7 @@ impl ResourceCache {
         texture_cache: TextureCache,
         workers: Arc<ThreadPool>,
         blob_image_renderer: Option<Box<BlobImageRenderer>>,
-    ) -> ResourceCache {
+    ) -> Self {
         ResourceCache {
             cached_glyphs: GlyphCache::new(),
             cached_images: ResourceClassCache::new(),
@@ -525,8 +532,10 @@ impl ResourceCache {
         // valid to use as-is.
         let (entry, needs_update) = match self.cached_images.entry(request) {
             Occupied(entry) => {
-                let needs_update = entry.get().as_ref().unwrap().epoch != template.epoch;
-                (entry.into_mut(), needs_update)
+                let info = entry.into_mut();
+                let needs_update = info.as_mut().unwrap().epoch != template.epoch;
+                info.as_mut().unwrap().epoch = template.epoch;
+                (info, needs_update)
             }
             Vacant(entry) => (
                 entry.insert(Ok(
@@ -549,43 +558,41 @@ impl ResourceCache {
         // We can start a worker thread rasterizing right now, if:
         //  - The image is a blob.
         //  - The blob hasn't already been requested this frame.
-        if self.pending_image_requests.insert(request) {
-            if template.data.is_blob() {
-                if let Some(ref mut renderer) = self.blob_image_renderer {
-                    let (offset, w, h) = match template.tiling {
-                        Some(tile_size) => {
-                            let tile_offset = request.tile.unwrap();
-                            let (w, h) = compute_tile_size(
-                                &template.descriptor,
-                                tile_size,
-                                tile_offset,
-                            );
-                            let offset = DevicePoint::new(
-                                tile_offset.x as f32 * tile_size as f32,
-                                tile_offset.y as f32 * tile_size as f32,
-                            );
+        if self.pending_image_requests.insert(request) && template.data.is_blob() {
+            if let Some(ref mut renderer) = self.blob_image_renderer {
+                let (offset, w, h) = match template.tiling {
+                    Some(tile_size) => {
+                        let tile_offset = request.tile.unwrap();
+                        let (w, h) = compute_tile_size(
+                            &template.descriptor,
+                            tile_size,
+                            tile_offset,
+                        );
+                        let offset = DevicePoint::new(
+                            tile_offset.x as f32 * tile_size as f32,
+                            tile_offset.y as f32 * tile_size as f32,
+                        );
 
-                            (offset, w, h)
-                        }
-                        None => (
-                            DevicePoint::zero(),
-                            template.descriptor.width,
-                            template.descriptor.height,
-                        ),
-                    };
+                        (offset, w, h)
+                    }
+                    None => (
+                        DevicePoint::zero(),
+                        template.descriptor.width,
+                        template.descriptor.height,
+                    ),
+                };
 
-                    renderer.request(
-                        &self.resources,
-                        request.into(),
-                        &BlobImageDescriptor {
-                            width: w,
-                            height: h,
-                            offset,
-                            format: template.descriptor.format,
-                        },
-                        template.dirty_rect,
-                    );
-                }
+                renderer.request(
+                    &self.resources,
+                    request.into(),
+                    &BlobImageDescriptor {
+                        width: w,
+                        height: h,
+                        offset,
+                        format: template.descriptor.format,
+                    },
+                    template.dirty_rect,
+                );
             }
         }
     }
@@ -932,3 +939,267 @@ pub fn compute_tile_size(
 
     (actual_width, actual_height)
 }
+
+#[cfg(feature = "capture")]
+#[derive(Serialize, Deserialize)]
+enum PlainFontTemplate {
+    Raw {
+        data: String,
+        index: u32,
+    },
+    Native(NativeFontHandle),
+}
+
+#[cfg(feature = "capture")]
+#[derive(Serialize, Deserialize)]
+struct PlainImageTemplate {
+    data: String,
+    descriptor: ImageDescriptor,
+    tiling: Option<TileSize>,
+}
+
+#[cfg(feature = "capture")]
+#[derive(Serialize, Deserialize)]
+pub struct PlainResources {
+    font_templates: FastHashMap<FontKey, PlainFontTemplate>,
+    font_instances: FastHashMap<FontInstanceKey, FontInstance>,
+    image_templates: FastHashMap<ImageKey, PlainImageTemplate>,
+}
+
+#[cfg(feature = "capture")]
+impl ResourceCache {
+    pub fn save_capture(
+        &mut self, root: &PathBuf
+    ) -> (PlainResources, Vec<ExternalCaptureImage>) {
+        use std::fs;
+        use std::io::Write;
+
+        info!("saving resource cache");
+        let res = &self.resources;
+        if !root.is_dir() {
+            fs::create_dir_all(&root).unwrap()
+        }
+        let path_fonts = root.clone().join("fonts");
+        if !path_fonts.is_dir() {
+            fs::create_dir(&path_fonts).unwrap();
+        }
+        let path_images = root.clone().join("images");
+        if !path_images.is_dir() {
+            fs::create_dir(&path_images).unwrap();
+        }
+        let path_blobs = root.clone().join("blobs");
+        if !path_blobs.is_dir() {
+            fs::create_dir(&path_blobs).unwrap();
+        }
+
+        info!("\tfont templates");
+        let mut font_paths = FastHashMap::default();
+        let mut num_fonts = 0;
+        for template in res.font_templates.values() {
+            let data: &[u8] = match *template {
+                FontTemplate::Raw(ref arc, _) => arc,
+                FontTemplate::Native(_) => continue,
+            };
+            let entry = match font_paths.entry(data.as_ptr()) {
+                Entry::Occupied(_) => continue,
+                Entry::Vacant(e) => e,
+            };
+            num_fonts += 1;
+            let file_name = format!("{}.raw", num_fonts);
+            let short_path = format!("fonts/{}", file_name);
+            let full_path = path_fonts.clone().join(&file_name);
+            fs::File::create(full_path)
+                .expect(&format!("Unable to create {}", short_path))
+                .write_all(data)
+                .unwrap();
+            entry.insert(short_path);
+        }
+
+        info!("\timage templates");
+        let mut image_paths = FastHashMap::default();
+        let mut other_paths = FastHashMap::default();
+        let mut num_images = 0;
+        let mut external_images = Vec::new();
+        for (&key, template) in res.image_templates.images.iter() {
+            let desc = &template.descriptor;
+            match template.data {
+                ImageData::Raw(ref arc) => {
+                    let entry = match image_paths.entry(arc.as_ptr()) {
+                        Entry::Occupied(_) => continue,
+                        Entry::Vacant(e) => e,
+                    };
+
+                    //TODO: option to save as PNG
+                    num_images += 1;
+                    let file_name = format!("{}.raw", num_images);
+                    let short_path = format!("images/{}", file_name);
+                    let full_path = path_images.clone().join(&file_name);
+                    fs::File::create(full_path)
+                        .expect(&format!("Unable to create {}", short_path))
+                        .write_all(&*arc)
+                        .unwrap();
+                    entry.insert(short_path);
+                }
+                ImageData::Blob(_) => {
+                    assert_eq!(template.tiling, None);
+                    let request = BlobImageRequest {
+                        key,
+                        tile: None, //TODO: tiled blob images
+                    };
+
+                    let renderer = self.blob_image_renderer.as_mut().unwrap();
+                    renderer.request(
+                        &self.resources,
+                        request,
+                        &BlobImageDescriptor {
+                            width: desc.width,
+                            height: desc.height,
+                            offset: DevicePoint::zero(),
+                            format: desc.format,
+                        },
+                        None,
+                    );
+                    let result = renderer.resolve(request)
+                        .expect("Blob resolve failed");
+                    assert_eq!((result.width, result.height), (desc.width, desc.height));
+
+                    let file_name = format!("{}.raw", other_paths.len() + 1);
+                    let short_path = format!("blobs/{}", file_name);
+                    let full_path = path_blobs.clone().join(&file_name);
+                    fs::File::create(full_path)
+                        .expect(&format!("Unable to create {}", short_path))
+                        .write_all(&result.data)
+                        .unwrap();
+                    other_paths.insert(key, short_path);
+                }
+                ImageData::External(ref ext) => {
+                    let short_path = format!("blobs/{}.raw", other_paths.len() + 1);
+                    other_paths.insert(key, short_path.clone());
+                    external_images.push(ExternalCaptureImage {
+                        short_path,
+                        descriptor: desc.clone(),
+                        external: ext.clone(),
+                    });
+                }
+            }
+        }
+
+        let resources = PlainResources {
+            font_templates: res.font_templates
+                .iter()
+                .map(|(key, template)| {
+                    (*key, match *template {
+                        FontTemplate::Raw(ref arc, index) => {
+                            PlainFontTemplate::Raw {
+                                data: font_paths[&arc.as_ptr()].clone(),
+                                index,
+                            }
+                        }
+                        FontTemplate::Native(ref native) => {
+                            PlainFontTemplate::Native(native.clone())
+                        }
+                    })
+                })
+                .collect(),
+            font_instances: res.font_instances.read().unwrap().clone(),
+            image_templates: res.image_templates.images
+                .iter()
+                .map(|(key, template)| {
+                    (*key, PlainImageTemplate {
+                        data: match template.data {
+                            ImageData::Raw(ref arc) => image_paths[&arc.as_ptr()].clone(),
+                            _ => other_paths[key].clone(),
+                        },
+                        descriptor: template.descriptor.clone(),
+                        tiling: template.tiling,
+                    })
+                })
+                .collect(),
+        };
+
+        (resources, external_images)
+    }
+
+    pub fn load_capture(&mut self, resources: PlainResources, root: &PathBuf) {
+        use std::fs::File;
+        use std::io::Read;
+
+        info!("loading resource cache");
+        self.cached_glyphs.clear();
+        self.cached_images.clear();
+
+        self.state = State::Idle;
+        self.current_frame_id = FrameId(0);
+
+        let max_texture_size = self.texture_cache.max_texture_size();
+        self.texture_cache = TextureCache::new(max_texture_size);
+
+        self.cached_glyph_dimensions.clear();
+        self.glyph_rasterizer.reset();
+        self.pending_image_requests.clear();
+
+        let res = &mut self.resources;
+        res.font_templates.clear();
+        *res.font_instances.write().unwrap() = resources.font_instances;
+        res.image_templates.images.clear();
+        let mut raw_map = FastHashMap::<String, Arc<Vec<u8>>>::default();
+
+        info!("\tfont templates...");
+        for (key, plain_template) in resources.font_templates {
+            let template = match plain_template {
+                PlainFontTemplate::Raw { data, index } => {
+                    let arc = match raw_map.entry(data) {
+                        Entry::Occupied(e) => {
+                            e.get().clone()
+                        }
+                        Entry::Vacant(e) => {
+                            let path = format!("{}/{}", root.to_string_lossy(), e.key());
+                            let mut buffer = Vec::new();
+                            File::open(path)
+                                .expect(&format!("Unable to open {}", e.key()))
+                                .read_to_end(&mut buffer)
+                                .unwrap();
+                            e.insert(Arc::new(buffer))
+                                .clone()
+                        }
+                    };
+                    FontTemplate::Raw(arc, index)
+                }
+                PlainFontTemplate::Native(native) => {
+                    FontTemplate::Native(native)
+                }
+            };
+
+            self.glyph_rasterizer.add_font(key, template.clone());
+            res.font_templates.insert(key, template);
+        }
+
+        info!("\timage templates...");
+        for (key, template) in resources.image_templates {
+            let arc = match raw_map.entry(template.data) {
+                Entry::Occupied(e) => {
+                    e.get().clone()
+                }
+                Entry::Vacant(e) => {
+                    //TODO: consider merging the code path with font loading
+                    let path = format!("{}/{}", root.to_string_lossy(), e.key());
+                    let mut buffer = Vec::new();
+                    File::open(path)
+                        .expect(&format!("Unable to open {}", e.key()))
+                        .read_to_end(&mut buffer)
+                        .unwrap();
+                    e.insert(Arc::new(buffer))
+                        .clone()
+                }
+            };
+
+            res.image_templates.images.insert(key, ImageResource {
+                data: ImageData::Raw(arc),
+                descriptor: template.descriptor,
+                tiling: template.tiling,
+                epoch: Epoch(0),
+                dirty_rect: None,
+            });
+        }
+    }
+}
diff --git a/gfx/webrender/src/scene.rs b/gfx/webrender/src/scene.rs
index fc5f665ccb8b..e8aee97e5ae7 100644
--- a/gfx/webrender/src/scene.rs
+++ b/gfx/webrender/src/scene.rs
@@ -10,13 +10,14 @@ use internal_types::FastHashMap;
 /// Stores a map of the animated property bindings for the current display list. These
 /// can be used to animate the transform and/or opacity of a display list without
 /// re-submitting the display list itself.
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct SceneProperties {
     transform_properties: FastHashMap<PropertyBindingId, LayoutTransform>,
     float_properties: FastHashMap<PropertyBindingId, f32>,
 }
 
 impl SceneProperties {
-    pub fn new() -> SceneProperties {
+    pub fn new() -> Self {
         SceneProperties {
             transform_properties: FastHashMap::default(),
             float_properties: FastHashMap::default(),
@@ -80,6 +81,7 @@ impl SceneProperties {
 }
 
 /// A representation of the layout within the display port for a given document or iframe.
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct ScenePipeline {
     pub pipeline_id: PipelineId,
     pub epoch: Epoch,
@@ -90,6 +92,7 @@ pub struct ScenePipeline {
 }
 
 /// A complete representation of the layout bundling visible pipelines together.
+#[cfg_attr(feature = "capture", derive(Serialize, Deserialize))]
 pub struct Scene {
     pub root_pipeline_id: Option<PipelineId>,
     pub pipelines: FastHashMap<PipelineId, ScenePipeline>,
@@ -97,7 +100,7 @@ pub struct Scene {
 }
 
 impl Scene {
-    pub fn new() -> Scene {
+    pub fn new() -> Self {
         Scene {
             root_pipeline_id: None,
             pipelines: FastHashMap::default(),
diff --git a/gfx/webrender/src/segment.rs b/gfx/webrender/src/segment.rs
new file mode 100644
index 000000000000..baa4847f33f8
--- /dev/null
+++ b/gfx/webrender/src/segment.rs
@@ -0,0 +1,808 @@
+/* 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/. */
+
+use api::{BorderRadius, ClipMode, LayerPoint, LayerPointAu, LayerRect, LayerSize};
+use app_units::Au;
+use prim_store::EdgeAaSegmentMask;
+use std::cmp;
+use util::extract_inner_rect_safe;
+
+// The segment builder outputs a list of these segments.
+#[derive(Debug, PartialEq)]
+pub struct Segment {
+    pub rect: LayerRect,
+    pub has_mask: bool,
+    pub edge_flags: EdgeAaSegmentMask,
+}
+
+// The segment builder creates a list of x/y axis events
+// that are used to build a segment list. Right now, we
+// don't bother providing a list of *which* clip regions
+// are active for a given segment. Instead, if there is
+// any clip mask present in a segment, we will just end
+// up drawing each of the masks to that segment clip.
+// This is a fairly rare case, but we can detect this
+// in the future and only apply clip masks that are
+// relevant to each segment region.
+// TODO(gw): Provide clip region info with each segment.
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd)]
+enum EventKind {
+    Begin,
+    End,
+}
+
+// Events must be ordered such that when the coordinates
+// of two events are the same, the end events are processed
+// before the begin events. This ensures that we're able
+// to detect which regions are active for a given segment.
+impl Ord for EventKind {
+    fn cmp(&self, other: &EventKind) -> cmp::Ordering {
+        match (*self, *other) {
+            (EventKind::Begin, EventKind::Begin) |
+            (EventKind::End, EventKind::End) => {
+                cmp::Ordering::Equal
+            }
+            (EventKind::Begin, EventKind::End) => {
+                cmp::Ordering::Greater
+            }
+            (EventKind::End, EventKind::Begin) => {
+                cmp::Ordering::Less
+            }
+        }
+    }
+}
+
+// A x/y event where we will create a vertex in the
+// segment builder.
+#[derive(Debug, Eq, PartialEq, PartialOrd)]
+struct Event {
+    value: Au,
+    item_index: ItemIndex,
+    kind: EventKind,
+}
+
+impl Ord for Event {
+    fn cmp(&self, other: &Event) -> cmp::Ordering {
+        self.value
+            .cmp(&other.value)
+            .then(self.kind.cmp(&other.kind))
+    }
+}
+
+impl Event {
+    fn begin(value: f32, index: usize) -> Event {
+        Event {
+            value: Au::from_f32_px(value),
+            item_index: ItemIndex(index),
+            kind: EventKind::Begin,
+        }
+    }
+
+    fn end(value: f32, index: usize) -> Event {
+        Event {
+            value: Au::from_f32_px(value),
+            item_index: ItemIndex(index),
+            kind: EventKind::End,
+        }
+    }
+
+    fn is_active(&self) -> bool {
+        match self.kind {
+            EventKind::Begin => true,
+            EventKind::End => false,
+        }
+    }
+}
+
+// An item that provides some kind of clip region (either
+// a clip in/out rect, or a mask region).
+#[derive(Debug)]
+struct Item {
+    rect: LayerRect,
+    mode: ClipMode,
+    has_mask: bool,
+    active_x: bool,
+    active_y: bool,
+}
+
+impl Item {
+    fn new(
+        rect: LayerRect,
+        mode: ClipMode,
+        has_mask: bool,
+    ) -> Item {
+        Item {
+            rect,
+            mode,
+            has_mask,
+            active_x: false,
+            active_y: false,
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd)]
+struct ItemIndex(usize);
+
+// The main public interface to the segment module.
+pub struct SegmentBuilder {
+    items: Vec<Item>,
+    bounding_rect: Option<LayerRect>,
+}
+
+impl SegmentBuilder {
+    // Create a new segment builder, supplying the primitive
+    // local rect and associated local clip rect.
+    pub fn new(
+        local_rect: LayerRect,
+        local_clip_rect: LayerRect,
+    ) -> SegmentBuilder {
+        let mut builder = SegmentBuilder {
+            items: Vec::new(),
+            bounding_rect: Some(local_rect),
+        };
+
+        builder.push_rect(local_rect, None, ClipMode::Clip);
+        builder.push_rect(local_clip_rect, None, ClipMode::Clip);
+
+        builder
+    }
+
+    // Push some kind of clipping region into the segment builder.
+    // If radius is None, it's a simple rect.
+    pub fn push_rect(
+        &mut self,
+        rect: LayerRect,
+        radius: Option<BorderRadius>,
+        mode: ClipMode,
+    ) {
+        // Keep track of a minimal bounding rect for the set of
+        // segments that will be generated.
+        if mode == ClipMode::Clip {
+            self.bounding_rect = self.bounding_rect.and_then(|bounding_rect| {
+                bounding_rect.intersection(&rect)
+            });
+        }
+
+        match radius {
+            Some(radius) => {
+                // For a rounded rect, try to create a nine-patch where there
+                // is a clip item for each corner, inner and edge region.
+                match extract_inner_rect_safe(&rect, &radius) {
+                    Some(inner) => {
+                        let p0 = rect.origin;
+                        let p1 = inner.origin;
+                        let p2 = inner.bottom_right();
+                        let p3 = rect.bottom_right();
+
+                        let corner_segments = &[
+                            LayerRect::new(
+                                LayerPoint::new(p0.x, p0.y),
+                                LayerSize::new(p1.x - p0.x, p1.y - p0.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p2.x, p0.y),
+                                LayerSize::new(p3.x - p2.x, p1.y - p0.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p2.x, p2.y),
+                                LayerSize::new(p3.x - p2.x, p3.y - p2.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p0.x, p2.y),
+                                LayerSize::new(p1.x - p0.x, p3.y - p2.y),
+                            ),
+                        ];
+
+                        for segment in corner_segments {
+                            self.items.push(Item::new(
+                                *segment,
+                                mode,
+                                true
+                            ));
+                        }
+
+                        let other_segments = &[
+                            LayerRect::new(
+                                LayerPoint::new(p1.x, p0.y),
+                                LayerSize::new(p2.x - p1.x, p1.y - p0.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p2.x, p1.y),
+                                LayerSize::new(p3.x - p2.x, p2.y - p1.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p1.x, p2.y),
+                                LayerSize::new(p2.x - p1.x, p3.y - p2.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p0.x, p1.y),
+                                LayerSize::new(p1.x - p0.x, p2.y - p1.y),
+                            ),
+                            LayerRect::new(
+                                LayerPoint::new(p1.x, p1.y),
+                                LayerSize::new(p2.x - p1.x, p2.y - p1.y),
+                            ),
+                        ];
+
+                        for segment in other_segments {
+                            self.items.push(Item::new(
+                                *segment,
+                                mode,
+                                false,
+                            ));
+                        }
+                    }
+                    None => {
+                        // If we get here, we could not extract an inner rectangle
+                        // for this clip region. This can occur in cases such as
+                        // a rounded rect where the top-left and bottom-left radii
+                        // result in overlapping rects. In that case, just create
+                        // a single clip region for the entire rounded rect.
+                        self.items.push(Item::new(
+                            rect,
+                            mode,
+                            true,
+                        ))
+                    }
+                }
+            }
+            None => {
+                // For a simple rect, just create one clipping item.
+                self.items.push(Item::new(
+                    rect,
+                    mode,
+                    false,
+                ))
+            }
+        }
+    }
+
+    // Consume this segment builder and produce a list of segments.
+    pub fn build<F>(self, mut f: F) where F: FnMut(Segment) {
+        let bounding_rect = match self.bounding_rect {
+            Some(bounding_rect) => bounding_rect,
+            None => return,
+        };
+
+        // First, filter out any items that don't intersect
+        // with the visible bounding rect.
+        let mut items: Vec<Item> = self.items
+            .into_iter()
+            .filter(|item| item.rect.intersects(&bounding_rect))
+            .collect();
+
+        // Create events for each item
+        let mut x_events = Vec::new();
+        let mut y_events = Vec::new();
+
+        for (item_index, item) in items.iter().enumerate() {
+            let p0 = item.rect.origin;
+            let p1 = item.rect.bottom_right();
+
+            x_events.push(Event::begin(p0.x, item_index));
+            x_events.push(Event::end(p1.x, item_index));
+            y_events.push(Event::begin(p0.y, item_index));
+            y_events.push(Event::end(p1.y, item_index));
+        }
+
+        // Get the minimal bounding rect in app units. We will
+        // work in fixed point in order to avoid float precision
+        // error while handling events.
+        let p0 = LayerPointAu::new(
+            Au::from_f32_px(bounding_rect.origin.x),
+            Au::from_f32_px(bounding_rect.origin.y),
+        );
+
+        let p1 = LayerPointAu::new(
+            Au::from_f32_px(bounding_rect.origin.x + bounding_rect.size.width),
+            Au::from_f32_px(bounding_rect.origin.y + bounding_rect.size.height),
+        );
+
+        // Sort the events in ascending order.
+        x_events.sort();
+        y_events.sort();
+
+        // Generate segments from the event lists, by sweeping the y-axis
+        // and then the x-axis for each event. This can generate a significant
+        // number of segments, but most importantly, it ensures that there are
+        // no t-junctions in the generated segments. It's probably possible
+        // to come up with more efficient segmentation algorithms, at least
+        // for simple / common cases.
+
+        // Each coordinate is clamped to the bounds of the minimal
+        // bounding rect. This ensures that we don't generate segments
+        // outside that bounding rect, but does allow correctly handling
+        // clips where the clip region starts outside the minimal
+        // rect but still intersects with it.
+
+        let mut prev_y = clamp(p0.y, y_events[0].value, p1.y);
+
+        for ey in &y_events {
+            let cur_y = clamp(p0.y, ey.value, p1.y);
+
+            if cur_y != prev_y {
+                let mut prev_x = clamp(p0.x, x_events[0].value, p1.x);
+
+                for ex in &x_events {
+                    let cur_x = clamp(p0.x, ex.value, p1.x);
+
+                    if cur_x != prev_x {
+                        if let Some(segment) = emit_segment_if_needed(
+                            prev_x,
+                            prev_y,
+                            cur_x,
+                            cur_y,
+                            &items,
+                            &p0,
+                            &p1,
+                        ) {
+                            f(segment);
+                        }
+
+                        prev_x = cur_x;
+                    }
+
+                    items[ex.item_index.0].active_x = ex.is_active();
+                }
+
+                prev_y = cur_y;
+            }
+
+            items[ey.item_index.0].active_y = ey.is_active();
+        }
+    }
+}
+
+fn clamp(low: Au, value: Au, high: Au) -> Au {
+    value.max(low).min(high)
+}
+
+fn emit_segment_if_needed(
+    x0: Au,
+    y0: Au,
+    x1: Au,
+    y1: Au,
+    items: &[Item],
+    bounds_p0: &LayerPointAu,
+    bounds_p1: &LayerPointAu,
+) -> Option<Segment> {
+    debug_assert!(x1 > x0);
+    debug_assert!(y1 > y0);
+
+    // TODO(gw): Don't scan the whole list of items for
+    //           each segment rect. Store active list
+    //           in a hash set or similar if this ever
+    //           shows up in a profile.
+    let mut has_clip_mask = false;
+
+    for item in items {
+        if item.active_x && item.active_y {
+            has_clip_mask |= item.has_mask;
+
+            if item.mode == ClipMode::ClipOut && !item.has_mask {
+                return None;
+            }
+        }
+    }
+
+    let segment_rect = LayerRect::new(
+        LayerPoint::new(
+            x0.to_f32_px(),
+            y0.to_f32_px(),
+        ),
+        LayerSize::new(
+            (x1 - x0).to_f32_px(),
+            (y1 - y0).to_f32_px(),
+        ),
+    );
+
+    // Determine which edges touch the bounding rect. This allows
+    // the shaders to apply AA correctly along those edges. It also
+    // allows the batching code to determine which are inner segments
+    // without edges, and push those through the opaque pass.
+    let mut edge_flags = EdgeAaSegmentMask::empty();
+    if x0 == bounds_p0.x {
+        edge_flags |= EdgeAaSegmentMask::LEFT;
+    }
+    if x1 == bounds_p1.x {
+        edge_flags |= EdgeAaSegmentMask::RIGHT;
+    }
+    if y0 == bounds_p0.y {
+        edge_flags |= EdgeAaSegmentMask::TOP;
+    }
+    if y1 == bounds_p1.y {
+        edge_flags |= EdgeAaSegmentMask::BOTTOM;
+    }
+
+    Some(Segment {
+        rect: segment_rect,
+        has_mask: has_clip_mask,
+        edge_flags,
+    })
+}
+
+#[cfg(test)]
+mod test {
+    use api::{BorderRadius, ClipMode, LayerPoint, LayerRect, LayerSize};
+    use prim_store::EdgeAaSegmentMask;
+    use super::{Segment, SegmentBuilder};
+    use std::cmp;
+
+    fn rect(x0: f32, y0: f32, x1: f32, y1: f32) -> LayerRect {
+        LayerRect::new(
+            LayerPoint::new(x0, y0),
+            LayerSize::new(x1-x0, y1-y0),
+        )
+    }
+
+    fn seg(
+        x0: f32,
+        y0: f32,
+        x1: f32,
+        y1: f32,
+        has_mask: bool,
+        edge_flags: Option<EdgeAaSegmentMask>,
+    ) -> Segment {
+        Segment {
+            rect: LayerRect::new(
+                LayerPoint::new(x0, y0),
+                LayerSize::new(x1-x0, y1-y0),
+            ),
+            has_mask,
+            edge_flags: edge_flags.unwrap_or(EdgeAaSegmentMask::empty()),
+        }
+    }
+
+    fn segment_sorter(s0: &Segment, s1: &Segment) -> cmp::Ordering {
+        let r0 = &s0.rect;
+        let r1 = &s1.rect;
+
+        (
+            (r0.origin.x, r0.origin.y, r0.size.width, r0.size.height)
+        ).partial_cmp(&
+            (r1.origin.x, r1.origin.y, r1.size.width, r1.size.height)
+        ).unwrap()
+    }
+
+    fn seg_test(
+        local_rect: LayerRect,
+        local_clip_rect: LayerRect,
+        clips: &[(LayerRect, Option<BorderRadius>, ClipMode)],
+        expected_segments: &mut [Segment]
+    ) {
+        let mut sb = SegmentBuilder::new(
+            local_rect,
+            local_clip_rect,
+        );
+        let mut segments = Vec::new();
+        for &(rect, radius, mode) in clips {
+            sb.push_rect(rect, radius, mode);
+        }
+        sb.build(|rect| {
+            segments.push(rect);
+        });
+        segments.sort_by(segment_sorter);
+        expected_segments.sort_by(segment_sorter);
+        assert_eq!(
+            segments.len(),
+            expected_segments.len(),
+            "segments\n{:?}\nexpected\n{:?}\n",
+            segments,
+            expected_segments
+        );
+        for (segment, expected) in segments.iter().zip(expected_segments.iter()) {
+            assert_eq!(segment, expected);
+        }
+    }
+
+    #[test]
+    fn segment_empty() {
+        seg_test(
+            rect(0.0, 0.0, 0.0, 0.0),
+            rect(0.0, 0.0, 0.0, 0.0),
+            &[],
+            &mut [],
+        );
+    }
+
+    #[test]
+    fn segment_single() {
+        seg_test(
+            rect(10.0, 20.0, 30.0, 40.0),
+            rect(10.0, 20.0, 30.0, 40.0),
+            &[],
+            &mut [
+                seg(10.0, 20.0, 30.0, 40.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_single_clip() {
+        seg_test(
+            rect(10.0, 20.0, 30.0, 40.0),
+            rect(10.0, 20.0, 25.0, 35.0),
+            &[],
+            &mut [
+                seg(10.0, 20.0, 25.0, 35.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_inner_clip() {
+        seg_test(
+            rect(10.0, 20.0, 30.0, 40.0),
+            rect(15.0, 25.0, 25.0, 35.0),
+            &[],
+            &mut [
+                seg(15.0, 25.0, 25.0, 35.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_outer_clip() {
+        seg_test(
+            rect(15.0, 25.0, 25.0, 35.0),
+            rect(10.0, 20.0, 30.0, 40.0),
+            &[],
+            &mut [
+                seg(15.0, 25.0, 25.0, 35.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_clip_int() {
+        seg_test(
+            rect(10.0, 20.0, 30.0, 40.0),
+            rect(20.0, 10.0, 40.0, 30.0),
+            &[],
+            &mut [
+                seg(20.0, 20.0, 30.0, 30.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_clip_disjoint() {
+        seg_test(
+            rect(10.0, 20.0, 30.0, 40.0),
+            rect(30.0, 20.0, 50.0, 40.0),
+            &[],
+            &mut [],
+        );
+    }
+
+    #[test]
+    fn segment_clips() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(-1000.0, -1000.0, 1000.0, 1000.0),
+            &[
+                (rect(20.0, 20.0, 40.0, 40.0), None, ClipMode::Clip),
+                (rect(40.0, 20.0, 60.0, 40.0), None, ClipMode::Clip),
+            ],
+            &mut [
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_rounded_clip() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(-1000.0, -1000.0, 1000.0, 1000.0),
+            &[
+                (rect(20.0, 20.0, 60.0, 60.0), Some(BorderRadius::uniform(10.0)), ClipMode::Clip),
+            ],
+            &mut [
+                // corners
+                seg(20.0, 20.0, 30.0, 30.0, true, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::TOP)),
+                seg(20.0, 50.0, 30.0, 60.0, true, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::BOTTOM)),
+                seg(50.0, 20.0, 60.0, 30.0, true, Some(EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::TOP)),
+                seg(50.0, 50.0, 60.0, 60.0, true, Some(EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::BOTTOM)),
+
+                // inner
+                seg(30.0, 30.0, 50.0, 50.0, false, None),
+
+                // edges
+                seg(30.0, 20.0, 50.0, 30.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(30.0, 50.0, 50.0, 60.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(20.0, 30.0, 30.0, 50.0, false, Some(EdgeAaSegmentMask::LEFT)),
+                seg(50.0, 30.0, 60.0, 50.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_clip_out() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(-1000.0, -1000.0, 2000.0, 2000.0),
+            &[
+                (rect(20.0, 20.0, 60.0, 60.0), None, ClipMode::ClipOut),
+            ],
+            &mut [
+                seg(0.0, 0.0, 20.0, 20.0, false, Some(EdgeAaSegmentMask::TOP | EdgeAaSegmentMask::LEFT)),
+                seg(20.0, 0.0, 60.0, 20.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(60.0, 0.0, 100.0, 20.0, false, Some(EdgeAaSegmentMask::TOP | EdgeAaSegmentMask::RIGHT)),
+
+                seg(0.0, 20.0, 20.0, 60.0, false, Some(EdgeAaSegmentMask::LEFT)),
+                seg(60.0, 20.0, 100.0, 60.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+
+                seg(0.0, 60.0, 20.0, 100.0, false, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::BOTTOM)),
+                seg(20.0, 60.0, 60.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(60.0, 60.0, 100.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM | EdgeAaSegmentMask::RIGHT)),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_rounded_clip_out() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(-1000.0, -1000.0, 2000.0, 2000.0),
+            &[
+                (rect(20.0, 20.0, 60.0, 60.0), Some(BorderRadius::uniform(10.0)), ClipMode::ClipOut),
+            ],
+            &mut [
+                // top row
+                seg(0.0, 0.0, 20.0, 20.0, false, Some(EdgeAaSegmentMask::TOP | EdgeAaSegmentMask::LEFT)),
+                seg(20.0, 0.0, 30.0, 20.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(30.0, 0.0, 50.0, 20.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(50.0, 0.0, 60.0, 20.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(60.0, 0.0, 100.0, 20.0, false, Some(EdgeAaSegmentMask::TOP | EdgeAaSegmentMask::RIGHT)),
+
+                // left
+                seg(0.0, 20.0, 20.0, 30.0, false, Some(EdgeAaSegmentMask::LEFT)),
+                seg(0.0, 30.0, 20.0, 50.0, false, Some(EdgeAaSegmentMask::LEFT)),
+                seg(0.0, 50.0, 20.0, 60.0, false, Some(EdgeAaSegmentMask::LEFT)),
+
+                // right
+                seg(60.0, 20.0, 100.0, 30.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+                seg(60.0, 30.0, 100.0, 50.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+                seg(60.0, 50.0, 100.0, 60.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+
+                // bottom row
+                seg(0.0, 60.0, 20.0, 100.0, false, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::BOTTOM)),
+                seg(20.0, 60.0, 30.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(30.0, 60.0, 50.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(50.0, 60.0, 60.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(60.0, 60.0, 100.0, 100.0, false, Some(EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::BOTTOM)),
+
+                // inner corners
+                seg(20.0, 20.0, 30.0, 30.0, true, None),
+                seg(20.0, 50.0, 30.0, 60.0, true, None),
+                seg(50.0, 20.0, 60.0, 30.0, true, None),
+                seg(50.0, 50.0, 60.0, 60.0, true, None),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_clip_in_clip_out() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(-1000.0, -1000.0, 2000.0, 2000.0),
+            &[
+                (rect(20.0, 20.0, 60.0, 60.0), None, ClipMode::Clip),
+                (rect(50.0, 50.0, 80.0, 80.0), None, ClipMode::ClipOut),
+            ],
+            &mut [
+                seg(20.0, 20.0, 50.0, 50.0, false, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::TOP)),
+                seg(50.0, 20.0, 60.0, 50.0, false, Some(EdgeAaSegmentMask::TOP | EdgeAaSegmentMask::RIGHT)),
+                seg(20.0, 50.0, 50.0, 60.0, false, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::BOTTOM)),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_rounded_clip_overlap() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(0.0, 0.0, 100.0, 100.0),
+            &[
+                (rect(0.0, 0.0, 10.0, 10.0), None, ClipMode::ClipOut),
+                (rect(0.0, 0.0, 100.0, 100.0), Some(BorderRadius::uniform(10.0)), ClipMode::Clip),
+            ],
+            &mut [
+                // corners
+                seg(0.0, 90.0, 10.0, 100.0, true, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::BOTTOM)),
+                seg(90.0, 0.0, 100.0, 10.0, true, Some(EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::TOP)),
+                seg(90.0, 90.0, 100.0, 100.0, true, Some(EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::BOTTOM)),
+
+                // inner
+                seg(10.0, 10.0, 90.0, 90.0, false, None),
+
+                // edges
+                seg(10.0, 0.0, 90.0, 10.0, false, Some(EdgeAaSegmentMask::TOP)),
+                seg(10.0, 90.0, 90.0, 100.0, false, Some(EdgeAaSegmentMask::BOTTOM)),
+                seg(0.0, 10.0, 10.0, 90.0, false, Some(EdgeAaSegmentMask::LEFT)),
+                seg(90.0, 10.0, 100.0, 90.0, false, Some(EdgeAaSegmentMask::RIGHT)),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_rounded_clip_overlap_reverse() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(0.0, 0.0, 100.0, 100.0),
+            &[
+                (rect(10.0, 10.0, 90.0, 90.0), None, ClipMode::Clip),
+                (rect(0.0, 0.0, 100.0, 100.0), Some(BorderRadius::uniform(10.0)), ClipMode::Clip),
+            ],
+            &mut [
+                seg(10.0, 10.0, 90.0, 90.0, false,
+                    Some(EdgeAaSegmentMask::LEFT |
+                         EdgeAaSegmentMask::TOP |
+                         EdgeAaSegmentMask::RIGHT |
+                         EdgeAaSegmentMask::BOTTOM
+                    )
+                ),
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_clip_in_clip_out_overlap() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(0.0, 0.0, 100.0, 100.0),
+            &[
+                (rect(10.0, 10.0, 90.0, 90.0), None, ClipMode::Clip),
+                (rect(10.0, 10.0, 90.0, 90.0), None, ClipMode::ClipOut),
+            ],
+            &mut [
+            ],
+        );
+    }
+
+    #[test]
+    fn segment_event_order() {
+        seg_test(
+            rect(0.0, 0.0, 100.0, 100.0),
+            rect(0.0, 0.0, 100.0, 100.0),
+            &[
+                (rect(0.0, 0.0, 100.0, 90.0), None, ClipMode::ClipOut),
+            ],
+            &mut [
+                seg(0.0, 90.0, 100.0, 100.0, false, Some(EdgeAaSegmentMask::LEFT | EdgeAaSegmentMask::RIGHT | EdgeAaSegmentMask::BOTTOM)),
+            ],
+        );
+    }
+}
diff --git a/gfx/webrender/src/texture_cache.rs b/gfx/webrender/src/texture_cache.rs
index 56e98e2f3fc7..638819c9fd37 100644
--- a/gfx/webrender/src/texture_cache.rs
+++ b/gfx/webrender/src/texture_cache.rs
@@ -166,13 +166,9 @@ impl TextureCacheHandle {
 pub struct TextureCache {
     // A lazily allocated, fixed size, texture array for
     // each format the texture cache supports.
-    // TODO(gw): Do we actually need RG8 and RGB8 or
-    // are they only used by external textures?
     array_rgba8_nearest: TextureArray,
     array_a8_linear: TextureArray,
     array_rgba8_linear: TextureArray,
-    array_rg8_linear: TextureArray,
-    array_rgb8_linear: TextureArray,
 
     // Maximum texture size supported by hardware.
     max_texture_size: u32,
@@ -219,16 +215,6 @@ impl TextureCache {
                 TextureFilter::Linear,
                 TEXTURE_ARRAY_LAYERS_LINEAR,
             ),
-            array_rg8_linear: TextureArray::new(
-                ImageFormat::RG8,
-                TextureFilter::Linear,
-                TEXTURE_ARRAY_LAYERS_LINEAR,
-            ),
-            array_rgb8_linear: TextureArray::new(
-                ImageFormat::RGB8,
-                TextureFilter::Linear,
-                TEXTURE_ARRAY_LAYERS_LINEAR,
-            ),
             array_rgba8_nearest: TextureArray::new(
                 ImageFormat::BGRA8,
                 TextureFilter::Nearest,
@@ -252,10 +238,6 @@ impl TextureCache {
 
         self.array_a8_linear
             .update_profile(&mut texture_cache_profile.pages_a8_linear);
-        self.array_rg8_linear
-            .update_profile(&mut texture_cache_profile.pages_rg8_linear);
-        self.array_rgb8_linear
-            .update_profile(&mut texture_cache_profile.pages_rgb8_linear);
         self.array_rgba8_linear
             .update_profile(&mut texture_cache_profile.pages_rgba8_linear);
         self.array_rgba8_nearest
@@ -386,13 +368,10 @@ impl TextureCache {
             (ImageFormat::A8, TextureFilter::Linear) => &mut self.array_a8_linear,
             (ImageFormat::BGRA8, TextureFilter::Linear) => &mut self.array_rgba8_linear,
             (ImageFormat::BGRA8, TextureFilter::Nearest) => &mut self.array_rgba8_nearest,
-            (ImageFormat::RGB8, TextureFilter::Linear) => &mut self.array_rgb8_linear,
-            (ImageFormat::RG8, TextureFilter::Linear) => &mut self.array_rg8_linear,
             (ImageFormat::Invalid, _) |
             (ImageFormat::RGBAF32, _) |
-            (ImageFormat::A8, TextureFilter::Nearest) |
-            (ImageFormat::RG8, TextureFilter::Nearest) |
-            (ImageFormat::RGB8, TextureFilter::Nearest) => unreachable!(),
+            (ImageFormat::RG8, _) |
+            (ImageFormat::A8, TextureFilter::Nearest) => unreachable!(),
         };
 
         &mut texture_array.regions[region_index as usize]
@@ -561,13 +540,10 @@ impl TextureCache {
             (ImageFormat::A8, TextureFilter::Linear) => &mut self.array_a8_linear,
             (ImageFormat::BGRA8, TextureFilter::Linear) => &mut self.array_rgba8_linear,
             (ImageFormat::BGRA8, TextureFilter::Nearest) => &mut self.array_rgba8_nearest,
-            (ImageFormat::RGB8, TextureFilter::Linear) => &mut self.array_rgb8_linear,
-            (ImageFormat::RG8, TextureFilter::Linear) => &mut self.array_rg8_linear,
             (ImageFormat::Invalid, _) |
             (ImageFormat::RGBAF32, _) |
             (ImageFormat::A8, TextureFilter::Nearest) |
-            (ImageFormat::RG8, TextureFilter::Nearest) |
-            (ImageFormat::RGB8, TextureFilter::Nearest) => unreachable!(),
+            (ImageFormat::RG8, _) => unreachable!(),
         };
 
         // Lazy initialize this texture array if required.
diff --git a/gfx/webrender/src/tiling.rs b/gfx/webrender/src/tiling.rs
index 20ee1e0cd383..9e0786d3a5ee 100644
--- a/gfx/webrender/src/tiling.rs
+++ b/gfx/webrender/src/tiling.rs
@@ -2,129 +2,32 @@
  * 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/. */
 
-use api::{ClipId, ColorF, DeviceIntPoint, ImageKey};
-use api::{DeviceIntRect, DeviceIntSize, device_length, DeviceUintPoint, DeviceUintRect, DeviceUintSize};
-use api::{DocumentLayer, ExternalImageType, FilterOp};
-use api::{ImageFormat, ImageRendering};
+use api::{ClipId, ColorF, DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use api::{DevicePixelScale, DeviceUintPoint, DeviceUintRect, DeviceUintSize};
+use api::{DocumentLayer, FilterOp, ImageFormat};
 use api::{LayerRect, MixBlendMode, PipelineId};
-use api::{SubpixelDirection, TileOffset, YuvColorSpace, YuvFormat};
-use api::{LayerToWorldTransform, WorldPixel};
-use border::{BorderCornerInstance, BorderCornerSide};
-use clip::{ClipSource, ClipStore};
-use clip_scroll_tree::{ClipScrollTree, CoordinateSystemId};
+use batch::{AlphaBatcher, ClipBatcher};
+use clip::{ClipStore};
+use clip_scroll_tree::{ClipScrollTree};
 use device::Texture;
-use euclid::{TypedTransform3D, vec3};
-use glyph_rasterizer::GlyphFormat;
-use gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle, GpuCacheUpdateList};
-use gpu_types::{BlurDirection, BlurInstance, BrushInstance, BrushImageKind, ClipMaskInstance};
-use gpu_types::{CompositePrimitiveInstance, PrimitiveInstance, SimplePrimitiveInstance};
-use gpu_types::{ClipScrollNodeIndex, ClipScrollNodeData};
-use internal_types::{FastHashMap, SourceTexture};
-use internal_types::{BatchTextures, RenderPassIndex};
-use picture::{PictureCompositeMode, PictureKind, PicturePrimitive, RasterizationSpace};
-use plane_split::{BspSplitter, Polygon, Splitter};
-use prim_store::{PrimitiveIndex, PrimitiveKind, PrimitiveMetadata, PrimitiveStore};
-use prim_store::{BrushPrimitive, BrushMaskKind, BrushKind, BrushSegmentKind, DeferredResolve, PrimitiveRun};
+use gpu_cache::{GpuCache, GpuCacheUpdateList};
+use gpu_types::{BlurDirection, BlurInstance, BrushInstance, ClipChainRectIndex};
+use gpu_types::{ClipScrollNodeData, ClipScrollNodeIndex};
+use gpu_types::{PrimitiveInstance};
+use internal_types::{FastHashMap, RenderPassIndex};
+use picture::{PictureKind};
+use prim_store::{PrimitiveIndex, PrimitiveKind, PrimitiveStore};
+use prim_store::{BrushMaskKind, BrushKind, DeferredResolve};
 use profiler::FrameProfileCounters;
-use render_task::{ClipWorkItem};
 use render_task::{RenderTaskAddress, RenderTaskId, RenderTaskKey, RenderTaskKind};
 use render_task::{BlurTask, ClearMode, RenderTaskLocation, RenderTaskTree};
-use renderer::{BlendMode, ImageBufferKind};
-use renderer::BLOCKS_PER_UV_RECT;
-use resource_cache::{GlyphFetchResult, ResourceCache};
+use resource_cache::{ResourceCache};
 use std::{cmp, usize, f32, i32};
 use std::collections::hash_map::Entry;
 use texture_allocator::GuillotineAllocator;
-use util::{MatrixHelpers, TransformedRectKind};
 
-// Special sentinel value recognized by the shader. It is considered to be
-// a dummy task that doesn't mask out anything.
-const OPAQUE_TASK_ADDRESS: RenderTaskAddress = RenderTaskAddress(i32::MAX as u32);
 const MIN_TARGET_SIZE: u32 = 2048;
 
-// Helper to add an entire primitive run to a batch list.
-// TODO(gw): Restructure this so the param list isn't quite
-//           so daunting!
-impl PrimitiveRun {
-    fn add_to_batch(
-        &self,
-        clip_id: ClipScrollNodeIndex,
-        scroll_id: ClipScrollNodeIndex,
-        batch_list: &mut BatchList,
-        ctx: &RenderTargetContext,
-        gpu_cache: &mut GpuCache,
-        render_tasks: &RenderTaskTree,
-        task_id: RenderTaskId,
-        task_address: RenderTaskAddress,
-        deferred_resolves: &mut Vec<DeferredResolve>,
-        glyph_fetch_buffer: &mut Vec<GlyphFetchResult>,
-        splitter: &mut BspSplitter<f64, WorldPixel>,
-    ) {
-        for i in 0 .. self.count {
-            let prim_index = PrimitiveIndex(self.base_prim_index.0 + i);
-
-            let md = &ctx.prim_store.cpu_metadata[prim_index.0];
-
-            // Now that we walk the primitive runs in order to add
-            // items to batches, we need to check if they are
-            // visible here.
-            if md.screen_rect.is_some() {
-                add_to_batch(
-                    clip_id,
-                    scroll_id,
-                    prim_index,
-                    batch_list,
-                    ctx,
-                    gpu_cache,
-                    render_tasks,
-                    task_id,
-                    task_address,
-                    deferred_resolves,
-                    glyph_fetch_buffer,
-                    splitter,
-                );
-            }
-        }
-    }
-}
-
-trait AlphaBatchHelpers {
-    fn get_blend_mode(
-        &self,
-        metadata: &PrimitiveMetadata,
-        transform_kind: TransformedRectKind,
-    ) -> BlendMode;
-}
-
-impl AlphaBatchHelpers for PrimitiveStore {
-    fn get_blend_mode(
-        &self,
-        metadata: &PrimitiveMetadata,
-        transform_kind: TransformedRectKind,
-    ) -> BlendMode {
-        let needs_blending = !metadata.opacity.is_opaque || metadata.clip_task_id.is_some() ||
-            transform_kind == TransformedRectKind::Complex;
-
-        match metadata.prim_kind {
-            // Can only resolve the TextRun's blend mode once glyphs are fetched.
-            PrimitiveKind::TextRun => BlendMode::PremultipliedAlpha,
-            PrimitiveKind::Border |
-            PrimitiveKind::Image |
-            PrimitiveKind::YuvImage |
-            PrimitiveKind::AlignedGradient |
-            PrimitiveKind::AngleGradient |
-            PrimitiveKind::RadialGradient |
-            PrimitiveKind::Line |
-            PrimitiveKind::Brush |
-            PrimitiveKind::Picture => if needs_blending {
-                BlendMode::PremultipliedAlpha
-            } else {
-                BlendMode::None
-            },
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ScrollbarPrimitive {
     pub clip_id: ClipId,
@@ -141,1111 +44,13 @@ struct DynamicTaskInfo {
     rect: DeviceIntRect,
 }
 
-pub struct AlphaBatchList {
-    pub batches: Vec<AlphaPrimitiveBatch>,
-}
-
-impl AlphaBatchList {
-    fn new() -> Self {
-        AlphaBatchList {
-            batches: Vec::new(),
-        }
-    }
-
-    fn get_suitable_batch(
-        &mut self,
-        key: BatchKey,
-        item_bounding_rect: &DeviceIntRect,
-    ) -> &mut Vec<PrimitiveInstance> {
-        let mut selected_batch_index = None;
-
-        match (key.kind, key.blend_mode) {
-            (BatchKind::Composite { .. }, _) => {
-                // Composites always get added to their own batch.
-                // This is because the result of a composite can affect
-                // the input to the next composite. Perhaps we can
-                // optimize this in the future.
-            }
-            (BatchKind::Transformable(_, TransformBatchKind::TextRun(_)), BlendMode::SubpixelWithBgColor) |
-            (BatchKind::Transformable(_, TransformBatchKind::TextRun(_)), BlendMode::SubpixelVariableTextColor) => {
-                'outer_text: for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
-                    // Subpixel text is drawn in two passes. Because of this, we need
-                    // to check for overlaps with every batch (which is a bit different
-                    // than the normal batching below).
-                    for item_rect in &batch.item_rects {
-                        if item_rect.intersects(item_bounding_rect) {
-                            break 'outer_text;
-                        }
-                    }
-
-                    if batch.key.is_compatible_with(&key) {
-                        selected_batch_index = Some(batch_index);
-                        break;
-                    }
-                }
-            }
-            _ => {
-                'outer_default: for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
-                    // For normal batches, we only need to check for overlaps for batches
-                    // other than the first batch we consider. If the first batch
-                    // is compatible, then we know there isn't any potential overlap
-                    // issues to worry about.
-                    if batch.key.is_compatible_with(&key) {
-                        selected_batch_index = Some(batch_index);
-                        break;
-                    }
-
-                    // check for intersections
-                    for item_rect in &batch.item_rects {
-                        if item_rect.intersects(item_bounding_rect) {
-                            break 'outer_default;
-                        }
-                    }
-                }
-            }
-        }
-
-        if selected_batch_index.is_none() {
-            let new_batch = AlphaPrimitiveBatch::new(key);
-            selected_batch_index = Some(self.batches.len());
-            self.batches.push(new_batch);
-        }
-
-        let batch = &mut self.batches[selected_batch_index.unwrap()];
-        batch.item_rects.push(*item_bounding_rect);
-
-        &mut batch.instances
-    }
-}
-
-pub struct OpaqueBatchList {
-    pub pixel_area_threshold_for_new_batch: i32,
-    pub batches: Vec<OpaquePrimitiveBatch>,
-}
-
-impl OpaqueBatchList {
-    fn new(pixel_area_threshold_for_new_batch: i32) -> Self {
-        OpaqueBatchList {
-            batches: Vec::new(),
-            pixel_area_threshold_for_new_batch,
-        }
-    }
-
-    fn get_suitable_batch(
-        &mut self,
-        key: BatchKey,
-        item_bounding_rect: &DeviceIntRect
-    ) -> &mut Vec<PrimitiveInstance> {
-        let mut selected_batch_index = None;
-        let item_area = item_bounding_rect.size.area();
-
-        // If the area of this primitive is larger than the given threshold,
-        // then it is large enough to warrant breaking a batch for. In this
-        // case we just see if it can be added to the existing batch or
-        // create a new one.
-        if item_area > self.pixel_area_threshold_for_new_batch {
-            if let Some(ref batch) = self.batches.last() {
-                if batch.key.is_compatible_with(&key) {
-                    selected_batch_index = Some(self.batches.len() - 1);
-                }
-            }
-        } else {
-            // Otherwise, look back through a reasonable number of batches.
-            for (batch_index, batch) in self.batches.iter().enumerate().rev().take(10) {
-                if batch.key.is_compatible_with(&key) {
-                    selected_batch_index = Some(batch_index);
-                    break;
-                }
-            }
-        }
-
-        if selected_batch_index.is_none() {
-            let new_batch = OpaquePrimitiveBatch::new(key);
-            selected_batch_index = Some(self.batches.len());
-            self.batches.push(new_batch);
-        }
-
-        let batch = &mut self.batches[selected_batch_index.unwrap()];
-
-        &mut batch.instances
-    }
-
-    fn finalize(&mut self) {
-        // Reverse the instance arrays in the opaque batches
-        // to get maximum z-buffer efficiency by drawing
-        // front-to-back.
-        // TODO(gw): Maybe we can change the batch code to
-        //           build these in reverse and avoid having
-        //           to reverse the instance array here.
-        for batch in &mut self.batches {
-            batch.instances.reverse();
-        }
-    }
-}
-
-pub struct BatchList {
-    pub alpha_batch_list: AlphaBatchList,
-    pub opaque_batch_list: OpaqueBatchList,
-}
-
-impl BatchList {
-    fn new(screen_size: DeviceIntSize) -> Self {
-        // The threshold for creating a new batch is
-        // one quarter the screen size.
-        let batch_area_threshold = screen_size.width * screen_size.height / 4;
-
-        BatchList {
-            alpha_batch_list: AlphaBatchList::new(),
-            opaque_batch_list: OpaqueBatchList::new(batch_area_threshold),
-        }
-    }
-
-    fn get_suitable_batch(
-        &mut self,
-        key: BatchKey,
-        item_bounding_rect: &DeviceIntRect,
-    ) -> &mut Vec<PrimitiveInstance> {
-        match key.blend_mode {
-            BlendMode::None => {
-                self.opaque_batch_list
-                    .get_suitable_batch(key, item_bounding_rect)
-            }
-            BlendMode::PremultipliedAlpha |
-            BlendMode::PremultipliedDestOut |
-            BlendMode::SubpixelConstantTextColor(..) |
-            BlendMode::SubpixelVariableTextColor |
-            BlendMode::SubpixelWithBgColor => {
-                self.alpha_batch_list
-                    .get_suitable_batch(key, item_bounding_rect)
-            }
-        }
-    }
-
-    fn finalize(&mut self) {
-        self.opaque_batch_list.finalize()
-    }
-}
-
-/// Encapsulates the logic of building batches for items that are blended.
-pub struct AlphaBatcher {
-    pub batch_list: BatchList,
-    tasks: Vec<RenderTaskId>,
-    glyph_fetch_buffer: Vec<GlyphFetchResult>,
-}
-
-// A free function that adds a primitive to a batch.
-// It can recursively call itself in some situations, for
-// example if it encounters a picture where the items
-// in that picture are being drawn into the same target.
-fn add_to_batch(
-    clip_id: ClipScrollNodeIndex,
-    scroll_id: ClipScrollNodeIndex,
-    prim_index: PrimitiveIndex,
-    batch_list: &mut BatchList,
-    ctx: &RenderTargetContext,
-    gpu_cache: &mut GpuCache,
-    render_tasks: &RenderTaskTree,
-    task_id: RenderTaskId,
-    task_address: RenderTaskAddress,
-    deferred_resolves: &mut Vec<DeferredResolve>,
-    glyph_fetch_buffer: &mut Vec<GlyphFetchResult>,
-    splitter: &mut BspSplitter<f64, WorldPixel>,
-) {
-    let z = prim_index.0 as i32;
-    let prim_metadata = ctx.prim_store.get_metadata(prim_index);
-    let scroll_node = &ctx.node_data[scroll_id.0 as usize];
-    // TODO(gw): Calculating this for every primitive is a bit
-    //           wasteful. We should probably cache this in
-    //           the scroll node...
-    let transform_kind = scroll_node.transform.transform_kind();
-    let item_bounding_rect = prim_metadata.screen_rect.as_ref().unwrap();
-    let prim_cache_address = gpu_cache.get_address(&prim_metadata.gpu_location);
-    let no_textures = BatchTextures::no_texture();
-    let clip_task_address = prim_metadata
-        .clip_task_id
-        .map_or(OPAQUE_TASK_ADDRESS, |id| render_tasks.get_task_address(id));
-    let base_instance = SimplePrimitiveInstance::new(
-        prim_cache_address,
-        task_address,
-        clip_task_address,
-        clip_id,
-        scroll_id,
-        z,
-    );
-
-    let blend_mode = ctx.prim_store.get_blend_mode(prim_metadata, transform_kind);
-
-    match prim_metadata.prim_kind {
-        PrimitiveKind::Brush => {
-            let brush = &ctx.prim_store.cpu_brushes[prim_metadata.cpu_prim_index.0];
-            let base_instance = BrushInstance {
-                picture_address: task_address,
-                prim_address: prim_cache_address,
-                clip_id,
-                scroll_id,
-                clip_task_address,
-                z,
-                segment_kind: 0,
-                user_data0: 0,
-                user_data1: 0,
-            };
-
-            match brush.segment_desc {
-                Some(ref segment_desc) => {
-                    let opaque_batch = batch_list.opaque_batch_list.get_suitable_batch(
-                        brush.get_batch_key(
-                            BlendMode::None
-                        ),
-                        item_bounding_rect
-                    );
-                    let alpha_batch = batch_list.alpha_batch_list.get_suitable_batch(
-                        brush.get_batch_key(
-                            BlendMode::PremultipliedAlpha
-                        ),
-                        item_bounding_rect
-                    );
-
-                    for (i, segment) in segment_desc.segments.iter().enumerate() {
-                        if ((1 << i) & segment_desc.enabled_segments) != 0 {
-                            let is_inner = i == BrushSegmentKind::Center as usize;
-                            let needs_blending = !prim_metadata.opacity.is_opaque ||
-                                                 segment.clip_task_id.is_some() ||
-                                                 (!is_inner && transform_kind == TransformedRectKind::Complex);
-
-                            let clip_task_address = segment
-                                .clip_task_id
-                                .map_or(OPAQUE_TASK_ADDRESS, |id| render_tasks.get_task_address(id));
-
-                            let instance = PrimitiveInstance::from(BrushInstance {
-                                segment_kind: 1 + i as i32,
-                                clip_task_address,
-                                ..base_instance
-                            });
-
-                            if needs_blending {
-                                alpha_batch.push(instance);
-                            } else {
-                                opaque_batch.push(instance);
-                            }
-                        }
-                    }
-                }
-                None => {
-                    let batch = batch_list.get_suitable_batch(brush.get_batch_key(blend_mode), item_bounding_rect);
-                    batch.push(PrimitiveInstance::from(base_instance));
-                }
-            }
-        }
-        PrimitiveKind::Border => {
-            let border_cpu =
-                &ctx.prim_store.cpu_borders[prim_metadata.cpu_prim_index.0];
-            // TODO(gw): Select correct blend mode for edges and corners!!
-            let corner_kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::BorderCorner,
-            );
-            let corner_key = BatchKey::new(corner_kind, blend_mode, no_textures);
-            let edge_kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::BorderEdge,
-            );
-            let edge_key = BatchKey::new(edge_kind, blend_mode, no_textures);
-
-            // Work around borrow ck on borrowing batch_list twice.
-            {
-                let batch =
-                    batch_list.get_suitable_batch(corner_key, item_bounding_rect);
-                for (i, instance_kind) in border_cpu.corner_instances.iter().enumerate()
-                {
-                    let sub_index = i as i32;
-                    match *instance_kind {
-                        BorderCornerInstance::None => {}
-                        BorderCornerInstance::Single => {
-                            batch.push(base_instance.build(
-                                sub_index,
-                                BorderCornerSide::Both as i32,
-                                0,
-                            ));
-                        }
-                        BorderCornerInstance::Double => {
-                            batch.push(base_instance.build(
-                                sub_index,
-                                BorderCornerSide::First as i32,
-                                0,
-                            ));
-                            batch.push(base_instance.build(
-                                sub_index,
-                                BorderCornerSide::Second as i32,
-                                0,
-                            ));
-                        }
-                    }
-                }
-            }
-
-            let batch = batch_list.get_suitable_batch(edge_key, item_bounding_rect);
-            for border_segment in 0 .. 4 {
-                batch.push(base_instance.build(border_segment, 0, 0));
-            }
-        }
-        PrimitiveKind::Line => {
-            let kind =
-                BatchKind::Transformable(transform_kind, TransformBatchKind::Line);
-            let key = BatchKey::new(kind, blend_mode, no_textures);
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-            batch.push(base_instance.build(0, 0, 0));
-        }
-        PrimitiveKind::Image => {
-            let image_cpu = &ctx.prim_store.cpu_images[prim_metadata.cpu_prim_index.0];
-
-            let (color_texture_id, uv_address) = resolve_image(
-                image_cpu.image_key,
-                image_cpu.image_rendering,
-                image_cpu.tile_offset,
-                ctx.resource_cache,
-                gpu_cache,
-                deferred_resolves,
-            );
-
-            if color_texture_id == SourceTexture::Invalid {
-                warn!("Warnings: skip a PrimitiveKind::Image at {:?}.\n", item_bounding_rect);
-                return;
-            }
-
-            let batch_kind = match color_texture_id {
-                SourceTexture::External(ext_image) => {
-                    match ext_image.image_type {
-                        ExternalImageType::Texture2DHandle => {
-                            TransformBatchKind::Image(ImageBufferKind::Texture2D)
-                        }
-                        ExternalImageType::Texture2DArrayHandle => {
-                            TransformBatchKind::Image(ImageBufferKind::Texture2DArray)
-                        }
-                        ExternalImageType::TextureRectHandle => {
-                            TransformBatchKind::Image(ImageBufferKind::TextureRect)
-                        }
-                        ExternalImageType::TextureExternalHandle => {
-                            TransformBatchKind::Image(ImageBufferKind::TextureExternal)
-                        }
-                        ExternalImageType::ExternalBuffer => {
-                            // The ExternalImageType::ExternalBuffer should be handled by resource_cache.
-                            // It should go through the non-external case.
-                            panic!(
-                                "Non-texture handle type should be handled in other way"
-                            );
-                        }
-                    }
-                }
-                _ => TransformBatchKind::Image(ImageBufferKind::Texture2DArray),
-            };
-
-            let textures = BatchTextures {
-                colors: [
-                    color_texture_id,
-                    SourceTexture::Invalid,
-                    SourceTexture::Invalid,
-                ],
-            };
-
-            let key = BatchKey::new(
-                BatchKind::Transformable(transform_kind, batch_kind),
-                blend_mode,
-                textures,
-            );
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-            batch.push(base_instance.build(uv_address.as_int(gpu_cache), 0, 0));
-        }
-        PrimitiveKind::TextRun => {
-            let text_cpu =
-                &ctx.prim_store.cpu_text_runs[prim_metadata.cpu_prim_index.0];
-
-            let font = text_cpu.get_font(
-                ctx.device_pixel_ratio,
-                &scroll_node.transform,
-                RasterizationSpace::Screen,
-            );
-
-            ctx.resource_cache.fetch_glyphs(
-                font,
-                &text_cpu.glyph_keys,
-                glyph_fetch_buffer,
-                gpu_cache,
-                |texture_id, mut glyph_format, glyphs| {
-                    debug_assert_ne!(texture_id, SourceTexture::Invalid);
-
-                    let textures = BatchTextures {
-                        colors: [
-                            texture_id,
-                            SourceTexture::Invalid,
-                            SourceTexture::Invalid,
-                        ],
-                    };
-
-                    // Ignore color and only sample alpha when shadowing.
-                    if text_cpu.is_shadow() {
-                        glyph_format = glyph_format.ignore_color();
-                    }
-
-                    let kind = BatchKind::Transformable(
-                        transform_kind,
-                        TransformBatchKind::TextRun(glyph_format),
-                    );
-
-                    let blend_mode = match glyph_format {
-                        GlyphFormat::Subpixel |
-                        GlyphFormat::TransformedSubpixel => {
-                            if text_cpu.font.bg_color.a != 0 {
-                                BlendMode::SubpixelWithBgColor
-                            } else {
-                                BlendMode::SubpixelConstantTextColor(text_cpu.font.color.into())
-                            }
-                        }
-                        GlyphFormat::Alpha |
-                        GlyphFormat::TransformedAlpha |
-                        GlyphFormat::Bitmap |
-                        GlyphFormat::ColorBitmap => BlendMode::PremultipliedAlpha,
-                    };
-                    let subpx_dir = match glyph_format {
-                        GlyphFormat::Bitmap |
-                        GlyphFormat::ColorBitmap => SubpixelDirection::None,
-                        _ => text_cpu.font.subpx_dir.limit_by(text_cpu.font.render_mode),
-                    };
-
-                    let key = BatchKey::new(kind, blend_mode, textures);
-                    let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-
-                    for glyph in glyphs {
-                        batch.push(base_instance.build(
-                            glyph.index_in_text_run,
-                            glyph.uv_rect_address.as_int(),
-                            subpx_dir as u32 as i32,
-                        ));
-                    }
-                },
-            );
-        }
-        PrimitiveKind::Picture => {
-            let picture =
-                &ctx.prim_store.cpu_pictures[prim_metadata.cpu_prim_index.0];
-
-            match picture.render_task_id {
-                Some(cache_task_id) => {
-                    let cache_task_address = render_tasks.get_task_address(cache_task_id);
-                    let textures = BatchTextures::render_target_cache();
-
-                    match picture.kind {
-                        PictureKind::TextShadow { .. } => {
-                            let kind = BatchKind::Brush(
-                                BrushBatchKind::Image(
-                                    BrushImageSourceKind::from_render_target_kind(picture.target_kind())),
-                            );
-                            let key = BatchKey::new(kind, blend_mode, textures);
-                            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-
-                            let instance = BrushInstance {
-                                picture_address: task_address,
-                                prim_address: prim_cache_address,
-                                clip_id,
-                                scroll_id,
-                                clip_task_address,
-                                z,
-                                segment_kind: 0,
-                                user_data0: cache_task_address.0 as i32,
-                                user_data1: BrushImageKind::Simple as i32,
-                            };
-                            batch.push(PrimitiveInstance::from(instance));
-                        }
-                        PictureKind::BoxShadow { image_kind, .. } => {
-                            let kind = BatchKind::Brush(
-                                BrushBatchKind::Image(
-                                    BrushImageSourceKind::from_render_target_kind(picture.target_kind())),
-                            );
-                            let key = BatchKey::new(kind, blend_mode, textures);
-                            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-
-                            let instance = BrushInstance {
-                                picture_address: task_address,
-                                prim_address: prim_cache_address,
-                                clip_id,
-                                scroll_id,
-                                clip_task_address,
-                                z,
-                                segment_kind: 0,
-                                user_data0: cache_task_address.0 as i32,
-                                user_data1: image_kind as i32,
-                            };
-                            batch.push(PrimitiveInstance::from(instance));
-                        }
-                        PictureKind::Image {
-                            composite_mode,
-                            secondary_render_task_id,
-                            is_in_3d_context,
-                            reference_frame_id,
-                            real_local_rect,
-                            ..
-                        } => {
-                            // If this picture is participating in a 3D rendering context,
-                            // then don't add it to any batches here. Instead, create a polygon
-                            // for it and add it to the current plane splitter.
-                            if is_in_3d_context {
-                                // Push into parent plane splitter.
-
-                                let real_xf = &ctx.clip_scroll_tree.nodes[&reference_frame_id].world_content_transform;
-
-                                let polygon = make_polygon(
-                                    real_local_rect,
-                                    &real_xf,
-                                    prim_index.0,
-                                );
-
-                                splitter.add(polygon);
-
-                                return;
-                            }
-
-                            // Depending on the composite mode of the picture, we generate the
-                            // old style Composite primitive instances. In the future, we'll
-                            // remove these and pass them through the brush batching pipeline.
-                            // This will allow us to unify some of the shaders, apply clip masks
-                            // when compositing pictures, and also correctly apply pixel snapping
-                            // to picture compositing operations.
-                            let source_id = picture.render_task_id.expect("no source!?");
-
-                            match composite_mode.expect("bug: only composites here") {
-                                PictureCompositeMode::Filter(filter) => {
-                                    match filter {
-                                        FilterOp::Blur(..) => {
-                                            let src_task_address = render_tasks.get_task_address(source_id);
-                                            let key = BatchKey::new(
-                                                BatchKind::HardwareComposite,
-                                                BlendMode::PremultipliedAlpha,
-                                                BatchTextures::render_target_cache(),
-                                            );
-                                            let batch = batch_list.get_suitable_batch(key, &item_bounding_rect);
-                                            let instance = CompositePrimitiveInstance::new(
-                                                task_address,
-                                                src_task_address,
-                                                RenderTaskAddress(0),
-                                                item_bounding_rect.origin.x,
-                                                item_bounding_rect.origin.y,
-                                                z,
-                                                item_bounding_rect.size.width,
-                                                item_bounding_rect.size.height,
-                                            );
-
-                                            batch.push(PrimitiveInstance::from(instance));
-                                        }
-                                        FilterOp::DropShadow(offset, _, _) => {
-                                            let kind = BatchKind::Brush(
-                                                BrushBatchKind::Image(BrushImageSourceKind::ColorAlphaMask),
-                                            );
-                                            let key = BatchKey::new(kind, blend_mode, textures);
-
-                                            let instance = BrushInstance {
-                                                picture_address: task_address,
-                                                prim_address: prim_cache_address,
-                                                clip_id,
-                                                scroll_id,
-                                                clip_task_address,
-                                                z,
-                                                segment_kind: 0,
-                                                user_data0: cache_task_address.0 as i32,
-                                                user_data1: BrushImageKind::Simple as i32,
-                                            };
-
-                                            {
-                                                let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-                                                batch.push(PrimitiveInstance::from(instance));
-                                            }
-
-                                            let secondary_id = secondary_render_task_id.expect("no secondary!?");
-                                            let render_task = &render_tasks[secondary_id];
-                                            let secondary_task_address = render_tasks.get_task_address(secondary_id);
-                                            let render_pass_index = render_task.pass_index.expect("no render_pass_index!?");
-                                            let secondary_textures = BatchTextures {
-                                                colors: [
-                                                    SourceTexture::RenderTaskCacheRGBA8(render_pass_index),
-                                                    SourceTexture::Invalid,
-                                                    SourceTexture::Invalid,
-                                                ],
-                                            };
-                                            let key = BatchKey::new(
-                                                BatchKind::HardwareComposite,
-                                                BlendMode::PremultipliedAlpha,
-                                                secondary_textures,
-                                            );
-                                            let batch = batch_list.get_suitable_batch(key, &item_bounding_rect);
-                                            let device_offset_x = device_length(offset.x, ctx.device_pixel_ratio);
-                                            let device_offset_y = device_length(offset.y, ctx.device_pixel_ratio);
-                                            let instance = CompositePrimitiveInstance::new(
-                                                task_address,
-                                                secondary_task_address,
-                                                RenderTaskAddress(0),
-                                                item_bounding_rect.origin.x - device_offset_x.0,
-                                                item_bounding_rect.origin.y - device_offset_y.0,
-                                                z,
-                                                item_bounding_rect.size.width,
-                                                item_bounding_rect.size.height,
-                                            );
-
-                                            batch.push(PrimitiveInstance::from(instance));
-                                        }
-                                        _ => {
-                                            let key = BatchKey::new(
-                                                BatchKind::Blend,
-                                                BlendMode::PremultipliedAlpha,
-                                                BatchTextures::no_texture(),
-                                            );
-                                            let src_task_address = render_tasks.get_task_address(source_id);
-
-                                            let (filter_mode, amount) = match filter {
-                                                FilterOp::Blur(..) => (0, 0.0),
-                                                FilterOp::Contrast(amount) => (1, amount),
-                                                FilterOp::Grayscale(amount) => (2, amount),
-                                                FilterOp::HueRotate(angle) => (3, angle),
-                                                FilterOp::Invert(amount) => (4, amount),
-                                                FilterOp::Saturate(amount) => (5, amount),
-                                                FilterOp::Sepia(amount) => (6, amount),
-                                                FilterOp::Brightness(amount) => (7, amount),
-                                                FilterOp::Opacity(_, amount) => (8, amount),
-                                                FilterOp::DropShadow(..) => unreachable!(),
-                                            };
-
-                                            let amount = (amount * 65535.0).round() as i32;
-                                            let batch = batch_list.get_suitable_batch(key, &item_bounding_rect);
-
-                                            let instance = CompositePrimitiveInstance::new(
-                                                task_address,
-                                                src_task_address,
-                                                RenderTaskAddress(0),
-                                                filter_mode,
-                                                amount,
-                                                z,
-                                                0,
-                                                0,
-                                            );
-
-                                            batch.push(PrimitiveInstance::from(instance));
-                                        }
-                                    }
-                                }
-                                PictureCompositeMode::MixBlend(mode) => {
-                                    let backdrop_id = secondary_render_task_id.expect("no backdrop!?");
-
-                                    let key = BatchKey::new(
-                                        BatchKind::Composite {
-                                            task_id,
-                                            source_id,
-                                            backdrop_id,
-                                        },
-                                        BlendMode::PremultipliedAlpha,
-                                        BatchTextures::no_texture(),
-                                    );
-                                    let batch = batch_list.get_suitable_batch(key, &item_bounding_rect);
-                                    let backdrop_task_address = render_tasks.get_task_address(backdrop_id);
-                                    let source_task_address = render_tasks.get_task_address(source_id);
-
-                                    let instance = CompositePrimitiveInstance::new(
-                                        task_address,
-                                        source_task_address,
-                                        backdrop_task_address,
-                                        mode as u32 as i32,
-                                        0,
-                                        z,
-                                        0,
-                                        0,
-                                    );
-
-                                    batch.push(PrimitiveInstance::from(instance));
-                                }
-                                PictureCompositeMode::Blit => {
-                                    let src_task_address = render_tasks.get_task_address(source_id);
-                                    let key = BatchKey::new(
-                                        BatchKind::HardwareComposite,
-                                        BlendMode::PremultipliedAlpha,
-                                        BatchTextures::render_target_cache(),
-                                    );
-                                    let batch = batch_list.get_suitable_batch(key, &item_bounding_rect);
-                                    let instance = CompositePrimitiveInstance::new(
-                                        task_address,
-                                        src_task_address,
-                                        RenderTaskAddress(0),
-                                        item_bounding_rect.origin.x,
-                                        item_bounding_rect.origin.y,
-                                        z,
-                                        item_bounding_rect.size.width,
-                                        item_bounding_rect.size.height,
-                                    );
-
-                                    batch.push(PrimitiveInstance::from(instance));
-                                }
-                            }
-                        }
-                    }
-                }
-                None => {
-                    // If this picture is being drawn into an existing target (i.e. with
-                    // no composition operation), recurse and add to the current batch list.
-                    picture.add_to_batch(
-                        task_id,
-                        ctx,
-                        gpu_cache,
-                        render_tasks,
-                        deferred_resolves,
-                        batch_list,
-                        glyph_fetch_buffer,
-                    );
-                }
-            }
-        }
-        PrimitiveKind::AlignedGradient => {
-            let gradient_cpu =
-                &ctx.prim_store.cpu_gradients[prim_metadata.cpu_prim_index.0];
-            let kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::AlignedGradient,
-            );
-            let key = BatchKey::new(kind, blend_mode, no_textures);
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-            for part_index in 0 .. (gradient_cpu.stops_count - 1) {
-                batch.push(base_instance.build(part_index as i32, 0, 0));
-            }
-        }
-        PrimitiveKind::AngleGradient => {
-            let kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::AngleGradient,
-            );
-            let key = BatchKey::new(kind, blend_mode, no_textures);
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-            batch.push(base_instance.build(0, 0, 0));
-        }
-        PrimitiveKind::RadialGradient => {
-            let kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::RadialGradient,
-            );
-            let key = BatchKey::new(kind, blend_mode, no_textures);
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-            batch.push(base_instance.build(0, 0, 0));
-        }
-        PrimitiveKind::YuvImage => {
-            let mut textures = BatchTextures::no_texture();
-            let mut uv_rect_addresses = [0; 3];
-            let image_yuv_cpu =
-                &ctx.prim_store.cpu_yuv_images[prim_metadata.cpu_prim_index.0];
-
-            //yuv channel
-            let channel_count = image_yuv_cpu.format.get_plane_num();
-            debug_assert!(channel_count <= 3);
-            for channel in 0 .. channel_count {
-                let image_key = image_yuv_cpu.yuv_key[channel];
-
-                let (texture, address) = resolve_image(
-                    image_key,
-                    image_yuv_cpu.image_rendering,
-                    None,
-                    ctx.resource_cache,
-                    gpu_cache,
-                    deferred_resolves,
-                );
-
-                if texture == SourceTexture::Invalid {
-                    warn!("Warnings: skip a PrimitiveKind::YuvImage at {:?}.\n", item_bounding_rect);
-                    return;
-                }
-
-                textures.colors[channel] = texture;
-                uv_rect_addresses[channel] = address.as_int(gpu_cache);
-            }
-
-            let get_buffer_kind = |texture: SourceTexture| {
-                match texture {
-                    SourceTexture::External(ext_image) => {
-                        match ext_image.image_type {
-                            ExternalImageType::Texture2DHandle => {
-                                ImageBufferKind::Texture2D
-                            }
-                            ExternalImageType::Texture2DArrayHandle => {
-                                ImageBufferKind::Texture2DArray
-                            }
-                            ExternalImageType::TextureRectHandle => {
-                                ImageBufferKind::TextureRect
-                            }
-                            ExternalImageType::TextureExternalHandle => {
-                                ImageBufferKind::TextureExternal
-                            }
-                            ExternalImageType::ExternalBuffer => {
-                                // The ExternalImageType::ExternalBuffer should be handled by resource_cache.
-                                // It should go through the non-external case.
-                                panic!("Unexpected non-texture handle type");
-                            }
-                        }
-                    }
-                    _ => ImageBufferKind::Texture2DArray,
-                }
-            };
-
-            // All yuv textures should be the same type.
-            let buffer_kind = get_buffer_kind(textures.colors[0]);
-            assert!(
-                textures.colors[1 .. image_yuv_cpu.format.get_plane_num()]
-                    .iter()
-                    .all(|&tid| buffer_kind == get_buffer_kind(tid))
-            );
-
-            let kind = BatchKind::Transformable(
-                transform_kind,
-                TransformBatchKind::YuvImage(
-                    buffer_kind,
-                    image_yuv_cpu.format,
-                    image_yuv_cpu.color_space,
-                ),
-            );
-            let key = BatchKey::new(kind, blend_mode, textures);
-            let batch = batch_list.get_suitable_batch(key, item_bounding_rect);
-
-            batch.push(base_instance.build(
-                uv_rect_addresses[0],
-                uv_rect_addresses[1],
-                uv_rect_addresses[2],
-            ));
-        }
-    }
-}
-
-impl PicturePrimitive {
-    fn add_to_batch(
-        &self,
-        task_id: RenderTaskId,
-        ctx: &RenderTargetContext,
-        gpu_cache: &mut GpuCache,
-        render_tasks: &RenderTaskTree,
-        deferred_resolves: &mut Vec<DeferredResolve>,
-        batch_list: &mut BatchList,
-        glyph_fetch_buffer: &mut Vec<GlyphFetchResult>,
-    ) {
-        let task_address = render_tasks.get_task_address(task_id);
-
-        // Even though most of the time a splitter isn't used or needed,
-        // they are cheap to construct so we will always pass one down.
-        let mut splitter = BspSplitter::new();
-
-        // Add each run in this picture to the batch.
-        for run in &self.runs {
-            let clip_node = &ctx.clip_scroll_tree.nodes[&run.clip_and_scroll.clip_node_id()];
-            let clip_id = clip_node.node_data_index;
-
-            let scroll_node = &ctx.clip_scroll_tree.nodes[&run.clip_and_scroll.scroll_node_id];
-            let scroll_id = scroll_node.node_data_index;
-
-            run.add_to_batch(
-                clip_id,
-                scroll_id,
-                batch_list,
-                ctx,
-                gpu_cache,
-                render_tasks,
-                task_id,
-                task_address,
-                deferred_resolves,
-                glyph_fetch_buffer,
-                &mut splitter,
-            );
-        }
-
-        // Flush the accumulated plane splits onto the task tree.
-        // Z axis is directed at the screen, `sort` is ascending, and we need back-to-front order.
-        for poly in splitter.sort(vec3(0.0, 0.0, 1.0)) {
-            let prim_index = PrimitiveIndex(poly.anchor);
-            debug!("process sorted poly {:?} {:?}", prim_index, poly.points);
-            let pp = &poly.points;
-            let gpu_blocks = [
-                [pp[0].x as f32, pp[0].y as f32, pp[0].z as f32, pp[1].x as f32].into(),
-                [pp[1].y as f32, pp[1].z as f32, pp[2].x as f32, pp[2].y as f32].into(),
-                [pp[2].z as f32, pp[3].x as f32, pp[3].y as f32, pp[3].z as f32].into(),
-            ];
-            let gpu_handle = gpu_cache.push_per_frame_blocks(&gpu_blocks);
-            let key = BatchKey::new(
-                BatchKind::SplitComposite,
-                BlendMode::PremultipliedAlpha,
-                BatchTextures::no_texture(),
-            );
-            let pic_metadata = &ctx.prim_store.cpu_metadata[prim_index.0];
-            let pic = &ctx.prim_store.cpu_pictures[pic_metadata.cpu_prim_index.0];
-            let batch = batch_list.get_suitable_batch(key, pic_metadata.screen_rect.as_ref().expect("bug"));
-            let source_task_address = render_tasks.get_task_address(pic.render_task_id.expect("bug"));
-            let gpu_address = gpu_handle.as_int(gpu_cache);
-
-            let instance = CompositePrimitiveInstance::new(
-                task_address,
-                source_task_address,
-                RenderTaskAddress(0),
-                gpu_address,
-                0,
-                prim_index.0 as i32,
-                0,
-                0,
-            );
-
-            batch.push(PrimitiveInstance::from(instance));
-        }
-    }
-}
-
-impl AlphaBatcher {
-    fn new(screen_size: DeviceIntSize) -> Self {
-        AlphaBatcher {
-            tasks: Vec::new(),
-            batch_list: BatchList::new(screen_size),
-            glyph_fetch_buffer: Vec::new(),
-        }
-    }
-
-    fn add_task(&mut self, task_id: RenderTaskId) {
-        self.tasks.push(task_id);
-    }
-
-    fn build(
-        &mut self,
-        ctx: &RenderTargetContext,
-        gpu_cache: &mut GpuCache,
-        render_tasks: &RenderTaskTree,
-        deferred_resolves: &mut Vec<DeferredResolve>,
-    ) {
-        for &task_id in &self.tasks {
-            match render_tasks[task_id].kind {
-                RenderTaskKind::Picture(ref pic_task) => {
-                    let pic_index = ctx.prim_store.cpu_metadata[pic_task.prim_index.0].cpu_prim_index;
-                    let pic = &ctx.prim_store.cpu_pictures[pic_index.0];
-                    pic.add_to_batch(
-                        task_id,
-                        ctx,
-                        gpu_cache,
-                        render_tasks,
-                        deferred_resolves,
-                        &mut self.batch_list,
-                        &mut self.glyph_fetch_buffer
-                    );
-                }
-                _ => {
-                    unreachable!();
-                }
-            }
-        }
-
-        self.batch_list.finalize();
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.batch_list.opaque_batch_list.batches.is_empty() &&
-            self.batch_list.alpha_batch_list.batches.is_empty()
-    }
-}
-
-/// Batcher managing draw calls into the clip mask (in the RT cache).
-#[derive(Debug)]
-pub struct ClipBatcher {
-    /// Rectangle draws fill up the rectangles with rounded corners.
-    pub rectangles: Vec<ClipMaskInstance>,
-    /// Image draws apply the image masking.
-    pub images: FastHashMap<SourceTexture, Vec<ClipMaskInstance>>,
-    pub border_clears: Vec<ClipMaskInstance>,
-    pub borders: Vec<ClipMaskInstance>,
-}
-
-impl ClipBatcher {
-    fn new() -> Self {
-        ClipBatcher {
-            rectangles: Vec::new(),
-            images: FastHashMap::default(),
-            border_clears: Vec::new(),
-            borders: Vec::new(),
-        }
-    }
-
-    fn add(
-        &mut self,
-        task_address: RenderTaskAddress,
-        clips: &[ClipWorkItem],
-        coordinate_system_id: CoordinateSystemId,
-        resource_cache: &ResourceCache,
-        gpu_cache: &GpuCache,
-        clip_store: &ClipStore,
-    ) {
-        let mut coordinate_system_id = coordinate_system_id;
-        for work_item in clips.iter() {
-            let instance = ClipMaskInstance {
-                render_task_address: task_address,
-                scroll_node_data_index: work_item.scroll_node_data_index,
-                segment: 0,
-                clip_data_address: GpuCacheAddress::invalid(),
-                resource_address: GpuCacheAddress::invalid(),
-            };
-            let info = clip_store
-                .get_opt(&work_item.clip_sources)
-                .expect("bug: clip handle should be valid");
-
-            for &(ref source, ref handle) in &info.clips {
-                let gpu_address = gpu_cache.get_address(handle);
-
-                match *source {
-                    ClipSource::Image(ref mask) => {
-                        if let Ok(cache_item) = resource_cache.get_cached_image(mask.image, ImageRendering::Auto, None) {
-                            self.images
-                                .entry(cache_item.texture_id)
-                                .or_insert(Vec::new())
-                                .push(ClipMaskInstance {
-                                    clip_data_address: gpu_address,
-                                    resource_address: gpu_cache.get_address(&cache_item.uv_rect_handle),
-                                    ..instance
-                                });
-                        } else {
-                            warn!("Warnings: skip a image mask. Key:{:?} Rect::{:?}.\n", mask.image, mask.rect);
-                            continue;
-                        }
-                    }
-                    ClipSource::Rectangle(..) => {
-                        if work_item.coordinate_system_id != coordinate_system_id {
-                            self.rectangles.push(ClipMaskInstance {
-                                clip_data_address: gpu_address,
-                                ..instance
-                            });
-                            coordinate_system_id = work_item.coordinate_system_id;
-                        }
-                    }
-                    ClipSource::RoundedRectangle(..) => {
-                        self.rectangles.push(ClipMaskInstance {
-                            clip_data_address: gpu_address,
-                            ..instance
-                        });
-                    }
-                    ClipSource::BorderCorner(ref source) => {
-                        self.border_clears.push(ClipMaskInstance {
-                            clip_data_address: gpu_address,
-                            segment: 0,
-                            ..instance
-                        });
-                        for clip_index in 0 .. source.actual_clip_count {
-                            self.borders.push(ClipMaskInstance {
-                                clip_data_address: gpu_address,
-                                segment: 1 + clip_index as i32,
-                                ..instance
-                            })
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 pub struct RenderTargetContext<'a> {
-    pub device_pixel_ratio: f32,
+    pub device_pixel_scale: DevicePixelScale,
     pub prim_store: &'a PrimitiveStore,
     pub resource_cache: &'a ResourceCache,
     pub node_data: &'a [ClipScrollNodeData],
     pub clip_scroll_tree: &'a ClipScrollTree,
+    pub use_dual_source_blending: bool,
 }
 
 struct TextureAllocator {
@@ -1415,9 +220,6 @@ pub struct ScalingInfo {
 /// A render target represents a number of rendering operations on a surface.
 pub struct ColorRenderTarget {
     pub alpha_batcher: AlphaBatcher,
-    // List of text runs to be cached to this render target.
-    pub text_run_cache_prims: FastHashMap<SourceTexture, Vec<PrimitiveInstance>>,
-    pub line_cache_prims: Vec<PrimitiveInstance>,
     // List of blur operations to apply for this render target.
     pub vertical_blurs: Vec<BlurInstance>,
     pub horizontal_blurs: Vec<BlurInstance>,
@@ -1426,7 +228,7 @@ pub struct ColorRenderTarget {
     // List of frame buffer outputs for this render target.
     pub outputs: Vec<FrameOutput>,
     allocator: Option<TextureAllocator>,
-    glyph_fetch_buffer: Vec<GlyphFetchResult>,
+    alpha_tasks: Vec<RenderTaskId>,
 }
 
 impl RenderTarget for ColorRenderTarget {
@@ -1443,15 +245,13 @@ impl RenderTarget for ColorRenderTarget {
     ) -> Self {
         ColorRenderTarget {
             alpha_batcher: AlphaBatcher::new(screen_size),
-            text_run_cache_prims: FastHashMap::default(),
-            line_cache_prims: Vec::new(),
             vertical_blurs: Vec::new(),
             horizontal_blurs: Vec::new(),
             readbacks: Vec::new(),
             scalings: Vec::new(),
             allocator: size.map(TextureAllocator::new),
-            glyph_fetch_buffer: Vec::new(),
             outputs: Vec::new(),
+            alpha_tasks: Vec::new(),
         }
     }
 
@@ -1462,15 +262,20 @@ impl RenderTarget for ColorRenderTarget {
         render_tasks: &mut RenderTaskTree,
         deferred_resolves: &mut Vec<DeferredResolve>,
     ) {
-        self.alpha_batcher
-            .build(ctx, gpu_cache, render_tasks, deferred_resolves);
+        self.alpha_batcher.build(
+            &self.alpha_tasks,
+            ctx,
+            gpu_cache,
+            render_tasks,
+            deferred_resolves,
+        );
     }
 
     fn add_task(
         &mut self,
         task_id: RenderTaskId,
         ctx: &RenderTargetContext,
-        gpu_cache: &GpuCache,
+        _: &GpuCache,
         render_tasks: &RenderTaskTree,
         _: &ClipStore,
     ) {
@@ -1504,90 +309,16 @@ impl RenderTarget for ColorRenderTarget {
                     PrimitiveKind::Picture => {
                         let prim = &ctx.prim_store.cpu_pictures[prim_metadata.cpu_prim_index.0];
 
-                        match prim.kind {
-                            PictureKind::Image { frame_output_pipeline_id, .. } => {
-                                self.alpha_batcher.add_task(task_id);
+                        self.alpha_tasks.push(task_id);
 
-                                // If this pipeline is registered as a frame output
-                                // store the information necessary to do the copy.
-                                if let Some(pipeline_id) = frame_output_pipeline_id {
-                                    self.outputs.push(FrameOutput {
-                                        pipeline_id,
-                                        task_id,
-                                    });
-                                }
-                            }
-                            PictureKind::TextShadow { .. } |
-                            PictureKind::BoxShadow { .. } => {
-                                let task_index = render_tasks.get_task_address(task_id);
-
-                                for run in &prim.runs {
-                                    for i in 0 .. run.count {
-                                        let sub_prim_index = PrimitiveIndex(run.base_prim_index.0 + i);
-
-                                        let sub_metadata = ctx.prim_store.get_metadata(sub_prim_index);
-                                        let sub_prim_address =
-                                            gpu_cache.get_address(&sub_metadata.gpu_location);
-                                        let instance = SimplePrimitiveInstance::new(
-                                            sub_prim_address,
-                                            task_index,
-                                            RenderTaskAddress(0),
-                                            ClipScrollNodeIndex(0),
-                                            ClipScrollNodeIndex(0),
-                                            0,
-                                        ); // z is disabled for rendering cache primitives
-
-                                        match sub_metadata.prim_kind {
-                                            PrimitiveKind::TextRun => {
-                                                // Add instances that reference the text run GPU location. Also supply
-                                                // the parent shadow prim address as a user data field, allowing
-                                                // the shader to fetch the shadow parameters.
-                                                let text = &ctx.prim_store.cpu_text_runs
-                                                    [sub_metadata.cpu_prim_index.0];
-                                                let text_run_cache_prims = &mut self.text_run_cache_prims;
-
-                                                let font = text.get_font(
-                                                    ctx.device_pixel_ratio,
-                                                    &LayerToWorldTransform::identity(),
-                                                    RasterizationSpace::Local,
-                                                );
-
-                                                ctx.resource_cache.fetch_glyphs(
-                                                    font,
-                                                    &text.glyph_keys,
-                                                    &mut self.glyph_fetch_buffer,
-                                                    gpu_cache,
-                                                    |texture_id, glyph_format, glyphs| {
-                                                        let batch = text_run_cache_prims
-                                                            .entry(texture_id)
-                                                            .or_insert(Vec::new());
-
-                                                        let subpx_dir = match glyph_format {
-                                                            GlyphFormat::Bitmap |
-                                                            GlyphFormat::ColorBitmap => SubpixelDirection::None,
-                                                            _ => text.font.subpx_dir.limit_by(text.font.render_mode),
-                                                        };
-
-                                                        for glyph in glyphs {
-                                                            batch.push(instance.build(
-                                                                glyph.index_in_text_run,
-                                                                glyph.uv_rect_address.as_int(),
-                                                                subpx_dir as u32 as i32,
-                                                            ));
-                                                        }
-                                                    },
-                                                );
-                                            }
-                                            PrimitiveKind::Line => {
-                                                self.line_cache_prims
-                                                    .push(instance.build(0, 0, 0));
-                                            }
-                                            _ => {
-                                                unreachable!("Unexpected sub primitive type");
-                                            }
-                                        }
-                                    }
-                                }
+                        if let PictureKind::Image { frame_output_pipeline_id, .. } = prim.kind {
+                            // If this pipeline is registered as a frame output
+                            // store the information necessary to do the copy.
+                            if let Some(pipeline_id) = frame_output_pipeline_id {
+                                self.outputs.push(FrameOutput {
+                                    pipeline_id,
+                                    task_id,
+                                });
                             }
                         }
                     }
@@ -1729,11 +460,11 @@ impl RenderTarget for AlphaRenderTarget {
                                             //           tasks support clip masks and
                                             //           transform primitives, these
                                             //           will need to be filled out!
-                                            clip_id: ClipScrollNodeIndex(0),
+                                            clip_chain_rect_index: ClipChainRectIndex(0),
                                             scroll_id: ClipScrollNodeIndex(0),
                                             clip_task_address: RenderTaskAddress(0),
                                             z: 0,
-                                            segment_kind: 0,
+                                            segment_index: 0,
                                             user_data0: 0,
                                             user_data1: 0,
                                         };
@@ -1934,116 +665,6 @@ impl RenderPass {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub enum TransformBatchKind {
-    TextRun(GlyphFormat),
-    Image(ImageBufferKind),
-    YuvImage(ImageBufferKind, YuvFormat, YuvColorSpace),
-    AlignedGradient,
-    AngleGradient,
-    RadialGradient,
-    BorderCorner,
-    BorderEdge,
-    Line,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub enum BrushImageSourceKind {
-    Alpha,
-    Color,
-    ColorAlphaMask,
-}
-
-impl BrushImageSourceKind {
-    pub fn from_render_target_kind(render_target_kind: RenderTargetKind) -> BrushImageSourceKind {
-        match render_target_kind {
-            RenderTargetKind::Color => BrushImageSourceKind::Color,
-            RenderTargetKind::Alpha => BrushImageSourceKind::Alpha,
-        }
-    }
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub enum BrushBatchKind {
-    Image(BrushImageSourceKind),
-    Solid,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub enum BatchKind {
-    Composite {
-        task_id: RenderTaskId,
-        source_id: RenderTaskId,
-        backdrop_id: RenderTaskId,
-    },
-    HardwareComposite,
-    SplitComposite,
-    Blend,
-    Transformable(TransformedRectKind, TransformBatchKind),
-    Brush(BrushBatchKind),
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct BatchKey {
-    pub kind: BatchKind,
-    pub blend_mode: BlendMode,
-    pub textures: BatchTextures,
-}
-
-impl BatchKey {
-    fn new(kind: BatchKind, blend_mode: BlendMode, textures: BatchTextures) -> Self {
-        BatchKey {
-            kind,
-            blend_mode,
-            textures,
-        }
-    }
-
-    fn is_compatible_with(&self, other: &BatchKey) -> bool {
-        self.kind == other.kind && self.blend_mode == other.blend_mode &&
-            textures_compatible(self.textures.colors[0], other.textures.colors[0]) &&
-            textures_compatible(self.textures.colors[1], other.textures.colors[1]) &&
-            textures_compatible(self.textures.colors[2], other.textures.colors[2])
-    }
-}
-
-#[inline]
-fn textures_compatible(t1: SourceTexture, t2: SourceTexture) -> bool {
-    t1 == SourceTexture::Invalid || t2 == SourceTexture::Invalid || t1 == t2
-}
-
-#[derive(Debug)]
-pub struct AlphaPrimitiveBatch {
-    pub key: BatchKey,
-    pub instances: Vec<PrimitiveInstance>,
-    pub item_rects: Vec<DeviceIntRect>,
-}
-
-impl AlphaPrimitiveBatch {
-    fn new(key: BatchKey) -> AlphaPrimitiveBatch {
-        AlphaPrimitiveBatch {
-            key,
-            instances: Vec::new(),
-            item_rects: Vec::new(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct OpaquePrimitiveBatch {
-    pub key: BatchKey,
-    pub instances: Vec<PrimitiveInstance>,
-}
-
-impl OpaquePrimitiveBatch {
-    fn new(key: BatchKey) -> OpaquePrimitiveBatch {
-        OpaquePrimitiveBatch {
-            key,
-            instances: Vec::new(),
-        }
-    }
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct CompositeOps {
     // Requires only a single texture as input (e.g. most filters)
@@ -2078,6 +699,7 @@ pub struct Frame {
     pub profile_counters: FrameProfileCounters,
 
     pub node_data: Vec<ClipScrollNodeData>,
+    pub clip_chain_local_clip_rects: Vec<LayerRect>,
     pub render_tasks: RenderTaskTree,
 
     // List of updates that need to be pushed to the
@@ -2091,45 +713,6 @@ pub struct Frame {
     pub deferred_resolves: Vec<DeferredResolve>,
 }
 
-fn resolve_image(
-    image_key: ImageKey,
-    image_rendering: ImageRendering,
-    tile_offset: Option<TileOffset>,
-    resource_cache: &ResourceCache,
-    gpu_cache: &mut GpuCache,
-    deferred_resolves: &mut Vec<DeferredResolve>,
-) -> (SourceTexture, GpuCacheHandle) {
-    match resource_cache.get_image_properties(image_key) {
-        Some(image_properties) => {
-            // Check if an external image that needs to be resolved
-            // by the render thread.
-            match image_properties.external_image {
-                Some(external_image) => {
-                    // This is an external texture - we will add it to
-                    // the deferred resolves list to be patched by
-                    // the render thread...
-                    let cache_handle = gpu_cache.push_deferred_per_frame_blocks(BLOCKS_PER_UV_RECT);
-                    deferred_resolves.push(DeferredResolve {
-                        image_properties,
-                        address: gpu_cache.get_address(&cache_handle),
-                    });
-
-                    (SourceTexture::External(external_image), cache_handle)
-                }
-                None => {
-                    if let Ok(cache_item) = resource_cache.get_cached_image(image_key, image_rendering, tile_offset) {
-                        (cache_item.texture_id, cache_item.uv_rect_handle)
-                    } else {
-                        // There is no usable texture entry for the image key. Just return an invalid texture here.
-                        (SourceTexture::Invalid, GpuCacheHandle::new())
-                    }
-                }
-            }
-        }
-        None => (SourceTexture::Invalid, GpuCacheHandle::new()),
-    }
-}
-
 impl BlurTask {
     fn add_instances(
         &self,
@@ -2158,55 +741,3 @@ impl BlurTask {
         }
     }
 }
-
-/// Construct a polygon from stacking context boundaries.
-/// `anchor` here is an index that's going to be preserved in all the
-/// splits of the polygon.
-fn make_polygon(
-    rect: LayerRect,
-    transform: &LayerToWorldTransform,
-    anchor: usize,
-) -> Polygon<f64, WorldPixel> {
-    let mat = TypedTransform3D::row_major(
-        transform.m11 as f64,
-        transform.m12 as f64,
-        transform.m13 as f64,
-        transform.m14 as f64,
-        transform.m21 as f64,
-        transform.m22 as f64,
-        transform.m23 as f64,
-        transform.m24 as f64,
-        transform.m31 as f64,
-        transform.m32 as f64,
-        transform.m33 as f64,
-        transform.m34 as f64,
-        transform.m41 as f64,
-        transform.m42 as f64,
-        transform.m43 as f64,
-        transform.m44 as f64);
-    Polygon::from_transformed_rect(rect.cast().unwrap(), mat, anchor)
-}
-
-impl BrushPrimitive {
-    fn get_batch_key(&self, blend_mode: BlendMode) -> BatchKey {
-        match self.kind {
-            BrushKind::Solid { .. } => {
-                BatchKey::new(
-                    BatchKind::Brush(BrushBatchKind::Solid),
-                    blend_mode,
-                    BatchTextures::no_texture(),
-                )
-            }
-            BrushKind::Clear => {
-                BatchKey::new(
-                    BatchKind::Brush(BrushBatchKind::Solid),
-                    BlendMode::PremultipliedDestOut,
-                    BatchTextures::no_texture(),
-                )
-            }
-            BrushKind::Mask { .. } => {
-                unreachable!("bug: mask brushes not expected in normal alpha pass");
-            }
-        }
-    }
-}
diff --git a/gfx/webrender/src/util.rs b/gfx/webrender/src/util.rs
index 50989ca8fc3c..758291256d80 100644
--- a/gfx/webrender/src/util.rs
+++ b/gfx/webrender/src/util.rs
@@ -2,10 +2,11 @@
  * 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/. */
 
-use api::{BorderRadius, DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint, DeviceRect};
-use api::{DeviceSize, LayerPoint, LayerRect, LayerSize, LayerToWorldTransform, WorldRect};
-use euclid::{Point2D, Rect, TypedScale, Size2D, TypedPoint2D, TypedRect, TypedSize2D};
-use euclid::{TypedTransform2D, TypedTransform3D};
+use api::{BorderRadius, DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePixelScale};
+use api::{DevicePoint, DeviceRect, DeviceSize, LayerPoint, LayerRect, LayerSize};
+use api::{LayerToWorldTransform, LayerTransform, LayerVector2D, WorldRect};
+use euclid::{Point2D, Rect, Size2D, TypedPoint2D, TypedRect, TypedSize2D, TypedTransform2D};
+use euclid::TypedTransform3D;
 use num_traits::Zero;
 use std::{i32, f32};
 
@@ -20,6 +21,7 @@ pub trait MatrixHelpers<Src, Dst> {
     fn inverse_project(&self, target: &TypedPoint2D<f32, Dst>) -> Option<TypedPoint2D<f32, Src>>;
     fn inverse_rect_footprint(&self, rect: &TypedRect<f32, Dst>) -> TypedRect<f32, Src>;
     fn transform_kind(&self) -> TransformedRectKind;
+    fn is_simple_translation(&self) -> bool;
 }
 
 impl<Src, Dst> MatrixHelpers<Src, Dst> for TypedTransform3D<f32, Src, Dst> {
@@ -92,6 +94,17 @@ impl<Src, Dst> MatrixHelpers<Src, Dst> for TypedTransform3D<f32, Src, Dst> {
             TransformedRectKind::Complex
         }
     }
+
+    fn is_simple_translation(&self) -> bool {
+        if self.m11 != 1. || self.m22 != 1. || self.m33 != 1. {
+            return false;
+        }
+        self.m12.abs() < NEARLY_ZERO && self.m13.abs() < NEARLY_ZERO &&
+            self.m14.abs() < NEARLY_ZERO && self.m21.abs() < NEARLY_ZERO &&
+            self.m23.abs() < NEARLY_ZERO && self.m24.abs() < NEARLY_ZERO &&
+            self.m31.abs() < NEARLY_ZERO && self.m32.abs() < NEARLY_ZERO &&
+            self.m34.abs() < NEARLY_ZERO
+    }
 }
 
 pub trait RectHelpers<U>
@@ -140,7 +153,7 @@ pub fn lerp(a: f32, b: f32, t: f32) -> f32 {
 pub fn calculate_screen_bounding_rect(
     transform: &LayerToWorldTransform,
     rect: &LayerRect,
-    device_pixel_ratio: f32
+    device_pixel_scale: DevicePixelScale,
 ) -> DeviceIntRect {
     let points = [
         transform.transform_point2d(&rect.origin),
@@ -149,9 +162,7 @@ pub fn calculate_screen_bounding_rect(
         transform.transform_point2d(&rect.bottom_right()),
     ];
 
-    let scale = TypedScale::new(device_pixel_ratio);
-    let rect: DeviceRect = WorldRect::from_points(&points) * scale;
-
+    let rect = WorldRect::from_points(&points) * device_pixel_scale;
     let max_rect = DeviceRect::max_rect();
     rect
         .round_out()
@@ -324,3 +335,74 @@ impl MaxRect for DeviceRect {
         )
     }
 }
+
+/// An enum that tries to avoid expensive transformation matrix calculations
+/// when possible when dealing with non-perspective axis-aligned transformations.
+#[derive(Debug, Clone)]
+pub enum TransformOrOffset {
+    /// A simple offset, which can be used without doing any matrix math.
+    Offset(LayerVector2D),
+
+    /// A transformation with an inverse. If the inverse isn't present, this isn't a 2D
+    /// transformation, which means we need to fall back to using inverse_rect_footprint.
+    /// Since this operation is so expensive, we avoid it for the 2D case.
+    Transform {
+        transform: LayerTransform,
+        inverse: Option<LayerTransform>,
+    }
+}
+
+impl TransformOrOffset {
+    pub fn zero() -> TransformOrOffset {
+        TransformOrOffset::Offset(LayerVector2D::zero())
+    }
+
+    fn new_transform(transform: LayerTransform) -> TransformOrOffset {
+        if transform.is_2d() {
+            TransformOrOffset::Transform {
+                transform,
+                inverse: Some(transform.inverse().expect("Expected invertible matrix."))
+            }
+        } else {
+            TransformOrOffset::Transform { transform, inverse: None }
+        }
+    }
+
+    pub fn apply(&self, rect: &LayerRect) -> LayerRect {
+        match *self {
+            TransformOrOffset::Offset(offset) => rect.translate(&offset),
+            TransformOrOffset::Transform {transform, .. } => transform.transform_rect(&rect),
+        }
+    }
+
+    pub fn unapply(&self, rect: &LayerRect) -> LayerRect {
+        match *self {
+            TransformOrOffset::Offset(offset) => rect.translate(&-offset),
+            TransformOrOffset::Transform { inverse: Some(inverse), .. }  =>
+                inverse.transform_rect(&rect),
+            TransformOrOffset::Transform { transform, inverse: None } =>
+                transform.inverse_rect_footprint(rect),
+        }
+    }
+
+    pub fn offset(&self, new_offset: LayerVector2D) -> TransformOrOffset {
+        match *self {
+            TransformOrOffset::Offset(offset) => TransformOrOffset::Offset(offset + new_offset),
+            TransformOrOffset::Transform { transform, .. } => {
+                let transform = transform.pre_translate(new_offset.to_3d());
+                TransformOrOffset::new_transform(transform)
+            }
+        }
+    }
+
+    pub fn update(&self, transform: LayerTransform) -> Option<TransformOrOffset> {
+        if transform.is_simple_translation() {
+            let offset = LayerVector2D::new(transform.m41, transform.m42);
+            Some(self.offset(offset))
+        } else {
+            // If we break 2D axis alignment or have a perspective component, we need to start a
+            // new incompatible coordinate system with which we cannot share clips without masking.
+            None
+        }
+    }
+}
diff --git a/gfx/webrender/tests/angle_shader_validation.rs b/gfx/webrender/tests/angle_shader_validation.rs
index 274b50cb545a..f3cd4251ff06 100644
--- a/gfx/webrender/tests/angle_shader_validation.rs
+++ b/gfx/webrender/tests/angle_shader_validation.rs
@@ -42,10 +42,6 @@ const SHADERS: &[Shader] = &[
         features: CACHE_FEATURES,
     },
     // Prim shaders
-    Shader {
-        name: "ps_line",
-        features: &["", "TRANSFORM", "CACHE"],
-    },
     Shader {
         name: "ps_border_corner",
         features: PRIM_FEATURES,
@@ -107,6 +103,10 @@ const SHADERS: &[Shader] = &[
         name: "brush_image",
         features: &["COLOR_TARGET", "ALPHA_TARGET"],
     },
+    Shader {
+        name: "brush_line",
+        features: &[],
+    },
 ];
 
 const VERSION_STRING: &str = "#version 300 es\n";
diff --git a/gfx/webrender_api/Cargo.toml b/gfx/webrender_api/Cargo.toml
index 2ef8b3c931a3..017e9aaeac0e 100644
--- a/gfx/webrender_api/Cargo.toml
+++ b/gfx/webrender_api/Cargo.toml
@@ -8,6 +8,7 @@ repository = "https://github.com/servo/webrender"
 [features]
 nightly = ["euclid/unstable", "serde/unstable"]
 ipc = ["ipc-channel"]
+debug-serialization = []
 
 [dependencies]
 app_units = "0.6"
@@ -16,8 +17,8 @@ bincode = "0.9"
 byteorder = "1.2.1"
 euclid = "0.16"
 ipc-channel = {version = "0.9", optional = true}
-serde = { version = "=1.0.23", features = ["rc", "derive"] }
-serde_derive = { version = "=1.0.23", features = ["deserialize_from"] }
+serde = { version = "=1.0.27", features = ["rc"] }
+serde_derive = { version = "=1.0.27", features = ["deserialize_in_place"] }
 time = "0.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
diff --git a/gfx/webrender_api/src/api.rs b/gfx/webrender_api/src/api.rs
index a70d102050de..969e4929b58f 100644
--- a/gfx/webrender_api/src/api.rs
+++ b/gfx/webrender_api/src/api.rs
@@ -12,6 +12,7 @@ use channel::{self, MsgSender, Payload, PayloadSender, PayloadSenderHelperMethod
 use std::cell::Cell;
 use std::fmt;
 use std::marker::PhantomData;
+use std::path::PathBuf;
 
 pub type TileSize = u16;
 /// Documents are rendered in the ascending order of their associated layer values.
@@ -267,6 +268,12 @@ pub enum DebugCommand {
     FetchRenderTasks,
     /// Fetch screenshot.
     FetchScreenshot,
+    /// Save a capture of all the documents state.
+    SaveCapture(PathBuf),
+    /// Load a capture of all the documents state.
+    LoadCapture(PathBuf),
+    /// Configure if dual-source blending is used, if available.
+    EnableDualSourceBlending(bool),
 }
 
 #[derive(Clone, Deserialize, Serialize)]
@@ -759,6 +766,23 @@ impl RenderApi {
     ) {
         self.send(document_id, DocumentMsg::GenerateFrame(property_bindings));
     }
+
+    /// Save a capture of the current frame state for debugging.
+    pub fn save_capture(&self, path: PathBuf) {
+        let msg = ApiMsg::DebugCommand(DebugCommand::SaveCapture(path));
+        self.send_message(msg);
+    }
+
+    /// Load a capture of the current frame state for debugging.
+    pub fn load_capture(&self, path: PathBuf) {
+        let msg = ApiMsg::DebugCommand(DebugCommand::LoadCapture(path));
+        self.send_message(msg);
+    }
+
+    pub fn send_debug_cmd(&self, cmd: DebugCommand) {
+        let msg = ApiMsg::DebugCommand(cmd);
+        self.send_message(msg);
+    }
 }
 
 impl Drop for RenderApi {
diff --git a/gfx/webrender_api/src/display_item.rs b/gfx/webrender_api/src/display_item.rs
index 8417e3138a06..390c27feb780 100644
--- a/gfx/webrender_api/src/display_item.rs
+++ b/gfx/webrender_api/src/display_item.rs
@@ -8,6 +8,9 @@ use {GlyphOptions, LayoutVector2D, PipelineId, PropertyBinding};
 use euclid::{SideOffsets2D, TypedRect};
 use std::ops::Not;
 
+#[cfg(feature = "debug-serialization")]
+use GlyphInstance;
+
 // NOTE: some of these structs have an "IMPLICIT" comment.
 // This indicates that the BuiltDisplayList will have serialized
 // a list of values nearby that this item consumes. The traversal
@@ -48,13 +51,17 @@ impl ClipAndScrollInfo {
 /// events.
 pub type ItemTag = (u64, u16);
 
+/// The DI is generic over the specifics, while allows to use
+/// the "complete" version of it for convenient serialization.
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
-pub struct DisplayItem {
-    pub item: SpecificDisplayItem,
+pub struct GenericDisplayItem<T> {
+    pub item: T,
     pub clip_and_scroll: ClipAndScrollInfo,
     pub info: LayoutPrimitiveInfo,
 }
 
+pub type DisplayItem = GenericDisplayItem<SpecificDisplayItem>;
+
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct PrimitiveInfo<T> {
     pub rect: TypedRect<f32, T>,
@@ -112,6 +119,33 @@ pub enum SpecificDisplayItem {
     PopAllShadows,
 }
 
+/// This is a "complete" version of the DI specifics,
+/// containing the auxiliary data within the corresponding
+/// enumeration variants, to be used for debug serialization.
+#[cfg(feature = "debug-serialization")]
+#[derive(Deserialize, Serialize)]
+pub enum CompletelySpecificDisplayItem {
+    Clip(ClipDisplayItem, Vec<ComplexClipRegion>),
+    ScrollFrame(ScrollFrameDisplayItem, Vec<ComplexClipRegion>),
+    StickyFrame(StickyFrameDisplayItem),
+    Rectangle(RectangleDisplayItem),
+    ClearRectangle,
+    Line(LineDisplayItem),
+    Text(TextDisplayItem, Vec<GlyphInstance>),
+    Image(ImageDisplayItem),
+    YuvImage(YuvImageDisplayItem),
+    Border(BorderDisplayItem),
+    BoxShadow(BoxShadowDisplayItem),
+    Gradient(GradientDisplayItem),
+    RadialGradient(RadialGradientDisplayItem),
+    Iframe(IframeDisplayItem),
+    PushStackingContext(PushStackingContextDisplayItem, Vec<FilterOp>),
+    PopStackingContext,
+    SetGradientStops(Vec<GradientStop>),
+    PushShadow(Shadow),
+    PopAllShadows,
+}
+
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct ClipDisplayItem {
     pub id: ClipId,
diff --git a/gfx/webrender_api/src/display_list.rs b/gfx/webrender_api/src/display_list.rs
index a6bae8f991a1..02d28990fb67 100644
--- a/gfx/webrender_api/src/display_list.rs
+++ b/gfx/webrender_api/src/display_list.rs
@@ -15,14 +15,18 @@ use {StickyOffsetBounds, TextDisplayItem, TransformStyle, YuvColorSpace, YuvData
 use YuvImageDisplayItem;
 use bincode;
 use euclid::SideOffsets2D;
-use serde::{Deserialize, Serialize, Serializer};
-use serde::ser::{SerializeMap, SerializeSeq};
+use serde::{Deserialize, Serialize};
 use std::io::{Read, Write};
-use std::{io, ptr};
+use std::{io, mem, ptr};
 use std::marker::PhantomData;
 use std::slice;
 use time::precise_time_ns;
 
+#[cfg(feature = "debug-serialization")]
+use serde::de::Deserializer;
+#[cfg(feature = "debug-serialization")]
+use serde::ser::{Serializer, SerializeSeq};
+
 // We don't want to push a long text-run. If a text-run is too long, split it into several parts.
 // This needs to be set to (renderer::MAX_VERTEX_TEXTURE_WIDTH - VECS_PER_PRIM_HEADER - VECS_PER_TEXT_RUN) * 2
 pub const MAX_TEXT_RUN_LENGTH: usize = 2038;
@@ -48,7 +52,7 @@ impl<T> Default for ItemRange<T> {
 impl<T> ItemRange<T> {
     pub fn is_empty(&self) -> bool {
         // Nothing more than space for a length (0).
-        self.length <= ::std::mem::size_of::<u64>()
+        self.length <= mem::size_of::<u64>()
     }
 }
 
@@ -228,7 +232,7 @@ impl<'a> BuiltDisplayListIter<'a> {
             {
                 let reader = bincode::read_types::IoReader::new(UnsafeReader::new(&mut self.data));
                 let mut deserializer = bincode::Deserializer::new(reader, bincode::Infinite);
-                self.cur_item.deserialize_from(&mut deserializer)
+                Deserialize::deserialize_in_place(&mut deserializer, &mut self.cur_item)
                     .expect("MEH: malicious process?");
             }
 
@@ -336,8 +340,8 @@ impl<'a, 'b> DisplayItemRef<'a, 'b> {
         &self.iter.cur_item.item
     }
 
-    pub fn complex_clip(&self) -> &(ItemRange<ComplexClipRegion>, usize) {
-        &self.iter.cur_complex_clip
+    pub fn complex_clip(&self) -> (ItemRange<ComplexClipRegion>, usize) {
+        self.iter.cur_complex_clip
     }
 
     pub fn gradient_stops(&self) -> ItemRange<GradientStop> {
@@ -405,58 +409,140 @@ impl<'a, T: for<'de> Deserialize<'de>> Iterator for AuxIter<'a, T> {
 impl<'a, T: for<'de> Deserialize<'de>> ::std::iter::ExactSizeIterator for AuxIter<'a, T> {}
 
 
-// This is purely for the JSON/RON writers in wrench
+#[cfg(feature = "debug-serialization")]
 impl Serialize for BuiltDisplayList {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        use display_item::CompletelySpecificDisplayItem::*;
+        use display_item::GenericDisplayItem;
+
         let mut seq = serializer.serialize_seq(None)?;
         let mut traversal = self.iter();
         while let Some(item) = traversal.next() {
-            seq.serialize_element(&item)?
+            let di = item.display_item();
+            let serial_di = GenericDisplayItem {
+                item: match di.item {
+                    SpecificDisplayItem::Clip(v) => Clip(v,
+                        item.iter.list.get(item.iter.cur_complex_clip.0).collect()
+                    ),
+                    SpecificDisplayItem::ScrollFrame(v) => ScrollFrame(v,
+                        item.iter.list.get(item.iter.cur_complex_clip.0).collect()
+                    ),
+                    SpecificDisplayItem::StickyFrame(v) => StickyFrame(v),
+                    SpecificDisplayItem::Rectangle(v) => Rectangle(v),
+                    SpecificDisplayItem::ClearRectangle => ClearRectangle,
+                    SpecificDisplayItem::Line(v) => Line(v),
+                    SpecificDisplayItem::Text(v) => Text(v,
+                        item.iter.list.get(item.iter.cur_glyphs).collect()
+                    ),
+                    SpecificDisplayItem::Image(v) => Image(v),
+                    SpecificDisplayItem::YuvImage(v) => YuvImage(v),
+                    SpecificDisplayItem::Border(v) => Border(v),
+                    SpecificDisplayItem::BoxShadow(v) => BoxShadow(v),
+                    SpecificDisplayItem::Gradient(v) => Gradient(v),
+                    SpecificDisplayItem::RadialGradient(v) => RadialGradient(v),
+                    SpecificDisplayItem::Iframe(v) => Iframe(v),
+                    SpecificDisplayItem::PushStackingContext(v) => PushStackingContext(v,
+                        item.iter.list.get(item.iter.cur_filters).collect()
+                    ),
+                    SpecificDisplayItem::PopStackingContext => PopStackingContext,
+                    SpecificDisplayItem::SetGradientStops => SetGradientStops(
+                        item.iter.list.get(item.iter.cur_stops).collect()
+                    ),
+                    SpecificDisplayItem::PushShadow(v) => PushShadow(v),
+                    SpecificDisplayItem::PopAllShadows => PopAllShadows,
+                },
+                clip_and_scroll: di.clip_and_scroll,
+                info: di.info,
+            };
+            seq.serialize_element(&serial_di)?
         }
         seq.end()
     }
 }
 
-impl<'a, 'b> Serialize for DisplayItemRef<'a, 'b> {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut map = serializer.serialize_map(None)?;
+// The purpose of this implementation is to deserialize
+// a display list from one format just to immediately
+// serialize then into a "built" `Vec<u8>`.
 
-        map.serialize_entry("item", self.display_item())?;
+#[cfg(feature = "debug-serialization")]
+impl<'de> Deserialize<'de> for BuiltDisplayList {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use display_item::CompletelySpecificDisplayItem::*;
+        use display_item::{CompletelySpecificDisplayItem, GenericDisplayItem};
 
-        match *self.item() {
-            SpecificDisplayItem::Text(_) => {
-                map.serialize_entry(
-                    "glyphs",
-                    &self.iter.list.get(self.glyphs()).collect::<Vec<_>>(),
-                )?;
-            }
-            SpecificDisplayItem::PushStackingContext(_) => {
-                map.serialize_entry(
-                    "filters",
-                    &self.iter.list.get(self.filters()).collect::<Vec<_>>(),
-                )?;
-            }
-            _ => {}
+        // Push a vector of things into the DL according to the
+        // convention used by `skip_iter` and `push_iter`
+        fn push_vec<T: Clone + Serialize>(data: &mut Vec<u8>, vec: Vec<T>) {
+            let vec_len = vec.len();
+            let byte_size = mem::size_of::<T>() * vec_len;
+            serialize_fast(data, &byte_size);
+            serialize_fast(data, &vec_len);
+            let count = serialize_iter_fast(data, vec.into_iter());
+            assert_eq!(count, vec_len);
         }
 
-        let &(complex_clips, number_of_complex_clips) = self.complex_clip();
-        let gradient_stops = self.gradient_stops();
+        let list = Vec::<GenericDisplayItem<CompletelySpecificDisplayItem>>
+            ::deserialize(deserializer)?;
 
-        if number_of_complex_clips > 0 {
-            map.serialize_entry(
-                "complex_clips",
-                &self.iter.list.get(complex_clips).collect::<Vec<_>>(),
-            )?;
+        let mut data = Vec::new();
+        let mut temp = Vec::new();
+        for complete in list {
+            let item = DisplayItem {
+                item: match complete.item {
+                    Clip(v, complex_clips) => {
+                        push_vec(&mut temp, complex_clips);
+                        SpecificDisplayItem::Clip(v)
+                    },
+                    ScrollFrame(v, complex_clips) => {
+                        push_vec(&mut temp, complex_clips);
+                        SpecificDisplayItem::ScrollFrame(v)
+                    },
+                    StickyFrame(v) => SpecificDisplayItem::StickyFrame(v),
+                    Rectangle(v) => SpecificDisplayItem::Rectangle(v),
+                    ClearRectangle => SpecificDisplayItem::ClearRectangle,
+                    Line(v) => SpecificDisplayItem::Line(v),
+                    Text(v, glyphs) => {
+                        push_vec(&mut temp, glyphs);
+                        SpecificDisplayItem::Text(v)
+                    },
+                    Image(v) => SpecificDisplayItem::Image(v),
+                    YuvImage(v) => SpecificDisplayItem::YuvImage(v),
+                    Border(v) => SpecificDisplayItem::Border(v),
+                    BoxShadow(v) => SpecificDisplayItem::BoxShadow(v),
+                    Gradient(v) => SpecificDisplayItem::Gradient(v),
+                    RadialGradient(v) => SpecificDisplayItem::RadialGradient(v),
+                    Iframe(v) => SpecificDisplayItem::Iframe(v),
+                    PushStackingContext(v, filters) => {
+                        push_vec(&mut temp, filters);
+                        SpecificDisplayItem::PushStackingContext(v)
+                    },
+                    PopStackingContext => SpecificDisplayItem::PopStackingContext,
+                    SetGradientStops(stops) => {
+                        push_vec(&mut temp, stops);
+                        SpecificDisplayItem::SetGradientStops
+                    },
+                    PushShadow(v) => SpecificDisplayItem::PushShadow(v),
+                    PopAllShadows => SpecificDisplayItem::PopAllShadows,
+                },
+                clip_and_scroll: complete.clip_and_scroll,
+                info: complete.info,
+            };
+            serialize_fast(&mut data, &item);
+            // the aux data is serialized after the item, hence the temporary
+            data.extend(temp.drain(..));
         }
 
-        if !gradient_stops.is_empty() {
-            map.serialize_entry(
-                "gradient_stops",
-                &self.iter.list.get(gradient_stops).collect::<Vec<_>>(),
-            )?;
-        }
-
-        map.end()
+        Ok(BuiltDisplayList {
+            data,
+            descriptor: BuiltDisplayListDescriptor {
+                builder_start_time: 0,
+                builder_finish_time: 1,
+                send_start_time: 0,
+            },
+        })
     }
 }
 
@@ -697,7 +783,7 @@ pub struct DisplayListBuilder {
 }
 
 impl DisplayListBuilder {
-    pub fn new(pipeline_id: PipelineId, content_size: LayoutSize) -> DisplayListBuilder {
+    pub fn new(pipeline_id: PipelineId, content_size: LayoutSize) -> Self {
         Self::with_capacity(pipeline_id, content_size, 0)
     }
 
@@ -705,7 +791,7 @@ impl DisplayListBuilder {
         pipeline_id: PipelineId,
         content_size: LayoutSize,
         capacity: usize,
-    ) -> DisplayListBuilder {
+    ) -> Self {
         let start_time = precise_time_ns();
 
         // We start at 1 here, because the root scroll id is always 0.
@@ -762,7 +848,7 @@ impl DisplayListBuilder {
 
     pub fn print_display_list(&mut self) {
         let mut temp = BuiltDisplayList::default();
-        ::std::mem::swap(&mut temp.data, &mut self.data);
+        mem::swap(&mut temp.data, &mut self.data);
 
         {
             let mut iter = BuiltDisplayListIter::new(&temp);
@@ -1137,6 +1223,20 @@ impl DisplayListBuilder {
         self.push_item(item, info);
     }
 
+    /// Pushes a linear gradient to be displayed.
+    /// 
+    /// The gradient itself is described in the
+    /// `gradient` parameter. It is drawn on
+    /// a "tile" with the dimensions from `tile_size`.
+    /// These tiles are now repeated to the right and
+    /// to the bottom infinitly. If `tile_spacing`
+    /// is not zero spacers with the given dimensions
+    /// are inserted between the tiles as seams.
+    /// 
+    /// The origin of the tiles is given in `info.rect.origin`.
+    /// If the gradient should only be displayed once limit 
+    /// the `info.rect.size` to a single tile.
+    /// The gradient is only visible within the local clip.
     pub fn push_gradient(
         &mut self,
         info: &LayoutPrimitiveInfo,
@@ -1153,6 +1253,9 @@ impl DisplayListBuilder {
         self.push_item(item, info);
     }
 
+    /// Pushes a radial gradient to be displayed.
+    /// 
+    /// See [`push_gradient`](#method.push_gradient) for explanation.
     pub fn push_radial_gradient(
         &mut self,
         info: &LayoutPrimitiveInfo,
diff --git a/gfx/webrender_api/src/image.rs b/gfx/webrender_api/src/image.rs
index d067d282ca93..b3d0b964fc73 100644
--- a/gfx/webrender_api/src/image.rs
+++ b/gfx/webrender_api/src/image.rs
@@ -52,7 +52,6 @@ pub struct ExternalImageData {
 pub enum ImageFormat {
     Invalid = 0,
     A8 = 1,
-    RGB8 = 2,
     BGRA8 = 3,
     RGBAF32 = 4,
     RG8 = 5,
@@ -62,7 +61,6 @@ impl ImageFormat {
     pub fn bytes_per_pixel(self) -> u32 {
         match self {
             ImageFormat::A8 => 1,
-            ImageFormat::RGB8 => 3,
             ImageFormat::BGRA8 => 4,
             ImageFormat::RGBAF32 => 16,
             ImageFormat::RG8 => 2,
diff --git a/gfx/webrender_api/src/lib.rs b/gfx/webrender_api/src/lib.rs
index ec701dc7209d..c95f5d1416c4 100644
--- a/gfx/webrender_api/src/lib.rs
+++ b/gfx/webrender_api/src/lib.rs
@@ -15,8 +15,9 @@ extern crate core;
 extern crate euclid;
 #[cfg(feature = "ipc")]
 extern crate ipc_channel;
-#[macro_use]
 extern crate serde;
+#[macro_use]
+extern crate serde_derive;
 extern crate time;
 
 #[cfg(target_os = "macos")]
diff --git a/gfx/webrender_api/src/units.rs b/gfx/webrender_api/src/units.rs
index cf57cbbe3257..88818c4a71d3 100644
--- a/gfx/webrender_api/src/units.rs
+++ b/gfx/webrender_api/src/units.rs
@@ -12,7 +12,8 @@
 //! The terms "layer" and "stacking context" can be used interchangeably
 //! in the context of coordinate systems.
 
-use euclid::{Length, TypedRect, TypedSize2D, TypedTransform3D};
+use app_units::Au;
+use euclid::{Length, TypedRect, TypedScale, TypedSize2D, TypedTransform3D};
 use euclid::{TypedPoint2D, TypedPoint3D, TypedVector2D, TypedVector3D};
 
 /// Geometry in the coordinate system of the render target (screen or intermediate
@@ -87,6 +88,12 @@ pub type WorldVector3D = TypedVector3D<f32, WorldPixel>;
 pub struct Tiles;
 pub type TileOffset = TypedPoint2D<u16, Tiles>;
 
+/// Scaling ratio from world pixels to device pixels.
+pub type DevicePixelScale = TypedScale<f32, WorldPixel, DevicePixel>;
+/// Scaling ratio from layer to world. Used for cases where we know the layer
+/// is in world space, or specifically want to treat it this way.
+pub type LayerToWorldScale = TypedScale<f32, LayerPixel, WorldPixel>;
+
 pub type LayoutTransform = TypedTransform3D<f32, LayoutPixel, LayoutPixel>;
 pub type LayerTransform = TypedTransform3D<f32, LayerPixel, LayerPixel>;
 pub type LayerToScrollTransform = TypedTransform3D<f32, LayerPixel, ScrollLayerPixel>;
@@ -95,10 +102,10 @@ pub type LayerToWorldTransform = TypedTransform3D<f32, LayerPixel, WorldPixel>;
 pub type WorldToLayerTransform = TypedTransform3D<f32, WorldPixel, LayerPixel>;
 pub type ScrollToWorldTransform = TypedTransform3D<f32, ScrollLayerPixel, WorldPixel>;
 
-
-pub fn device_length(value: f32, device_pixel_ratio: f32) -> DeviceIntLength {
-    DeviceIntLength::new((value * device_pixel_ratio).round() as i32)
-}
+// Fixed position coordinates, to avoid float precision errors.
+pub type LayerPointAu = TypedPoint2D<Au, LayerPixel>;
+pub type LayerRectAu = TypedRect<Au, LayerPixel>;
+pub type LayerSizeAu = TypedSize2D<Au, LayerPixel>;
 
 pub fn as_scroll_parent_rect(rect: &LayerRect) -> ScrollLayerRect {
     ScrollLayerRect::from_untyped(&rect.to_untyped())
diff --git a/gfx/webrender_bindings/WebRenderTypes.h b/gfx/webrender_bindings/WebRenderTypes.h
index 6828bd1f9761..2a5af00e9cbf 100644
--- a/gfx/webrender_bindings/WebRenderTypes.h
+++ b/gfx/webrender_bindings/WebRenderTypes.h
@@ -75,8 +75,6 @@ SurfaceFormatToImageFormat(gfx::SurfaceFormat aFormat) {
       // have it yet (cf. issue #732).
     case gfx::SurfaceFormat::B8G8R8A8:
       return Some(wr::ImageFormat::BGRA8);
-    case gfx::SurfaceFormat::B8G8R8:
-      return Some(wr::ImageFormat::RGB8);
     case gfx::SurfaceFormat::A8:
       return Some(wr::ImageFormat::A8);
     case gfx::SurfaceFormat::R8G8:
@@ -95,8 +93,6 @@ ImageFormatToSurfaceFormat(ImageFormat aFormat) {
       return gfx::SurfaceFormat::B8G8R8A8;
     case ImageFormat::A8:
       return gfx::SurfaceFormat::A8;
-    case ImageFormat::RGB8:
-      return gfx::SurfaceFormat::B8G8R8;
     default:
       return gfx::SurfaceFormat::UNKNOWN;
   }
diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h
index 298d67ab40e0..685c37a8ef69 100644
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -97,7 +97,6 @@ enum class FontRenderMode : uint32_t {
 enum class ImageFormat : uint32_t {
   Invalid = 0,
   A8 = 1,
-  RGB8 = 2,
   BGRA8 = 3,
   RGBAF32 = 4,
   RG8 = 5,
diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/process_util_bsd.cc
index 6e004947d2d3..614a5e55116c 100644
--- a/ipc/chromium/src/base/process_util_bsd.cc
+++ b/ipc/chromium/src/base/process_util_bsd.cc
@@ -41,7 +41,7 @@ bool LaunchApp(const std::vector<std::string>& argv,
   // as close-on-exec.
   SetAllFDsToCloseOnExec();
 
-  EnvironmentArray vars = BuildEnvironmentArray(options.environ);
+  EnvironmentArray vars = BuildEnvironmentArray(options.env_map);
 
   posix_spawn_file_actions_t file_actions;
   if (posix_spawn_file_actions_init(&file_actions) != 0) {
diff --git a/js/moz.build b/js/moz.build
index d1a4acb2d339..e007b38bea50 100644
--- a/js/moz.build
+++ b/js/moz.build
@@ -11,3 +11,9 @@ for header in ('GCAnnotations.h', 'GCAPI.h', 'HeapAPI.h', 'RootingAPI.h', 'Slice
 
 with Files('public/TrackedOptimizationInfo.h'):
     BUG_COMPONENT = component_jit
+
+with Files("src/**"):
+    SCHEDULES.inclusive += ['jittest', 'jsreftest']
+
+with Files("public/**"):
+    SCHEDULES.inclusive += ['jittest', 'jsreftest']
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 287e0721daf2..609733cb0c1e 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -107,6 +107,7 @@
 #include "nsTransitionManager.h"
 #include "DetailsFrame.h"
 #include "nsThemeConstants.h"
+#include "mozilla/Preferences.h"
 
 #ifdef MOZ_XUL
 #include "nsIRootBox.h"
@@ -134,6 +135,7 @@ using namespace mozilla::dom;
 
 // An alias for convenience.
 static const nsIFrame::ChildListID kPrincipalList = nsIFrame::kPrincipalList;
+static const char* kPrefSelectPopupInContent = "dom.select_popup_in_content.enabled";
 
 nsIFrame*
 NS_NewHTMLCanvasFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
@@ -3234,11 +3236,17 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
     // Notify combobox that it should use the listbox as it's popup
     comboboxFrame->SetDropDown(listFrame);
 
-    NS_ASSERTION(!listFrame->IsAbsPosContainingBlock(),
-                 "Ended up with positioned dropdown list somehow.");
+    if (!Preferences::GetBool(kPrefSelectPopupInContent)) {
+      // TODO(kuoe0) Remove this assertion when content-select is shipped.
+      NS_ASSERTION(!listFrame->IsAbsPosContainingBlock(),
+                   "Ended up with positioned dropdown list somehow.");
+    }
     NS_ASSERTION(!listFrame->IsFloating(),
                  "Ended up with floating dropdown list somehow.");
 
+    // child frames of combobox frame
+    nsFrameItems childItems;
+
     // Initialize the scroll frame positioned. Note that it is NOT
     // initialized as absolutely positioned.
     nsContainerFrame* scrolledFrame =
@@ -3246,15 +3254,14 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
 
     InitializeSelectFrame(aState, listFrame, scrolledFrame, content,
                           comboboxFrame, listStyle, true,
-                          aItem.mPendingBinding, aFrameItems);
+                          aItem.mPendingBinding, childItems);
 
     NS_ASSERTION(listFrame->GetView(), "ListFrame's view is nullptr");
 
     // Create display and button frames from the combobox's anonymous content.
     // The anonymous content is appended to existing anonymous content for this
     // element (the scrollbars).
-    nsFrameItems childItems;
-
+    //
     // nsComboboxControlFrame needs special frame creation behavior for its first
     // piece of anonymous content, which means that we can't take the normal
     // ProcessChildren path.
@@ -3281,12 +3288,14 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
 
     comboboxFrame->SetInitialChildList(kPrincipalList, childItems);
 
-    // Initialize the additional popup child list which contains the
-    // dropdown list frame.
-    nsFrameItems popupItems;
-    popupItems.AddChild(listFrame);
-    comboboxFrame->SetInitialChildList(nsIFrame::kSelectPopupList,
-                                       popupItems);
+    if (!Preferences::GetBool(kPrefSelectPopupInContent)) {
+      // Initialize the additional popup child list which contains the
+      // dropdown list frame.
+      nsFrameItems popupItems;
+      popupItems.AddChild(listFrame);
+      comboboxFrame->SetInitialChildList(nsIFrame::kSelectPopupList,
+                                         popupItems);
+    }
 
     aState.mFrameState = historyState;
     if (aState.mFrameState) {
@@ -3338,7 +3347,7 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsFrameConstructorState& aState,
 
   scrollFrame->Init(aContent, geometricParent, nullptr);
 
-  if (!aBuildCombobox) {
+  if (!aBuildCombobox || Preferences::GetBool(kPrefSelectPopupInContent)) {
     aState.AddChild(scrollFrame, aFrameItems, aContent, aParentFrame);
   }
 
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 7707114f1b45..79991fa6e68a 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -57,6 +57,7 @@
 #include "FrameLayerBuilder.h"
 #include "nsISelectionController.h"
 #include "nsISelection.h"
+#include "nsIURIMutator.h"
 
 #include "imgIContainer.h"
 #include "imgLoader.h"
@@ -2109,7 +2110,9 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext,
           NS_ENSURE_SUCCESS(rv, rv);
 
           spec += nsPrintfCString("?%d,%d", p.x, p.y);
-          rv = uri->SetSpec(spec);
+          rv = NS_MutateURI(uri)
+                 .SetSpec(spec)
+                 .Finalize(uri);
           NS_ENSURE_SUCCESS(rv, rv);
 
           bool clicked = false;
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 02bd3282848f..7648b446bc23 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -108,7 +108,7 @@ random-if(winWidget) == 305643-1.html 305643-1-ref.html # depends on windows ver
 == 588739-1.html 588739-ref.html
 == 588739-2.html 588739-ref.html
 == 588739-3.html 588739-ref.html
-fails-if(webrender) == 612843-1.html 612843-1-ref.html
+== 612843-1.html 612843-1-ref.html
 == 613149-1a.html 613149-1-ref.html
 == 613149-1b.html 613149-1-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2a.html 613149-2-ref.html
diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list
index 3b0ff0d4f745..53d2a5bba748 100644
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -25,7 +25,7 @@ random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
 fuzzy(2,440) fails-if(webrender) == boxshadow-skiprect.html boxshadow-skiprect-ref.html
 == boxshadow-opacity.html boxshadow-opacity-ref.html
 == boxshadow-color-rounding.html boxshadow-color-rounding-ref.html
-fuzzy-if(webrender,1-1,7284-7284) == boxshadow-color-rounding-middle.html boxshadow-color-rounding-middle-ref.html
+== boxshadow-color-rounding-middle.html boxshadow-color-rounding-middle-ref.html
 fuzzy(3,500) fuzzy-if(d2d,2,1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int-ref.html
 == boxshadow-inset-neg-spread.html about:blank
 == boxshadow-inset-neg-spread2.html boxshadow-inset-neg-spread2-ref.html
diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list
index c7a697a14cba..203d8d47100a 100644
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -120,4 +120,4 @@ random-if(cocoaWidget) == subsuper-nofallback.html subsuper-nofallback-ref2.html
 == subsuper-fallback-size.html subsuper-fallback-size-ref.html
 
 # GPOS spacing adjustments in vertical mode -- subsetted opentype/cff test font fails to load on Win7
-fails-if(webrender) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1376231-vertical-gpos-adjustments.html 1376231-vertical-gpos-adjustments-ref.html
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1376231-vertical-gpos-adjustments.html 1376231-vertical-gpos-adjustments-ref.html
diff --git a/layout/reftests/outline/reftest.list b/layout/reftests/outline/reftest.list
index 93844ae0c09c..b3182c34cc8b 100644
--- a/layout/reftests/outline/reftest.list
+++ b/layout/reftests/outline/reftest.list
@@ -1,6 +1,6 @@
 fuzzy(2,18) fuzzy-if(webrender,52,1452) == outline-and-box-shadow.html outline-and-box-shadow-ref.html
 == outline-and-3d-transform-1a.html outline-and-3d-transform-1-ref.html
-fails-if(webrender) == outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html
+== outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html
 fuzzy-if(gtkWidget,136,120) fuzzy-if(Android,255,356) fuzzy-if(d2d,16,96) fuzzy-if(cocoaWidget,255,120) fuzzy-if(winWidget,255,216) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
 == outline-dynamic-change-1a.html outline-dynamic-change-1-ref.html
 == outline-dynamic-change-1b.html outline-dynamic-change-1-ref.html
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 2a5fa6178fed..45f80fe9f962 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -82,7 +82,7 @@ fuzzy(1,10000) == opacity-preserve3d-4.html opacity-preserve3d-4-ref.html
 == snap-perspective-1.html snap-perspective-1-ref.html
 == mask-layer-1.html mask-layer-ref.html
 == mask-layer-2.html mask-layer-ref.html
-fails-if(webrender) == mask-layer-3.html mask-layer-ref.html
+== mask-layer-3.html mask-layer-ref.html
 == split-intersect1.html split-intersect1-ref.html
 fuzzy(255,150) == split-intersect2.html split-intersect2-ref.html
 fuzzy(255,100) fails-if(webrender) == split-non-ortho1.html split-non-ortho1-ref.html
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index 4a3a493f4c74..835d817062b2 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -422,6 +422,13 @@ optgroup:before {
   border-inline-start-width: 2px ! important;
 }
 
+@supports -moz-bool-pref("dom.select_popup_in_content.enabled") {
+  *|*::-moz-dropdown-list {
+    -moz-top-layer: top !important;
+    position: absolute !important;
+  }
+}
+
 input:disabled,
 textarea:disabled,
 option:disabled,
diff --git a/media/webrtc/signaling/gtest/MockCall.h b/media/webrtc/signaling/gtest/MockCall.h
index f96add980097..733819205831 100644
--- a/media/webrtc/signaling/gtest/MockCall.h
+++ b/media/webrtc/signaling/gtest/MockCall.h
@@ -70,7 +70,10 @@ public:
     return nullptr;
   }
 
-  void ReconfigureVideoEncoder(VideoEncoderConfig config) override {}
+  void ReconfigureVideoEncoder(VideoEncoderConfig config) override
+  {
+    mEncoderConfig = config.Copy();
+  }
 
   Stats GetStats() override
   {
@@ -82,6 +85,7 @@ public:
 
   virtual ~MockVideoSendStream() {}
 
+  VideoEncoderConfig mEncoderConfig;
   VideoSendStream::Stats mStats;
 };
 
@@ -117,7 +121,8 @@ public:
   MockCall()
     : mAudioSendConfig(nullptr)
     , mVideoReceiveConfig(nullptr)
-    , mVideoSendConfig(nullptr) {}
+    , mVideoSendConfig(nullptr)
+    , mCurrentVideoSendStream(nullptr) {}
 
   AudioSendStream* CreateAudioSendStream(const AudioSendStream::Config& config) override
   {
@@ -142,13 +147,17 @@ public:
 
   VideoSendStream* CreateVideoSendStream(VideoSendStream::Config config,
                                          VideoEncoderConfig encoder_config) override {
+    MOZ_RELEASE_ASSERT(!mCurrentVideoSendStream);
     mVideoSendConfig = config.Copy();
     mEncoderConfig = encoder_config.Copy();
-    return new MockVideoSendStream;
+    mCurrentVideoSendStream = new MockVideoSendStream;
+    return mCurrentVideoSendStream;
   }
 
   void DestroyVideoSendStream(VideoSendStream* send_stream) override
   {
+    MOZ_RELEASE_ASSERT(mCurrentVideoSendStream == send_stream);
+    mCurrentVideoSendStream = nullptr;
     delete static_cast<MockVideoSendStream*>(send_stream);
   }
 
@@ -208,6 +217,7 @@ public:
   VideoSendStream::Config mVideoSendConfig;
   VideoEncoderConfig mEncoderConfig;
   Call::Stats mStats;
+  MockVideoSendStream* mCurrentVideoSendStream;
 };
 
 }
diff --git a/media/webrtc/signaling/gtest/videoconduit_unittests.cpp b/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
index 8f46b620c8fc..8ee30cc36398 100644
--- a/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
+++ b/media/webrtc/signaling/gtest/videoconduit_unittests.cpp
@@ -120,7 +120,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecs)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
 
   // Defaults
   std::vector<VideoCodecConfig *> codecs;
@@ -178,7 +177,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsFEC)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
   std::vector<VideoCodecConfig *> codecs;
 
   VideoCodecConfig codecConfig(120, "VP8", constraints);
@@ -211,7 +209,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsH264)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
 
   WebrtcGmpPCHandleSetter setter("hi there");
 
@@ -244,7 +241,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsKeyframeRequestType)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
   std::vector<VideoCodecConfig *> codecs;
 
   // PLI should be preferred to FIR
@@ -272,7 +268,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsNack)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
   std::vector<VideoCodecConfig *> codecs;
 
   VideoCodecConfig codecConfig(120, "VP8", constraints);
@@ -301,7 +296,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsRemb)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
   std::vector<VideoCodecConfig *> codecs;
 
   VideoCodecConfig codecConfig(120, "VP8", constraints);
@@ -330,7 +324,6 @@ TEST_F(VideoConduitTest, TestConfigureReceiveMediaCodecsTmmbr)
 {
   MediaConduitErrorCode ec;
   EncodingConstraints constraints;
-  VideoCodecConfig::SimulcastEncoding encoding;
   std::vector<VideoCodecConfig *> codecs;
 
   VideoCodecConfig codecConfig(120, "VP8", constraints);
@@ -737,6 +730,366 @@ TEST_F(VideoConduitTest, TestOnSinkWantsChanged)
   ASSERT_EQ(mAdapter->mMaxPixelCount, 64000);
 }
 
+TEST_F(VideoConduitTest, TestReconfigureReceiveMediaCodecs)
+{
+  MediaConduitErrorCode ec;
+  EncodingConstraints constraints;
+  VideoCodecConfig::SimulcastEncoding encoding;
+  std::vector<VideoCodecConfig*> codecs;
+
+  WebrtcGmpPCHandleSetter setter("hi there");
+
+  // Defaults
+  VideoCodecConfig codecConfig(120, "VP8", constraints);
+  codecs.push_back(&codecConfig);
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "VP8");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 0);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+
+  // FEC
+  codecs.clear();
+  VideoCodecConfig codecConfigFecFb(120, "VP8", constraints);
+  codecConfigFecFb.mFECFbSet = true;
+  codecs.push_back(&codecConfigFecFb);
+  VideoCodecConfig codecConfigFEC(1, "ulpfec", constraints);
+  codecs.push_back(&codecConfigFEC);
+  VideoCodecConfig codecConfigRED(2, "red", constraints);
+  codecs.push_back(&codecConfigRED);
+
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "VP8");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 0);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, 1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, 2);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+
+  // H264
+  codecs.clear();
+  VideoCodecConfig codecConfigH264(120, "H264", constraints);
+  codecs.push_back(&codecConfigH264);
+
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "H264");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 0);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+
+  // Nack
+  codecs.clear();
+  VideoCodecConfig codecConfigNack(120, "VP8", constraints);
+  codecConfigNack.mNackFbTypes.push_back("");
+  codecs.push_back(&codecConfigNack);
+
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "VP8");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 1000);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+
+  // Remb
+  codecs.clear();
+  VideoCodecConfig codecConfigRemb(120, "VP8", constraints);
+  codecConfigRemb.mRembFbSet = true;
+  codecs.push_back(&codecConfigRemb);
+
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "VP8");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 0);
+  ASSERT_TRUE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+
+  // Tmmbr
+  codecs.clear();
+  VideoCodecConfig codecConfigTmmbr(120, "VP8", constraints);
+  codecConfigTmmbr.mCcmFbTypes.push_back("tmmbr");
+  codecs.push_back(&codecConfigTmmbr);
+
+  ec = mVideoConduit->ConfigureRecvMediaCodecs(codecs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders.size(), 1U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_type, 120);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.decoders[0].payload_name, "VP8");
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.local_ssrc, 0U);
+  ASSERT_NE(mCall->mVideoReceiveConfig.rtp.remote_ssrc, 0U);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.nack.rtp_history_ms, 0);
+  ASSERT_FALSE(mCall->mVideoReceiveConfig.rtp.remb);
+  ASSERT_TRUE(mCall->mVideoReceiveConfig.rtp.tmmbr);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.keyframe_method, webrtc::kKeyFrameReqPliRtcp);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.ulpfec_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.ulpfec.red_rtx_payload_type, -1);
+  ASSERT_EQ(mCall->mVideoReceiveConfig.rtp.rtx.size(), 0U);
+}
+
+TEST_F(VideoConduitTest, TestReconfigureSendMediaCodec)
+{
+  MediaConduitErrorCode ec;
+  EncodingConstraints constraints;
+  VideoCodecConfig::SimulcastEncoding encoding;
+  std::vector<webrtc::VideoStream> videoStreams;
+
+  WebrtcGmpPCHandleSetter setter("hi there");
+
+  VideoCodecConfig codecConfig(120, "VP8", constraints);
+  codecConfig.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfig);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+
+  // Defaults
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfig);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_name, "VP8");
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_type, 120);
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.internal_source, false);
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.full_overuse_time, false);
+  ASSERT_NE(mCall->mVideoSendConfig.encoder_settings.encoder, nullptr);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.max_packet_size, kVideoMtu);
+  ASSERT_EQ(mCall->mEncoderConfig.content_type,
+            VideoEncoderConfig::ContentType::kRealtimeVideo);
+  ASSERT_EQ(mCall->mEncoderConfig.min_transmit_bitrate_bps, 0);
+  ASSERT_EQ(mCall->mEncoderConfig.max_bitrate_bps, 0);
+  ASSERT_EQ(mCall->mEncoderConfig.number_of_streams, 1U);
+  ASSERT_EQ(mCall->mEncoderConfig.resolution_divisor, 1);
+  mVideoConduit->StopTransmitting();
+
+  // FEC
+  VideoCodecConfig codecConfigFEC(120, "VP8", constraints);
+  codecConfigFEC.mSimulcastEncodings.push_back(encoding);
+  codecConfigFEC.mFECFbSet = true;
+  codecConfigFEC.mNackFbTypes.push_back("");
+  codecConfigFEC.mULPFECPayloadType = 1;
+  codecConfigFEC.mREDPayloadType = 2;
+  codecConfigFEC.mREDRTXPayloadType = 3;
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigFEC);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.ulpfec.ulpfec_payload_type, codecConfigFEC.mULPFECPayloadType);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.ulpfec.red_payload_type, codecConfigFEC.mREDPayloadType);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.ulpfec.red_rtx_payload_type, codecConfigFEC.mREDRTXPayloadType);
+  mVideoConduit->StopTransmitting();
+
+  // H264
+  VideoCodecConfig codecConfigH264(120, "H264", constraints);
+  codecConfigH264.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigH264);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_name, "H264");
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_type, 120);
+  mVideoConduit->StopTransmitting();
+
+  // TIAS
+  VideoCodecConfig codecConfigTias(120, "VP8", constraints);
+  codecConfigTias.mSimulcastEncodings.push_back(encoding);
+  codecConfigTias.mTias = 1000000;
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigTias);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  SendVideoFrame(1280, 720, 1);
+
+  videoStreams = mCall->mEncoderConfig.video_stream_factory->CreateEncoderStreams(1280, 720, mCall->mEncoderConfig);
+  ASSERT_EQ(videoStreams.size(), 1U);
+  ASSERT_EQ(videoStreams[0].min_bitrate_bps, 600000);
+  ASSERT_EQ(videoStreams[0].target_bitrate_bps, 800000);
+  ASSERT_EQ(videoStreams[0].max_bitrate_bps, 1000000);
+  mVideoConduit->StopTransmitting();
+
+  // MaxBr
+  VideoCodecConfig codecConfigMaxBr(120, "VP8", constraints);
+  encoding.constraints.maxBr = 50000;
+  codecConfigMaxBr.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigMaxBr);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  SendVideoFrame(1280, 720, 1);
+  videoStreams = mCall->mEncoderConfig.video_stream_factory->CreateEncoderStreams(1280, 720, mCall->mEncoderConfig);
+  ASSERT_EQ(videoStreams.size(), 1U);
+  ASSERT_LE(videoStreams[0].min_bitrate_bps, 50000);
+  ASSERT_LE(videoStreams[0].target_bitrate_bps, 50000);
+  ASSERT_EQ(videoStreams[0].max_bitrate_bps, 50000);
+  mVideoConduit->StopTransmitting();
+
+  // MaxFs
+  VideoCodecConfig codecConfigMaxFs(120, "VP8", constraints);
+  codecConfigMaxFs.mEncodingConstraints.maxFs = 3600;
+  encoding.constraints.maxBr = 0;
+  codecConfigMaxFs.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigMaxFs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+
+  UniquePtr<MockVideoSink> sink(new MockVideoSink());
+  rtc::VideoSinkWants wants;
+  mVideoConduit->AddOrUpdateSink(sink.get(), wants);
+
+  mVideoConduit->StartTransmitting();
+  SendVideoFrame(1280, 720, 1);
+  ASSERT_EQ(sink->mVideoFrame.width(), 1280);
+  ASSERT_EQ(sink->mVideoFrame.height(), 720);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 1000U);
+
+  SendVideoFrame(640, 360, 2);
+  ASSERT_EQ(sink->mVideoFrame.width(), 640);
+  ASSERT_EQ(sink->mVideoFrame.height(), 360);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 2000U);
+
+  SendVideoFrame(1920, 1280, 3);
+  ASSERT_EQ(sink->mVideoFrame.width(), 960);
+  ASSERT_EQ(sink->mVideoFrame.height(), 640);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 3000U);
+  mVideoConduit->StopTransmitting();
+}
+
+TEST_F(VideoConduitTest, TestReconfigureSendMediaCodecWhileTransmitting)
+{
+  MediaConduitErrorCode ec;
+  EncodingConstraints constraints;
+  VideoCodecConfig::SimulcastEncoding encoding;
+  std::vector<webrtc::VideoStream> videoStreams;
+
+  WebrtcGmpPCHandleSetter setter("hi there");
+
+  VideoCodecConfig codecConfig(120, "VP8", constraints);
+  codecConfig.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfig);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+
+  // Defaults
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfig);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  mVideoConduit->StartTransmitting();
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_name, "VP8");
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.payload_type, 120);
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.internal_source, false);
+  ASSERT_EQ(mCall->mVideoSendConfig.encoder_settings.full_overuse_time, false);
+  ASSERT_NE(mCall->mVideoSendConfig.encoder_settings.encoder, nullptr);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.rtcp_mode, webrtc::RtcpMode::kCompound);
+  ASSERT_EQ(mCall->mVideoSendConfig.rtp.max_packet_size, kVideoMtu);
+  ASSERT_EQ(mCall->mEncoderConfig.content_type,
+            VideoEncoderConfig::ContentType::kRealtimeVideo);
+  ASSERT_EQ(mCall->mEncoderConfig.min_transmit_bitrate_bps, 0);
+  ASSERT_EQ(mCall->mEncoderConfig.max_bitrate_bps, 0);
+  ASSERT_EQ(mCall->mEncoderConfig.number_of_streams, 1U);
+  ASSERT_EQ(mCall->mEncoderConfig.resolution_divisor, 1);
+
+  // Changing these parameters should not require a call to StartTransmitting
+  // for the changes to take effect.
+
+  // TIAS
+  VideoCodecConfig codecConfigTias(120, "VP8", constraints);
+  codecConfigTias.mSimulcastEncodings.push_back(encoding);
+  codecConfigTias.mTias = 1000000;
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigTias);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  SendVideoFrame(1280, 720, 1);
+
+  videoStreams = mCall->mCurrentVideoSendStream->mEncoderConfig.video_stream_factory->CreateEncoderStreams(1280, 720, mCall->mCurrentVideoSendStream->mEncoderConfig);
+  ASSERT_EQ(videoStreams.size(), 1U);
+  ASSERT_EQ(videoStreams[0].min_bitrate_bps, 600000);
+  ASSERT_EQ(videoStreams[0].target_bitrate_bps, 800000);
+  ASSERT_EQ(videoStreams[0].max_bitrate_bps, 1000000);
+
+  // MaxBr
+  VideoCodecConfig codecConfigMaxBr(120, "VP8", constraints);
+  encoding.constraints.maxBr = 50000;
+  codecConfigMaxBr.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigMaxBr);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+  SendVideoFrame(1280, 720, 1);
+  videoStreams = mCall->mCurrentVideoSendStream->mEncoderConfig.video_stream_factory->CreateEncoderStreams(1280, 720, mCall->mCurrentVideoSendStream->mEncoderConfig);
+  ASSERT_EQ(videoStreams.size(), 1U);
+  ASSERT_LE(videoStreams[0].min_bitrate_bps, 50000);
+  ASSERT_LE(videoStreams[0].target_bitrate_bps, 50000);
+  ASSERT_EQ(videoStreams[0].max_bitrate_bps, 50000);
+
+  // MaxFs
+  VideoCodecConfig codecConfigMaxFs(120, "VP8", constraints);
+  codecConfigMaxFs.mEncodingConstraints.maxFs = 3600;
+  encoding.constraints.maxBr = 0;
+  codecConfigMaxFs.mSimulcastEncodings.push_back(encoding);
+  ec = mVideoConduit->ConfigureSendMediaCodec(&codecConfigMaxFs);
+  ASSERT_EQ(ec, kMediaConduitNoError);
+
+  UniquePtr<MockVideoSink> sink(new MockVideoSink());
+  rtc::VideoSinkWants wants;
+  mVideoConduit->AddOrUpdateSink(sink.get(), wants);
+
+  SendVideoFrame(1280, 720, 1);
+  ASSERT_EQ(sink->mVideoFrame.width(), 1280);
+  ASSERT_EQ(sink->mVideoFrame.height(), 720);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 1000U);
+
+  SendVideoFrame(640, 360, 2);
+  ASSERT_EQ(sink->mVideoFrame.width(), 640);
+  ASSERT_EQ(sink->mVideoFrame.height(), 360);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 2000U);
+
+  SendVideoFrame(1920, 1280, 3);
+  ASSERT_EQ(sink->mVideoFrame.width(), 960);
+  ASSERT_EQ(sink->mVideoFrame.height(), 640);
+  ASSERT_EQ(sink->mVideoFrame.timestamp_us(), 3000U);
+
+  mVideoConduit->StopTransmitting();
+}
+
 TEST_F(VideoConduitTest, TestVideoEncode)
 {
   MediaConduitErrorCode ec;
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index 17f05a49169a..fe08cd66a47a 100644
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -808,6 +808,11 @@ WebrtcVideoConduit::ConfigureSendMediaCodec(const VideoCodecConfig* codecConfig)
   // Recreating on PayloadType change may be overkill, but is safe.
   if (mSendStream) {
     if (!RequiresNewSendStream(*codecConfig)) {
+      {
+        MutexAutoLock lock(mCodecMutex);
+        mCurSendCodecConfig->mEncodingConstraints = codecConfig->mEncodingConstraints;
+        mCurSendCodecConfig->mSimulcastEncodings = codecConfig->mSimulcastEncodings;
+      }
       mSendStream->ReconfigureVideoEncoder(mEncoderConfig.CopyConfig());
       return kMediaConduitNoError;
     }
@@ -1398,6 +1403,11 @@ WebrtcVideoConduit::ConfigureRecvMediaCodecs(
       mRecvStreamConfig.rtp.ulpfec.ulpfec_payload_type = ulpfec_payload_type;
       mRecvStreamConfig.rtp.ulpfec.red_payload_type = red_payload_type;
       mRecvStreamConfig.rtp.ulpfec.red_rtx_payload_type = -1;
+    } else {
+      // Reset to defaults
+      mRecvStreamConfig.rtp.ulpfec.ulpfec_payload_type = -1;
+      mRecvStreamConfig.rtp.ulpfec.red_payload_type = -1;
+      mRecvStreamConfig.rtp.ulpfec.red_rtx_payload_type = -1;
     }
 
     // SetRemoteSSRC should have populated this already
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 10b7611fb275..29a8dcc0c823 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1336,6 +1336,8 @@ pref("dom.forms.select.customstyling", false);
 pref("dom.forms.select.customstyling", true);
 #endif
 pref("dom.select_popup_in_parent.enabled", false);
+// Bug 1421229 - content-select
+pref("dom.select_popup_in_content.enabled", false);
 
 // Enable Directory API. By default, disabled.
 pref("dom.input.dirpicker", false);
@@ -5391,7 +5393,7 @@ pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256");
 pref("urlclassifier.trackingWhitelistTable", "test-trackwhite-simple,mozstd-trackwhite-digest256");
 
 // These tables will never trigger a gethash call.
-pref("urlclassifier.disallow_completions", "test-malware-simple,test-harmful-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple,goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256");
+pref("urlclassifier.disallow_completions", "test-malware-simple,test-harmful-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple,goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256,goog-passwordwhite-proto");
 
 // Number of random entries to send with a gethash request
 pref("urlclassifier.gethashnoise", 4);
diff --git a/moz.build b/moz.build
index b498c26ce64e..c7aef870f62e 100644
--- a/moz.build
+++ b/moz.build
@@ -55,6 +55,18 @@ with Files('**/Makefile.in'):
     BUG_COMPONENT = ('Core', 'Build Config')
     FINAL = True
 
+with Files("**/*.js"):
+    SCHEDULES.inclusive += ['test-verify']
+
+with Files("**/*.html"):
+    SCHEDULES.inclusive += ['test-verify']
+
+with Files("**/*.xhtml"):
+    SCHEDULES.inclusive += ['test-verify']
+
+with Files("**/*.xul"):
+    SCHEDULES.inclusive += ['test-verify']
+
 CONFIGURE_SUBST_FILES += [
     'config/autoconf.mk',
     'config/emptyvars.mk',
diff --git a/netwerk/base/nsINetUtil.idl b/netwerk/base/nsINetUtil.idl
index 800a9ae905f5..0a7a7d348b3f 100644
--- a/netwerk/base/nsINetUtil.idl
+++ b/netwerk/base/nsINetUtil.idl
@@ -227,4 +227,11 @@ interface nsINetUtil : nsISupports
    *         ReferrerPolicy.h for details)
    */
   unsigned long parseAttributePolicyString(in AString aPolicyString);
+
+
+  /**
+   * This is a void method that is C++ implemented and always
+   * returns NS_ERROR_NOT_IMPLEMENTED. To be used for testing.
+   */
+  void notImplemented();
 };
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
index 6308dc376bbf..e465a8070195 100644
--- a/netwerk/base/nsIOService.cpp
+++ b/netwerk/base/nsIOService.cpp
@@ -1909,5 +1909,11 @@ nsIOService::BlockToplevelDataUriNavigations()
   return sBlockToplevelDataUriNavigations;
 }
 
+NS_IMETHODIMP
+nsIOService::NotImplemented()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 } // namespace net
 } // namespace mozilla
diff --git a/netwerk/base/nsIURIMutator.idl b/netwerk/base/nsIURIMutator.idl
index 0211adea8818..146374a3f6de 100644
--- a/netwerk/base/nsIURIMutator.idl
+++ b/netwerk/base/nsIURIMutator.idl
@@ -66,8 +66,16 @@ protected:
 
   MOZ_MUST_USE nsresult InitFromSpec(const nsACString& aSpec)
   {
-    RefPtr<T> uri = new T();
-    nsresult rv = uri->SetSpec(aSpec);
+    nsresult rv = NS_OK;
+    RefPtr<T> uri;
+    if (mURI) {
+      // This only works because all other Init methods create a new object
+      mURI.swap(uri);
+    } else {
+      uri = new T();
+    }
+
+    rv = uri->SetSpec(aSpec);
     if (NS_FAILED(rv)) {
       return rv;
     }
diff --git a/netwerk/base/nsIURIMutatorUtils.cpp b/netwerk/base/nsIURIMutatorUtils.cpp
index 20b0c8c46def..ad76d74f81a6 100644
--- a/netwerk/base/nsIURIMutatorUtils.cpp
+++ b/netwerk/base/nsIURIMutatorUtils.cpp
@@ -19,4 +19,5 @@ NS_MutateURI::NS_MutateURI(nsIURI* aURI)
 NS_MutateURI::NS_MutateURI(const char * aContractID)
 {
   mMutator = do_CreateInstance(aContractID, &mStatus);
+  MOZ_ASSERT(NS_SUCCEEDED(mStatus), "Called with wrong aContractID");
 }
diff --git a/netwerk/protocol/ftp/FTPChannelChild.cpp b/netwerk/protocol/ftp/FTPChannelChild.cpp
index 9ae47c805236..14e411b3c77d 100644
--- a/netwerk/protocol/ftp/FTPChannelChild.cpp
+++ b/netwerk/protocol/ftp/FTPChannelChild.cpp
@@ -22,6 +22,7 @@
 #include "SerializedLoadContext.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "nsIPrompt.h"
+#include "nsIURIMutator.h"
 
 using mozilla::dom::ContentChild;
 using namespace mozilla::ipc;
@@ -328,7 +329,10 @@ FTPChannelChild::DoOnStartRequest(const nsresult& aChannelStatus,
   nsCOMPtr<nsIURI> uri = DeserializeURI(aURI);
   nsresult rv = uri->GetSpec(spec);
   if (NS_SUCCEEDED(rv)) {
-    rv = nsBaseChannel::URI()->SetSpec(spec);
+    // Changes nsBaseChannel::URI()
+    rv = NS_MutateURI(mURI)
+           .SetSpec(spec)
+           .Finalize(mURI);
     if (NS_FAILED(rv)) {
       Cancel(rv);
     }
diff --git a/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp b/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
index 6deeea99f4bf..58119ed5d2d7 100644
--- a/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
+++ b/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
@@ -13,6 +13,7 @@
 #include "plstr.h"
 #include "nsIObserverService.h"
 #include "nsIURI.h"
+#include "nsIURIMutator.h"
 
 #include "mozilla/net/NeckoChild.h"
 
@@ -65,17 +66,9 @@ nsWyciwygProtocolHandler::NewURI(const nsACString &aSpec,
                                  nsIURI *aBaseURI,
                                  nsIURI **result)
 {
-  nsresult rv;
-
-  nsCOMPtr<nsIURI> url = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = url->SetSpec(aSpec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  url.forget(result);
-
-  return rv;
+  return NS_MutateURI(NS_SIMPLEURIMUTATOR_CONTRACTID)
+           .SetSpec(aSpec)
+           .Finalize(result);
 }
 
 NS_IMETHODIMP
diff --git a/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js b/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js
index e6669008b6f3..6d6b2fcb2dd2 100644
--- a/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js
+++ b/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js
@@ -33,10 +33,10 @@ CustomProtocolHandler.prototype = {
            Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE;
   },
   newURI: function(aSpec, aOriginCharset, aBaseURI) {
-    var uri = Cc["@mozilla.org/network/standard-url;1"].
-              createInstance(Ci.nsIURI);
-    uri.spec = aSpec;
-    return uri;
+    return Cc["@mozilla.org/network/standard-url-mutator;1"]
+             .createInstance(Ci.nsIURIMutator)
+             .setSpec(aSpec)
+             .finalize()
   },
   newChannel2: function(aURI, aLoadInfo) {
     return new CustomChannel(aURI, aLoadInfo);
diff --git a/netwerk/test/unit/test_1351443-missing-NewChannel2.js b/netwerk/test/unit/test_1351443-missing-NewChannel2.js
index 0f024a4ebe11..3c4f001e7fc7 100644
--- a/netwerk/test/unit/test_1351443-missing-NewChannel2.js
+++ b/netwerk/test/unit/test_1351443-missing-NewChannel2.js
@@ -13,9 +13,10 @@ var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
                           .getService(Ci.nsIContentSecurityManager);
 
 function ProtocolHandler() {
-  this.uri = Cc["@mozilla.org/network/simple-uri;1"].
-               createInstance(Ci.nsIURI);
-  this.uri.spec = this.scheme + ":dummy";
+  this.uri = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec(this.scheme + ":dummy")
+               .finalize();
   this.uri.QueryInterface(Ci.nsIMutable).mutable = false;
 }
 
diff --git a/netwerk/test/unit/test_URIs.js b/netwerk/test/unit/test_URIs.js
index 5f08f5cf4be3..a9a0af66dd41 100644
--- a/netwerk/test/unit/test_URIs.js
+++ b/netwerk/test/unit/test_URIs.js
@@ -485,8 +485,11 @@ function do_test_mutate_ref(aTest, aSuffix) {
     var specWithSuffix = aTest.spec + aSuffix;
     do_info("testing that setting spec to " +
             specWithSuffix + " and then clearing ref does what we expect");
-    testURI.spec = specWithSuffix;
-    testURI.ref = "";
+
+    testURI = testURI.mutate()
+                     .setSpec(specWithSuffix)
+                     .setRef("")
+                     .finalize();
     do_check_uri_eq(testURI, refURIWithoutSuffix);
     do_check_uri_eqExceptRef(testURI, refURIWithSuffix);
 
diff --git a/netwerk/test/unit/test_URIs2.js b/netwerk/test/unit/test_URIs2.js
index 7bd9ad96f997..76115eaee594 100644
--- a/netwerk/test/unit/test_URIs2.js
+++ b/netwerk/test/unit/test_URIs2.js
@@ -587,8 +587,10 @@ function do_test_mutate_ref(aTest, aSuffix) {
     var specWithSuffix = aTest.spec + aSuffix;
     do_info("testing that setting spec to " +
             specWithSuffix + " and then clearing ref does what we expect");
-    testURI.spec = specWithSuffix;
-    testURI.ref = "";
+    testURI = testURI.mutate()
+                     .setSpec(specWithSuffix)
+                     .setRef("")
+                     .finalize();
     do_check_uri_eq(testURI, refURIWithoutSuffix);
     do_check_uri_eqExceptRef(testURI, refURIWithSuffix);
 
diff --git a/netwerk/test/unit/test_bug1177909.js b/netwerk/test/unit/test_bug1177909.js
index e6643c61c15e..5d1f0c63b163 100644
--- a/netwerk/test/unit/test_bug1177909.js
+++ b/netwerk/test/unit/test_bug1177909.js
@@ -99,10 +99,13 @@ add_task(async function testSocksProxy() {
 
 add_task(async function testDirectProxy() {
   // Do what |WebSocketChannel::AsyncOpen| do, but do not prefer https proxy.
-  let proxyURI = Cc["@mozilla.org/network/standard-url;1"].createInstance(Ci.nsIURI);
-  proxyURI.spec = "wss://ws.mozilla.org/";
-  let uri = proxyURI.clone();
-  uri.scheme = "https";
+  let proxyURI = Cc["@mozilla.org/network/standard-url-mutator;1"]
+                   .createInstance(Ci.nsIURIMutator)
+                   .setSpec("wss://ws.mozilla.org/")
+                   .finalize();
+  let uri = proxyURI.mutate()
+                    .setScheme("https")
+                    .finalize();
 
   let ioService = Cc["@mozilla.org/network/io-service;1"].
                     getService(Ci.nsIIOService);
@@ -122,10 +125,13 @@ add_task(async function testDirectProxy() {
 
 add_task(async function testWebSocketProxy() {
   // Do what |WebSocketChannel::AsyncOpen| do
-  let proxyURI = Cc["@mozilla.org/network/standard-url;1"].createInstance(Ci.nsIURI);
-  proxyURI.spec = "wss://ws.mozilla.org/";
-  let uri = proxyURI.clone();
-  uri.scheme = "https";
+  let proxyURI = Cc["@mozilla.org/network/standard-url-mutator;1"]
+                   .createInstance(Ci.nsIURIMutator)
+                   .setSpec("wss://ws.mozilla.org/")
+                   .finalize();
+  let uri = proxyURI.mutate()
+                    .setScheme("https")
+                    .finalize();
 
   let proxyFlags = Ci.nsIProtocolProxyService.RESOLVE_PREFER_HTTPS_PROXY |
                    Ci.nsIProtocolProxyService.RESOLVE_ALWAYS_TUNNEL;
diff --git a/netwerk/test/unit/test_bug261425.js b/netwerk/test/unit/test_bug261425.js
index 1aa6d4bf96e0..a43a0f2fe176 100644
--- a/netwerk/test/unit/test_bug261425.js
+++ b/netwerk/test/unit/test_bug261425.js
@@ -6,7 +6,7 @@ function run_test() {
 
   var success = false;
   try {
-    newURI.spec = "http: //foo.com";
+    newURI = newURI.mutate().setSpec("http: //foo.com").finalize();
   }
   catch (e) {
     success = e.result == Cr.NS_ERROR_MALFORMED_URI;
diff --git a/netwerk/test/unit/test_bug412457.js b/netwerk/test/unit/test_bug412457.js
index 7f9e6dd98da2..4343479126bc 100644
--- a/netwerk/test/unit/test_bug412457.js
+++ b/netwerk/test/unit/test_bug412457.js
@@ -7,38 +7,38 @@ function run_test() {
   Assert.equal(newURI.asciiHost, "xn--kkr.com");
 
   // escaped UTF8
-  newURI.spec = "http://%e5%8d%81.com";
+  newURI = newURI.mutate().setSpec("http://%e5%8d%81.com").finalize();
   Assert.equal(newURI.asciiHost, "xn--kkr.com");
 
   // There should be only allowed characters in hostname after
   // unescaping and attempting to apply IDNA. "\x80" is illegal in
   // UTF-8, so IDNA fails, and 0x80 is illegal in DNS too.
-  Assert.throws(() => { newURI.spec = "http://%80.com"; }, "illegal UTF character");
+  Assert.throws(() => { newURI = newURI.mutate().setSpec("http://%80.com").finalize(); }, "illegal UTF character");
 
   // test parsing URL with all possible host terminators
-  newURI.spec = "http://example.com?foo";
+  newURI = newURI.mutate().setSpec("http://example.com?foo").finalize();
   Assert.equal(newURI.asciiHost, "example.com");
 
-  newURI.spec = "http://example.com#foo";
+  newURI = newURI.mutate().setSpec("http://example.com#foo").finalize();
   Assert.equal(newURI.asciiHost, "example.com");
 
-  newURI.spec = "http://example.com:80";
+  newURI = newURI.mutate().setSpec("http://example.com:80").finalize();
   Assert.equal(newURI.asciiHost, "example.com");
 
-  newURI.spec = "http://example.com/foo";
+  newURI = newURI.mutate().setSpec("http://example.com/foo").finalize();
   Assert.equal(newURI.asciiHost, "example.com");
 
   // Characters that are invalid in the host, shouldn't be decoded.
-  newURI.spec = "http://example.com%3ffoo";
+  newURI = newURI.mutate().setSpec("http://example.com%3ffoo").finalize();
   Assert.equal(newURI.asciiHost, "example.com%3ffoo");
-  newURI.spec = "http://example.com%23foo";
+  newURI = newURI.mutate().setSpec("http://example.com%23foo").finalize();
   Assert.equal(newURI.asciiHost, "example.com%23foo");
-  newURI.spec = "http://example.com%3bfoo";
+  newURI = newURI.mutate().setSpec("http://example.com%3bfoo").finalize();
   Assert.equal(newURI.asciiHost, "example.com%3bfoo");
-  newURI.spec = "http://example.com%3a80";
+  newURI = newURI.mutate().setSpec("http://example.com%3a80").finalize();
   Assert.equal(newURI.asciiHost, "example.com%3a80");
-  newURI.spec = "http://example.com%2ffoo";
+  newURI = newURI.mutate().setSpec("http://example.com%2ffoo").finalize();
   Assert.equal(newURI.asciiHost, "example.com%2ffoo");
-  newURI.spec = "http://example.com%00";
+  newURI = newURI.mutate().setSpec("http://example.com%00").finalize();
   Assert.equal(newURI.asciiHost, "example.com%00");
 }
\ No newline at end of file
diff --git a/netwerk/test/unit/test_bug429347.js b/netwerk/test/unit/test_bug429347.js
index b6244c86562a..df231e5737a9 100644
--- a/netwerk/test/unit/test_bug429347.js
+++ b/netwerk/test/unit/test_bug429347.js
@@ -6,33 +6,33 @@ function run_test() {
   var uri2 = ios.newURI("http://example.com/#bar");
   Assert.ok(uri1.equals(uri2));
 
-  uri1.spec = "http://example.com?bar";
-  uri2.spec = "http://example.com/?bar";
+  uri1 = uri1.mutate().setSpec("http://example.com?bar").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/?bar").finalize();
   Assert.ok(uri1.equals(uri2));
 
   // see https://bugzilla.mozilla.org/show_bug.cgi?id=665706
   // ";" is not parsed as special anymore and thus ends up
   // in the authority component (see RFC 3986)
-  uri1.spec = "http://example.com;bar";
-  uri2.spec = "http://example.com/;bar";
+  uri1 = uri1.mutate().setSpec("http://example.com;bar").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/;bar").finalize();
   Assert.ok(!uri1.equals(uri2));
 
-  uri1.spec = "http://example.com#";
-  uri2.spec = "http://example.com/#";
+  uri1 = uri1.mutate().setSpec("http://example.com#").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/#").finalize();
   Assert.ok(uri1.equals(uri2));
 
-  uri1.spec = "http://example.com?";
-  uri2.spec = "http://example.com/?";
+  uri1 = uri1.mutate().setSpec("http://example.com?").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/?").finalize();
   Assert.ok(uri1.equals(uri2));
 
   // see https://bugzilla.mozilla.org/show_bug.cgi?id=665706
   // ";" is not parsed as special anymore and thus ends up
   // in the authority component (see RFC 3986)
-  uri1.spec = "http://example.com;";
-  uri2.spec = "http://example.com/;";
+  uri1 = uri1.mutate().setSpec("http://example.com;").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/;").finalize();
   Assert.ok(!uri1.equals(uri2));
 
-  uri1.spec = "http://example.com";
-  uri2.spec = "http://example.com/";
+  uri1 = uri1.mutate().setSpec("http://example.com").finalize();
+  uri2 = uri2.mutate().setSpec("http://example.com/").finalize();
   Assert.ok(uri1.equals(uri2));
 }
diff --git a/netwerk/test/unit/test_bug479485.js b/netwerk/test/unit/test_bug479485.js
index f8b018059d98..9791aaef46e5 100644
--- a/netwerk/test/unit/test_bug479485.js
+++ b/netwerk/test/unit/test_bug479485.js
@@ -19,7 +19,7 @@ function run_test() {
     exception_threw = false;
     newURI = ios.newURI("http://foo.com");
     try {
-      newURI.spec = "http://foo.com"+port;
+      newURI = newURI.mutate().setSpec("http://foo.com"+port).finalize();
     }
     catch (e) {
       exception_threw = e.result == Cr.NS_ERROR_MALFORMED_URI;
diff --git a/netwerk/test/unit/test_bug660066.js b/netwerk/test/unit/test_bug660066.js
index 91856f7aafeb..635928d9515b 100644
--- a/netwerk/test/unit/test_bug660066.js
+++ b/netwerk/test/unit/test_bug660066.js
@@ -32,7 +32,7 @@ function run_test()
   do_check_uri_neq(simpleURI, fileDataURI);
 
   do_info("Changing the nsSimpleURI spec to match the nsFileDataURI");
-  simpleURI.spec = BLOBURI_SPEC;
+  simpleURI = simpleURI.mutate().setSpec(BLOBURI_SPEC).finalize();
 
   do_info("Verifying that .spec matches");
   Assert.equal(simpleURI.spec, fileDataURI.spec);
diff --git a/netwerk/test/unit/test_bug894586.js b/netwerk/test/unit/test_bug894586.js
index eef9b1470f4e..b02ebfa11c21 100644
--- a/netwerk/test/unit/test_bug894586.js
+++ b/netwerk/test/unit/test_bug894586.js
@@ -11,9 +11,10 @@ var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
                           .getService(Ci.nsIContentSecurityManager);
 
 function ProtocolHandler() {
-  this.uri = Cc["@mozilla.org/network/simple-uri;1"].
-               createInstance(Ci.nsIURI);
-  this.uri.spec = this.scheme + ":dummy";
+  this.uri = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec(this.scheme + ":dummy")
+               .finalize();
   this.uri.QueryInterface(Ci.nsIMutable).mutable = false;
 }
 
diff --git a/netwerk/test/unit/test_protocolproxyservice.js b/netwerk/test/unit/test_protocolproxyservice.js
index 05054f753d73..02b7d6e54eae 100644
--- a/netwerk/test/unit/test_protocolproxyservice.js
+++ b/netwerk/test/unit/test_protocolproxyservice.js
@@ -49,10 +49,10 @@ TestProtocolHandler.prototype = {
                  Components.interfaces.nsIProtocolHandler.ALLOWS_PROXY |
                  Components.interfaces.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD,
   newURI: function(spec, originCharset, baseURI) {
-    var uri = Components.classes["@mozilla.org/network/simple-uri;1"]
-                        .createInstance(Components.interfaces.nsIURI);
-    uri.spec = spec;
-    return uri;
+    return Components.classes["@mozilla.org/network/simple-uri-mutator;1"]
+                     .createInstance(Components.interfaces.nsIURIMutator)
+                     .setSpec(spec)
+                     .finalize();
   },
   newChannel2: function(uri, aLoadInfo) {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
diff --git a/netwerk/test/unit/test_standardurl.js b/netwerk/test/unit/test_standardurl.js
index 838fea88ae27..ea764e1bda58 100644
--- a/netwerk/test/unit/test_standardurl.js
+++ b/netwerk/test/unit/test_standardurl.js
@@ -218,8 +218,8 @@ add_test(function test_ipv6_fail()
 add_test(function test_clearedSpec()
 {
   var url = stringToURL("http://example.com/path");
-  Assert.throws(() => { url.spec = "http: example"; }, "set bad spec");
-  Assert.throws(() => { url.spec = ""; }, "set empty spec");
+  Assert.throws(() => { url = url.mutate().setSpec("http: example").finalize(); }, "set bad spec");
+  Assert.throws(() => { url = url.mutate().setSpec("").finalize(); }, "set empty spec");
   Assert.equal(url.spec, "http://example.com/path");
   url.host = "allizom.org";
 
@@ -359,9 +359,11 @@ add_test(function test_trim_C0_and_space()
 {
   var url = stringToURL("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f http://example.com/ \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ");
   Assert.equal(url.spec, "http://example.com/");
-  url.spec = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f http://test.com/ \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ";
+  url = url.mutate()
+           .setSpec("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f http://test.com/ \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ")
+           .finalize();
   Assert.equal(url.spec, "http://test.com/");
-  Assert.throws(() => { url.spec = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19 "; }, "set empty spec");
+  Assert.throws(() => { url = url.mutate().setSpec("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19 ").finalize(); }, "set empty spec");
   run_next_test();
 });
 
diff --git a/netwerk/test/unit/test_standardurl_port.js b/netwerk/test/unit/test_standardurl_port.js
index e7cb1dca5d80..a86f13132923 100644
--- a/netwerk/test/unit/test_standardurl_port.js
+++ b/netwerk/test/unit/test_standardurl_port.js
@@ -23,9 +23,9 @@ function run_test() {
   Assert.ok(!/80/.test(httpURI.spec));
 
   // URL parsers shouldn't set ports to default value (bug 407538)
-  httpURI.spec = "http://foo.com:81";
+  httpURI = httpURI.mutate().setSpec("http://foo.com:81").finalize();
   Assert.equal(81, httpURI.port);
-  httpURI.spec = "http://foo.com:80";
+  httpURI = httpURI.mutate().setSpec("http://foo.com:80").finalize();
   Assert.equal(-1, httpURI.port);
   Assert.ok(!/80/.test(httpURI.spec));
 
diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py
index 3ca0395709b9..39d333109b32 100644
--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
+++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
@@ -51,6 +51,9 @@ pushlog_api_url = "{0}/json-rev/{1}"
 ###
 def get_dt_from_hg(path):
     with mozversioncontrol.get_repository_object(path=path) as repo:
+        phase = repo._run_in_client(["log", "-r", ".", "-T" "{phase}"])
+        if phase.strip() != "public":
+            return datetime.datetime.utcnow()
         repo_url = repo._run_in_client(["paths", "default"])
         repo_url = repo_url.strip().replace("ssh://", "https://")
         repo_url = repo_url.replace("hg://", "https://")
diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 60a9a93bb2f2..ab78f1e0045b 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -804,7 +804,7 @@ class Schedules(object):
         self._inclusive = TypedList(Enum(*schedules.INCLUSIVE_COMPONENTS))()
         self._exclusive = ImmutableStrictOrderingOnAppendList(schedules.EXCLUSIVE_COMPONENTS)
 
-    # inclusive is mutable cannot be assigned to (+= only)
+    # inclusive is mutable but cannot be assigned to (+= only)
     @property
     def inclusive(self):
         return self._inclusive
@@ -815,9 +815,9 @@ class Schedules(object):
             raise AttributeError("Cannot assign to this value - use += instead")
         unexpected = [v for v in value if v not in schedules.INCLUSIVE_COMPONENTS]
         if unexpected:
-            raise Exception("unexpected exclusive component(s) " + ', '.join(unexpected))
+            raise Exception("unexpected inclusive component(s) " + ', '.join(unexpected))
 
-    # exclusive is immuntable but can be set (= only)
+    # exclusive is immutable but can be set (= only)
     @property
     def exclusive(self):
         return self._exclusive
@@ -836,6 +836,25 @@ class Schedules(object):
     def components(self):
         return list(sorted(set(self._inclusive) | set(self._exclusive)))
 
+    # The `Files` context uses | to combine SCHEDULES from multiple levels; at this
+    # point the immutability is no longer needed so we use plain lists
+    def __or__(self, other):
+        rv = Schedules()
+        rv._inclusive = self._inclusive + other._inclusive
+        if other._exclusive == self._exclusive:
+            rv._exclusive = self._exclusive
+        elif self._exclusive == schedules.EXCLUSIVE_COMPONENTS:
+            rv._exclusive = other._exclusive
+        elif other._exclusive == schedules.EXCLUSIVE_COMPONENTS:
+            rv._exclusive = self._exclusive
+        else:
+            msg = 'Two Files sections have set SCHEDULES.exclusive to different' \
+                'values; these cannot be combined: {} and {}'
+            msg = msg.format(self._exclusive, other._exclusive)
+            raise ValueError(msg)
+        return rv
+
+
 @memoize
 def ContextDerivedTypedHierarchicalStringList(type):
     """Specialized HierarchicalStringList for use with ContextDerivedValue
@@ -1086,6 +1105,10 @@ class Files(SubContext):
                 self.test_flavors |= set(v.flavors)
                 continue
 
+            if k == 'SCHEDULES' and 'SCHEDULES' in self:
+                self['SCHEDULES'] = self['SCHEDULES'] | v
+                continue
+
             # Ignore updates to finalized flags.
             if k in self.finalized:
                 continue
diff --git a/python/mozbuild/mozbuild/schedules.py b/python/mozbuild/mozbuild/schedules.py
index 3bc880de7567..15b67389f756 100644
--- a/python/mozbuild/mozbuild/schedules.py
+++ b/python/mozbuild/mozbuild/schedules.py
@@ -15,6 +15,11 @@ INCLUSIVE_COMPONENTS = [
     'py-lint',
     'js-lint',
     'yaml-lint',
+    # inclusive test suites -- these *only* run when certain files have changed
+    'jittest',
+    'test-verify',
+    'test-verify-wpt',
+    'jsreftest',
 ]
 INCLUSIVE_COMPONENTS = sorted(INCLUSIVE_COMPONENTS)
 
@@ -30,7 +35,6 @@ EXCLUSIVE_COMPONENTS = [
     'firefox-ui',
     'geckoview',
     'gtest',
-    'jittest',
     'marionette',
     'mochitest',
     'reftest',
diff --git a/python/mozbuild/mozbuild/test/frontend/data/schedules/moz.build b/python/mozbuild/mozbuild/test/frontend/data/schedules/moz.build
index d104c5290711..9ffce649969c 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/schedules/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/schedules/moz.build
@@ -7,5 +7,13 @@ with Files('*.win'):
 with Files('*.osx'):
     SCHEDULES.exclusive = ['macosx']
 
+with Files('bad.osx'):
+    # this conflicts with the previous clause and will cause an error
+    # when read
+    SCHEDULES.exclusive = ['macosx', 'windows']
+
 with Files('subd/**.py'):
     SCHEDULES.inclusive += ['py-lint']
+
+with Files('**/*.js'):
+    SCHEDULES.inclusive += ['js-lint']
diff --git a/python/mozbuild/mozbuild/test/frontend/data/schedules/subd/moz.build b/python/mozbuild/mozbuild/test/frontend/data/schedules/subd/moz.build
index d078a8e69db8..b2b4ef44543d 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/schedules/subd/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/schedules/subd/moz.build
@@ -1,2 +1,5 @@
 with Files('yaml.py'):
     SCHEDULES.inclusive += ['yaml-lint']
+
+with Files('win.js'):
+    SCHEDULES.exclusive = ['windows']
diff --git a/python/mozbuild/mozbuild/test/frontend/test_reader.py b/python/mozbuild/mozbuild/test/frontend/test_reader.py
index a6be6bd3b5ed..9f227fcc9f78 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_reader.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_reader.py
@@ -483,7 +483,14 @@ class TestBuildReader(unittest.TestCase):
 
     def test_schedules(self):
         reader = self.reader('schedules')
-        info = reader.files_info(['somefile', 'foo.win', 'foo.osx', 'subd/aa.py', 'subd/yaml.py'])
+        info = reader.files_info([
+            'somefile',
+            'foo.win',
+            'foo.osx',
+            'subd/aa.py',
+            'subd/yaml.py',
+            'subd/win.js',
+        ])
         # default: all exclusive, no inclusive
         self.assertEqual(info['somefile']['SCHEDULES'].inclusive, [])
         self.assertEqual(info['somefile']['SCHEDULES'].exclusive, schedules.EXCLUSIVE_COMPONENTS)
@@ -496,12 +503,23 @@ class TestBuildReader(unittest.TestCase):
         # top-level moz.build specifies subd/**.py with an inclusive option
         self.assertEqual(info['subd/aa.py']['SCHEDULES'].inclusive, ['py-lint'])
         self.assertEqual(info['subd/aa.py']['SCHEDULES'].exclusive, schedules.EXCLUSIVE_COMPONENTS)
-        # Files('yaml.py') in subd/moz.build *overrides* Files('subdir/**.py')
-        self.assertEqual(info['subd/yaml.py']['SCHEDULES'].inclusive, ['yaml-lint'])
+        # Files('yaml.py') in subd/moz.build combines with Files('subdir/**.py')
+        self.assertEqual(info['subd/yaml.py']['SCHEDULES'].inclusive, ['py-lint', 'yaml-lint'])
         self.assertEqual(info['subd/yaml.py']['SCHEDULES'].exclusive, schedules.EXCLUSIVE_COMPONENTS)
+        # .. but exlusive does not override inclusive
+        self.assertEqual(info['subd/win.js']['SCHEDULES'].inclusive, ['js-lint'])
+        self.assertEqual(info['subd/win.js']['SCHEDULES'].exclusive, ['windows'])
 
         self.assertEqual(set(info['subd/yaml.py']['SCHEDULES'].components),
-                         set(schedules.EXCLUSIVE_COMPONENTS + ['yaml-lint']))
+                         set(schedules.EXCLUSIVE_COMPONENTS + ['py-lint', 'yaml-lint']))
+
+    def test_schedules_conflicting_excludes(self):
+        reader = self.reader('schedules')
+
+        # bad.osx is defined explicitly, and matches *.osx, and the two have
+        # conflicting SCHEDULES.exclusive settings
+        with self.assertRaisesRegexp(ValueError, r"Two Files sections"):
+            reader.files_info(['bad.osx'])
 
 if __name__ == '__main__':
     main()
diff --git a/servo/components/script/dom/domimplementation.rs b/servo/components/script/dom/domimplementation.rs
index b81f9284b4ab..c25908e67a70 100644
--- a/servo/components/script/dom/domimplementation.rs
+++ b/servo/components/script/dom/domimplementation.rs
@@ -114,7 +114,7 @@ impl DOMImplementationMethods for DOMImplementation {
         }
 
         // Step 6.
-        // FIXME: https://github.com/mozilla/servo/issues/1522
+        // The origin is already set
 
         // Step 7.
         Ok(doc)
@@ -183,7 +183,7 @@ impl DOMImplementationMethods for DOMImplementation {
         }
 
         // Step 8.
-        // FIXME: https://github.com/mozilla/servo/issues/1522
+        // The origin is already set
 
         // Step 9.
         doc
diff --git a/servo/components/script/dom/domparser.rs b/servo/components/script/dom/domparser.rs
index 00c18541a9b5..c0de086569ac 100644
--- a/servo/components/script/dom/domparser.rs
+++ b/servo/components/script/dom/domparser.rs
@@ -77,7 +77,6 @@ impl DOMParserMethods for DOMParser {
                 Ok(document)
             }
             Text_xml | Application_xml | Application_xhtml_xml => {
-                // FIXME: this should probably be FromParser when we actually parse the string (#3756).
                 let document = Document::new(&self.window,
                                              HasBrowsingContext::No,
                                              Some(url.clone()),
@@ -86,12 +85,13 @@ impl DOMParserMethods for DOMParser {
                                              Some(content_type),
                                              None,
                                              DocumentActivity::Inactive,
-                                             DocumentSource::NotFromParser,
+                                             DocumentSource::FromParser,
                                              loader,
                                              None,
                                              None,
                                              Default::default());
                 ServoParser::parse_xml_document(&document, s, url);
+                document.set_ready_state(DocumentReadyState::Complete);
                 Ok(document)
             }
         }
diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index afbe6c9bce13..c0aa442ca654 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -75,10 +75,6 @@ jittest:
                 windows.*: false
                 macosx.*: false
                 default: true
-    when:
-        files-changed:
-            - js/src/**
-            - js/public/**
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
index 5975b94f0240..2bcf172c4440 100644
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -54,7 +54,7 @@ telemetry-tests-client:
 
 test-verify:
     description: "Extra verification of tests modified on this push"
-    suite: test-verification
+    suite: test-verify
     treeherder-symbol: tc(TV)
     loopback-video: true
     instance-size:
@@ -92,9 +92,3 @@ test-verify:
         no-read-buildbot-config: true
         extra-options:
             - --verify
-    when:
-        files-changed:
-            - '**/*.js'
-            - '**/*.html'
-            - '**/*.xhtml'
-            - '**/*.xul'
diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
index 6719c0101f67..6540ea5026a0 100644
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -75,10 +75,6 @@ jsreftest:
         by-test-platform:
             android.*: 7200
             default: 3600
-    when:
-        files-changed:
-            - js/src/**
-            - js/public/**
     tier:
         by-test-platform:
             linux64-qr/.*: 1
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 4b680bc99b4c..efa136164d30 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -144,6 +144,3 @@ test-verify-wpt:
     mozharness:
         extra-options:
             - --verify
-    when:
-        files-changed:
-            - 'testing/web-platform/tests/**'
diff --git a/taskcluster/docs/optimization-process.rst b/taskcluster/docs/optimization-process.rst
new file mode 100644
index 000000000000..c9dd20647a49
--- /dev/null
+++ b/taskcluster/docs/optimization-process.rst
@@ -0,0 +1,75 @@
+Optimization Process
+====================
+
+Optimization proceeds in three phases: removing tasks, replacing tasks,
+and finally generating a subgraph containing only the remaining tasks.
+
+Assume the following task graph as context for these examples::
+
+    TC1 <--\     ,- UP1
+          , B1 <--- T1a
+    I1 <-|       `- T1b
+          ` B2 <--- T2a
+    TC2 <--/     |- T2b
+                 `- UP2
+
+Removing Tasks
+--------------
+
+This phase begins with tasks on which nothing depends and follows the
+dependency graph backward from there -- right to left in the diagram above. If
+a task is not removed, then nothing it depends on will be removed either.
+Thus if T1a and T1b are both removed, B1 may be removed as well. But if T2b is
+not removed, then B2 may not be removed either.
+
+For each task with no remaining dependencies, the decision whether to remove is
+made by calling the optimization strategy's ``should_remove_task`` method. If
+this method returns True, the task is removed.
+
+The optimization process takes a ``do_not_optimize`` argument containing a list
+of tasks that cannot be removed under any circumstances. This is used to
+"force" running specific tasks.
+
+Replacing Tasks
+---------------
+
+This phase begins with tasks having no dependencies and follows the reversed
+dependency graph from there -- left to right in the diagram above. If a task is
+not replaced, then anything depending on that task cannot be replaced.
+Replacement is generally done on the basis of some hash of the inputs to the
+task. In the diagram above, if both TC1 and I1 are replaced with existing
+tasks, then B1 is a candidate for replacement. But if TC2 has no replacement,
+then replacement of B2 will not be considered.
+
+It is possible to replace a task with nothing.  This is similar to optimzing
+away, but is useful for utility tasks like UP1. If such a task is considered
+for replacement, then all of its dependencies (here, B1) have already been
+replaced and there is no utility in running the task and no need for a
+replacement task.  It is an error for a task on which others depend to be
+replaced with nothing.
+
+The ``do_not_optimize`` set applies to task replacement, as does an additional
+``existing_tasks`` dictionary which allows the caller to supply as set of
+known, pre-existing tasks. This is used for action tasks, for example, where it
+contains the entire task-graph generated by the original decision task.
+
+Subgraph Generation
+-------------------
+
+The first two phases annotate each task in the existing taskgraph with their
+fate: removed, replaced, or retained. The tasks that are replaced also have a
+replacement taskId.
+
+The last phase constructs a subgraph containing the retained tasks, and
+simultaneously rewrites all dependencies to refer to taskIds instead of labels.
+To do so, it assigns a taskId to each retained task and uses the replacement
+taskId for all replaced tasks.
+
+The result is an optimized taskgraph with tasks named by taskId instead of
+label. At this phase, the edges in the task graph diverge from the
+``task.dependencies`` attributes, as the latter may contain dependencies
+outside of the taskgraph (for replacement tasks).
+
+As a side-effect, this phase also expands all ``{"task-reference": ".."}``
+objects within the task definitions.
+
diff --git a/taskcluster/docs/optimization-schedules.rst b/taskcluster/docs/optimization-schedules.rst
new file mode 100644
index 000000000000..47e500a2e389
--- /dev/null
+++ b/taskcluster/docs/optimization-schedules.rst
@@ -0,0 +1,89 @@
+Optimization and SCHEDULES
+==========================
+
+Most optimization of builds and tests is handled with ``SCHEDULES``.
+The concept is this: we allocate tasks into named components, and associate a set of such components to each file in the source tree.
+Given a set of files changed in a push, we then calculate the union of components affected by each file, and remove tasks that are not tagged with any of them.
+
+This optimization system is intended to be *conservative*.
+It represents what could *possibly* be affected, rather than any intuitive notion of what tasks would be useful to run for changes to a particular file.
+For example:
+
+* ``dom/url/URL.cpp`` schedules tasks on all platform and could potentially cause failures in any test suite
+
+* ``dom/system/mac/CoreLocationLocationProvider.mm`` could not possibly affect any platform but ``macosx``, but potentially any test suite
+
+* ``python/mozbuild/mozbuild/preprocessor.py`` could possibly affect any platform, and should also schedule Python lint tasks
+
+Exclusive and Inclusive
+-----------------------
+
+The first wrinkle in this "simple" plan is that there are a lot of files, and for the most part they all affect most components.
+But there are some components which are only affected by a well-defined set of files.
+For example, a Python lint component need only be scheduled when Python files are changed.
+
+We divide the components into "exclusive" and "inclusive" components.
+Absent any other configuration, any file in the repository is assumed to affect all of the exclusive components and none of the inclusive components.
+
+Exclusive components can be thought of as a series of families.
+For example, the platform (linux, windows, macosx, android) is a component family.
+The test suite (mochitest, reftest, xpcshell, etc.) is another.
+By default, source files are associated with every component in every family.
+This means tasks tagged with an exclusive component will *always* run, unless none of the modified source files are associated with that component.
+
+But what if we only want to run a particular task when a pre-determined file is modified?
+This is where inclusive components are used.
+Any task tagged with an inclusive component will *only* be run when a source file associated with that component is modified.
+Lint tasks and well separated unittest tasks are good examples of things you might want to schedule inclusively.
+
+A good way to keep this straight is to think of exclusive platform-family components (``macosx``, ``android``, ``windows``, ``linux``) and inclusive linting components (``py-lint``, ``js-lint``).
+An arbitrary file in the repository affects all platform families, but does not necessarily require a lint run.
+But we can configure mac-only files such as ``CoreLocationLocationProvider.mm`` to affect exclusively ``macosx``, and Python files like ``preprocessor.py`` to affect ``py-lint`` in addition to the exclusive components.
+
+It is also possible to define a file as affecting an inclusive component and nothing else.
+For example, the source code and configuration for the Python linting tasks does not affect any tasks other than linting.
+
+.. note:
+
+    Most unit test suite tasks are allocated to components for their platform family and for the test suite.
+    This indicates that if a platform family is affected (for example, ``android``) then the builds for that platform should execute as well as the full test suite.
+    If only a single suite is affected (for example, by a change to a reftest source file), then the reftests should execute for all platforms.
+
+    However, some test suites, for which the set of contributing files are well-defined, are represented as inclusive components.
+    These components will not be executed by default for any platform families, but only when one or more of the contributing files are changed.
+
+Specification
+-------------
+
+Components are defined as either inclusive or exclusive in :py:mod:`mozbuild.schedules`.
+
+File Annotation
+:::::::::::::::
+
+Files are annotated with their affected components in ``moz.build`` files with stanzas like ::
+
+    
+    with Files('**/*.py'):
+        SCHEDULES.inclusive += ['py-lint']
+
+for inclusive components and ::
+
+    with Files('*gradle*'):
+        SCHEDULES.exclusive = ['android']
+
+for exclusive components.
+Note the use of ``+=`` for inclusive compoenents (as this is adding to the existing set of affected components) but ``=`` for exclusive components (as this is resetting the affected set to something smaller).
+For cases where an inclusive component is affected exclusively (such as the python-lint configuration in the example above), that component can be assigned to ``SCHEDULES.exclusive``::
+
+    with Files('**/pep8rc'):
+        SCHEDULES.exclusive = ['py-lint']
+
+Task Annotation
+:::::::::::::::
+
+Tasks are annotated with the components they belong to using the ``"skip-unless-schedules"`` optimization, which takes a list of components for this task::
+
+    task['optimization'] = {'skip-unless-schedules': ['windows', 'gtest']}
+
+For tests, this value is set automatically by the test transform based on the suite name and the platform family, doing the correct thing for inclusive test suites.
+Tests also use SETA via ``"skip-unless-schedules-or-seta"``, which skips a task if it is not affected *or* if SETA deems it unimportant.
diff --git a/taskcluster/docs/optimization.rst b/taskcluster/docs/optimization.rst
index 394e96f18b04..e6c705116f31 100644
--- a/taskcluster/docs/optimization.rst
+++ b/taskcluster/docs/optimization.rst
@@ -43,77 +43,10 @@ considered for optimization. This behavior is controlled with the
     requested jobs are optimized away.  If those jobs were actually necessary,
     then a try push with ``try_task_config.json`` is the solution.
 
-Optimization Process
---------------------
+More Information
+----------------
 
-Optimization proceeds in three phases: removing tasks, replacing tasks,
-and finally generating a subgraph containing only the remaining tasks.
+.. toctree::
 
-Assume the following task graph as context for these examples::
-
-    TC1 <--\     ,- UP1
-          , B1 <--- T1a
-    I1 <-|       `- T1b
-          ` B2 <--- T2a
-    TC2 <--/     |- T2b
-                 `- UP2
-
-Removing Tasks
-::::::::::::::
-
-This phase begins with tasks on which nothing depends and follows the
-dependency graph backward from there -- right to left in the diagram above. If
-a task is not removed, then nothing it depends on will be removed either.
-Thus if T1a and T1b are both removed, B1 may be removed as well. But if T2b is
-not removed, then B2 may not be removed either.
-
-For each task with no remaining dependencies, the decision whether to remove is
-made by calling the optimization strategy's ``should_remove_task`` method. If
-this method returns True, the task is removed.
-
-The optimization process takes a ``do_not_optimize`` argument containing a list
-of tasks that cannot be removed under any circumstances. This is used to
-"force" running specific tasks.
-
-Replacing Tasks
-:::::::::::::::
-
-This phase begins with tasks having no dependencies and follows the reversed
-dependency graph from there -- left to right in the diagram above. If a task is
-not replaced, then anything depending on that task cannot be replaced.
-Replacement is generally done on the basis of some hash of the inputs to the
-task. In the diagram above, if both TC1 and I1 are replaced with existing
-tasks, then B1 is a candidate for replacement. But if TC2 has no replacement,
-then replacement of B2 will not be considered.
-
-It is possible to replace a task with nothing.  This is similar to optimzing
-away, but is useful for utility tasks like UP1. If such a task is considered
-for replacement, then all of its dependencies (here, B1) have already been
-replaced and there is no utility in running the task and no need for a
-replacement task.  It is an error for a task on which others depend to be
-replaced with nothing.
-
-The ``do_not_optimize`` set applies to task replacement, as does an additional
-``existing_tasks`` dictionary which allows the caller to supply as set of
-known, pre-existing tasks. This is used for action tasks, for example, where it
-contains the entire task-graph generated by the original decision task.
-
-Subgraph Generation
-:::::::::::::::::::
-
-The first two phases annotate each task in the existing taskgraph with their
-fate: removed, replaced, or retained. The tasks that are replaced also have a
-replacement taskId.
-
-The last phase constructs a subgraph containing the retained tasks, and
-simultaneously rewrites all dependencies to refer to taskIds instead of labels.
-To do so, it assigns a taskId to each retained task and uses the replacement
-taskId for all replaced tasks.
-
-The result is an optimized taskgraph with tasks named by taskId instead of
-label. At this phase, the edges in the task graph diverge from the
-``task.dependencies`` attributes, as the latter may contain dependencies
-outside of the taskgraph (for replacement tasks).
-
-As a side-effect, this phase also expands all ``{"task-reference": ".."}``
-objects within the task definitions.
+    optimization-process
+    optimization-schedules
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index 99d8b7d99757..e929472e693d 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -378,11 +378,6 @@ test_description_schema = Schema({
     # the product name, defaults to firefox
     Optional('product'): basestring,
 
-    # conditional files to determine when these tests should be run
-    Optional('when'): Any({
-        Optional('files-changed'): [basestring],
-    }),
-
     Optional('worker-type'): optionally_keyed_by(
         'test-platform',
         Any(basestring, None),
@@ -671,7 +666,7 @@ def handle_suite_category(config, tests):
 
         script = test['mozharness']['script']
         category_arg = None
-        if suite == 'test-verification':
+        if suite == 'test-verify':
             pass
         elif script == 'android_emulator_unittest.py':
             category_arg = '--test-suite'
@@ -694,7 +689,6 @@ def enable_code_coverage(config, tests):
     for test in tests:
         if 'ccov' in test['build-platform'] and not test['test-name'].startswith('test-verify'):
             test['mozharness'].setdefault('extra-options', []).append('--code-coverage')
-            test['when'] = {}
             test['instance-size'] = 'xlarge'
             # Ensure we don't run on inbound/autoland/beta, but if the test is try only, ignore it
             if 'mozilla-central' in test['run-on-projects'] or \
@@ -1008,24 +1002,21 @@ def make_job_description(config, tests):
             'platform': test.get('treeherder-machine-platform', test['build-platform']),
         }
 
-        if test.get('when'):
-            jobdesc['when'] = test['when']
+        suite = attributes['unittest_suite']
+        if suite in INCLUSIVE_COMPONENTS:
+            # if this is an "inclusive" test, then all files which might
+            # cause it to run are annotated with SCHEDULES in moz.build,
+            # so do not include the platform or any other components here
+            schedules = [suite]
         else:
-            suite = attributes['unittest_suite']
-            if suite in INCLUSIVE_COMPONENTS:
-                # if this is an "inclusive" test, then all files which might
-                # cause it to run are annotated with SCHEDULES in moz.build,
-                # so do not include the platform or any other components here
-                schedules = [suite]
-            else:
-                schedules = [suite, platform_family(test['build-platform'])]
+            schedules = [suite, platform_family(test['build-platform'])]
 
-            if config.params['project'] != 'try':
-                # for non-try branches, include SETA
-                jobdesc['optimization'] = {'skip-unless-schedules-or-seta': schedules}
-            else:
-                # otherwise just use skip-unless-schedules
-                jobdesc['optimization'] = {'skip-unless-schedules': schedules}
+        if config.params['project'] != 'try':
+            # for non-try branches, include SETA
+            jobdesc['optimization'] = {'skip-unless-schedules-or-seta': schedules}
+        else:
+            # otherwise just use skip-unless-schedules
+            jobdesc['optimization'] = {'skip-unless-schedules': schedules}
 
         run = jobdesc['run'] = {}
         run['using'] = 'mozharness-test'
diff --git a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
index 299497e15707..4d770b79af24 100644
--- a/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
+++ b/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
@@ -95,9 +95,10 @@ function starttest(){
   // Try some basic stuff with XHR.
   var xhr2 = SpecialPowers.Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(SpecialPowers.Ci.nsIXMLHttpRequest);
   is(xhr2.readyState, XMLHttpRequest.UNSENT, "Should be able to get props off privileged objects");
-  var testURI = SpecialPowers.Cc['@mozilla.org/network/standard-url;1']
-                                              .createInstance(SpecialPowers.Ci.nsIURI);
-  testURI.spec = "http://www.foobar.org/";
+  var testURI = SpecialPowers.Cc['@mozilla.org/network/standard-url-mutator;1']
+                             .createInstance(SpecialPowers.Ci.nsIURIMutator)
+                             .setSpec("http://www.foobar.org/")
+                             .finalize();
   is(testURI.spec, "http://www.foobar.org/", "Getters/Setters should work correctly");
   is(SpecialPowers.wrap(document).getElementsByTagName('details').length, 0, "Should work with proxy-based DOM bindings.");
 
diff --git a/testing/web-platform/moz.build b/testing/web-platform/moz.build
index d7309c107aa7..4422a1961365 100644
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -99,6 +99,10 @@ with Files("*.py"):
 with Files("tests/*.md"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
+with Files("tests/**"):
+    BUG_COMPONENT = ("Testing", "web-platform-tests")
+    SCHEDULES.inclusive += ['test-verify-wpt']
+
 with Files("tests/LICENSE"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
diff --git a/third_party/python/blessings/MANIFEST.in b/third_party/python/blessings/MANIFEST.in
deleted file mode 100644
index 3f4fbd708437..000000000000
--- a/third_party/python/blessings/MANIFEST.in
+++ /dev/null
@@ -1,3 +0,0 @@
-include README.rst
-include LICENSE
-include tox.ini
diff --git a/third_party/python/blessings/PKG-INFO b/third_party/python/blessings/PKG-INFO
deleted file mode 100644
index c52ca3cf917e..000000000000
--- a/third_party/python/blessings/PKG-INFO
+++ /dev/null
@@ -1,426 +0,0 @@
-Metadata-Version: 1.0
-Name: blessings
-Version: 1.3
-Summary: A thin, practical wrapper around terminal formatting, positioning, and more
-Home-page: https://github.com/erikrose/blessings
-Author: Erik Rose
-Author-email: erikrose@grinchcentral.com
-License: MIT
-Description: =========
-        Blessings
-        =========
-        
-        Coding with Blessings looks like this... ::
-        
-            from blessings import Terminal
-        
-            t = Terminal()
-        
-            print t.bold('Hi there!')
-            print t.bold_red_on_bright_green('It hurts my eyes!')
-        
-            with t.location(0, t.height - 1):
-                print 'This is at the bottom.'
-        
-        Or, for byte-level control, you can drop down and play with raw terminal
-        capabilities::
-        
-            print '{t.bold}All your {t.red}bold and red base{t.normal}'.format(t=t)
-            print t.wingo(2)
-        
-        The Pitch
-        =========
-        
-        Blessings lifts several of curses_' limiting assumptions, and it makes your
-        code pretty, too:
-        
-        * Use styles, color, and maybe a little positioning without clearing the whole
-          screen first.
-        * Leave more than one screenful of scrollback in the buffer after your program
-          exits, like a well-behaved command-line app should.
-        * Get rid of all those noisy, C-like calls to ``tigetstr`` and ``tparm``, so
-          your code doesn't get crowded out by terminal bookkeeping.
-        * Act intelligently when somebody redirects your output to a file, omitting the
-          terminal control codes the user doesn't want to see (optional).
-        
-        .. _curses: http://docs.python.org/library/curses.html
-        
-        Before And After
-        ----------------
-        
-        Without Blessings, this is how you'd print some underlined text at the bottom
-        of the screen::
-        
-            from curses import tigetstr, setupterm, tparm
-            from fcntl import ioctl
-            from os import isatty
-            import struct
-            import sys
-            from termios import TIOCGWINSZ
-        
-            # If we want to tolerate having our output piped to other commands or
-            # files without crashing, we need to do all this branching:
-            if hasattr(sys.stdout, 'fileno') and isatty(sys.stdout.fileno()):
-                setupterm()
-                sc = tigetstr('sc')
-                cup = tigetstr('cup')
-                rc = tigetstr('rc')
-                underline = tigetstr('smul')
-                normal = tigetstr('sgr0')
-            else:
-                sc = cup = rc = underline = normal = ''
-            print sc  # Save cursor position.
-            if cup:
-                # tigetnum('lines') doesn't always update promptly, hence this:
-                height = struct.unpack('hhhh', ioctl(0, TIOCGWINSZ, '\000' * 8))[0]
-                print tparm(cup, height - 1, 0)  # Move cursor to bottom.
-            print 'This is {under}underlined{normal}!'.format(under=underline,
-                                                              normal=normal)
-            print rc  # Restore cursor position.
-        
-        Phew! That was long and full of incomprehensible trash! Let's try it again,
-        this time with Blessings::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            with term.location(0, term.height - 1):
-                print 'This is', term.underline('pretty!')
-        
-        Much better.
-        
-        What It Provides
-        ================
-        
-        Blessings provides just one top-level object: ``Terminal``. Instantiating a
-        ``Terminal`` figures out whether you're on a terminal at all and, if so, does
-        any necessary terminal setup. After that, you can proceed to ask it all sorts
-        of things about the terminal. Terminal terminal terminal.
-        
-        Simple Formatting
-        -----------------
-        
-        Lots of handy formatting codes ("capabilities" in low-level parlance) are
-        available as attributes on a ``Terminal``. For example::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            print 'I am ' + term.bold + 'bold' + term.normal + '!'
-        
-        You can also use them as wrappers so you don't have to say ``normal``
-        afterward::
-        
-            print 'I am', term.bold('bold') + '!'
-        
-        Or, if you want fine-grained control while maintaining some semblance of
-        brevity, you can combine it with Python's string formatting, which makes
-        attributes easy to access::
-        
-            print 'All your {t.red}base {t.underline}are belong to us{t.normal}'.format(t=term)
-        
-        Simple capabilities of interest include...
-        
-        * ``bold``
-        * ``reverse``
-        * ``underline``
-        * ``no_underline`` (which turns off underlining)
-        * ``blink``
-        * ``normal`` (which turns off everything, even colors)
-        * ``clear_eol`` (clear to the end of the line)
-        * ``clear_bol`` (clear to beginning of line)
-        * ``clear_eos`` (clear to end of screen)
-        
-        Here are a few more which are less likely to work on all terminals:
-        
-        * ``dim``
-        * ``italic`` and ``no_italic``
-        * ``shadow`` and ``no_shadow``
-        * ``standout`` and ``no_standout``
-        * ``subscript`` and ``no_subscript``
-        * ``superscript`` and ``no_superscript``
-        * ``flash`` (which flashes the screen once)
-        
-        Note that, while the inverse of ``underline`` is ``no_underline``, the only way
-        to turn off ``bold`` or ``reverse`` is ``normal``, which also cancels any
-        custom colors. This is because there's no way to tell the terminal to undo
-        certain pieces of formatting, even at the lowest level.
-        
-        You might notice that the above aren't the typical incomprehensible terminfo
-        capability names; we alias a few of the harder-to-remember ones for
-        readability. However, you aren't limited to these: you can reference any
-        string-returning capability listed on the `terminfo man page`_ by the name
-        under the "Cap-name" column: for example, ``term.rum``.
-        
-        .. _`terminfo man page`: http://www.manpagez.com/man/5/terminfo/
-        
-        Color
-        -----
-        
-        16 colors, both foreground and background, are available as easy-to-remember
-        attributes::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            print term.red + term.on_green + 'Red on green? Ick!' + term.normal
-            print term.bright_red + term.on_bright_blue + 'This is even worse!' + term.normal
-        
-        You can also call them as wrappers, which sets everything back to normal at the
-        end::
-        
-            print term.red_on_green('Red on green? Ick!')
-            print term.yellow('I can barely see it.')
-        
-        The available colors are...
-        
-        * ``black``
-        * ``red``
-        * ``green``
-        * ``yellow``
-        * ``blue``
-        * ``magenta``
-        * ``cyan``
-        * ``white``
-        
-        You can set the background color instead of the foreground by prepending
-        ``on_``, as in ``on_blue``. There is also a ``bright`` version of each color:
-        for example, ``on_bright_blue``.
-        
-        There is also a numerical interface to colors, which takes an integer from
-        0-15::
-        
-            term.color(5) + 'Hello' + term.normal
-            term.on_color(3) + 'Hello' + term.normal
-        
-            term.color(5)('Hello')
-            term.on_color(3)('Hello')
-        
-        If some color is unsupported (for instance, if only the normal colors are
-        available, not the bright ones), trying to use it will, on most terminals, have
-        no effect: the foreground and background colors will stay as they were. You can
-        get fancy and do different things depending on the supported colors by checking
-        `number_of_colors`_.
-        
-        .. _`number_of_colors`: http://packages.python.org/blessings/#blessings.Terminal.number_of_colors
-        
-        Compound Formatting
-        -------------------
-        
-        If you want to do lots of crazy formatting all at once, you can just mash it
-        all together::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            print term.bold_underline_green_on_yellow + 'Woo' + term.normal
-        
-        Or you can use your newly coined attribute as a wrapper, which implicitly sets
-        everything back to normal afterward::
-        
-            print term.bold_underline_green_on_yellow('Woo')
-        
-        This compound notation comes in handy if you want to allow users to customize
-        the formatting of your app: just have them pass in a format specifier like
-        "bold_green" on the command line, and do a quick ``getattr(term,
-        that_option)('Your text')`` when you do your formatting.
-        
-        I'd be remiss if I didn't credit couleur_, where I probably got the idea for
-        all this mashing.
-        
-        .. _couleur: http://pypi.python.org/pypi/couleur
-        
-        Parametrized Capabilities
-        -------------------------
-        
-        Some capabilities take parameters. Rather than making you dig up ``tparm()``
-        all the time, we simply make such capabilities into callable strings. You can
-        pass the parameters right in::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            print term.move(10, 1)
-        
-        Here are some of interest:
-        
-        ``move``
-          Position the cursor elsewhere. Parameters are y coordinate, then x
-          coordinate.
-        ``move_x``
-          Move the cursor to the given column.
-        ``move_y``
-          Move the cursor to the given row.
-        
-        You can also reference any other string-returning capability listed on the
-        `terminfo man page`_ by its name under the "Cap-name" column.
-        
-        .. _`terminfo man page`: http://www.manpagez.com/man/5/terminfo/
-        
-        Height and Width
-        ----------------
-        
-        It's simple to get the height and width of the terminal, in characters::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            height = term.height
-            width = term.width
-        
-        These are newly updated each time you ask for them, so they're safe to use from
-        SIGWINCH handlers.
-        
-        Temporary Repositioning
-        -----------------------
-        
-        Sometimes you need to flit to a certain location, print something, and then
-        return: for example, when updating a progress bar at the bottom of the screen.
-        ``Terminal`` provides a context manager for doing this concisely::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            with term.location(0, term.height - 1):
-                print 'Here is the bottom.'
-            print 'This is back where I came from.'
-        
-        Parameters to ``location()`` are ``x`` and then ``y``, but you can also pass
-        just one of them, leaving the other alone. For example... ::
-        
-            with term.location(y=10):
-                print 'We changed just the row.'
-        
-        If you want to reposition permanently, see ``move``, in an example above.
-        
-        Pipe Savvy
-        ----------
-        
-        If your program isn't attached to a terminal, like if it's being piped to
-        another command or redirected to a file, all the capability attributes on
-        ``Terminal`` will return empty strings. You'll get a nice-looking file without
-        any formatting codes gumming up the works.
-        
-        If you want to override this--like if you anticipate your program being piped
-        through ``less -r``, which handles terminal escapes just fine--pass
-        ``force_styling=True`` to the ``Terminal`` constructor.
-        
-        In any case, there is an ``is_a_tty`` attribute on ``Terminal`` that lets you
-        see whether the attached stream seems to be a terminal. If it's false, you
-        might refrain from drawing progress bars and other frippery, since you're
-        apparently headed into a pipe::
-        
-            from blessings import Terminal
-        
-            term = Terminal()
-            if term.is_a_tty:
-                with term.location(0, term.height - 1):
-                    print 'Progress: [=======>   ]'
-            print term.bold('Important stuff')
-        
-        Shopping List
-        =============
-        
-        There are decades of legacy tied up in terminal interaction, so attention to
-        detail and behavior in edge cases make a difference. Here are some ways
-        Blessings has your back:
-        
-        * Uses the terminfo database so it works with any terminal type
-        * Provides up-to-the-moment terminal height and width, so you can respond to
-          terminal size changes (SIGWINCH signals). (Most other libraries query the
-          ``COLUMNS`` and ``LINES`` environment variables or the ``cols`` or ``lines``
-          terminal capabilities, which don't update promptly, if at all.)
-        * Avoids making a mess if the output gets piped to a non-terminal
-        * Works great with standard Python string templating
-        * Provides convenient access to all terminal capabilities, not just a sugared
-          few
-        * Outputs to any file-like object, not just stdout
-        * Keeps a minimum of internal state, so you can feel free to mix and match with
-          calls to curses or whatever other terminal libraries you like
-        
-        Blessings does not provide...
-        
-        * Native color support on the Windows command prompt. However, it should work
-          when used in concert with colorama_.
-        
-        .. _colorama: http://pypi.python.org/pypi/colorama/0.2.4
-        
-        Bugs
-        ====
-        
-        Bugs or suggestions? Visit the `issue tracker`_.
-        
-        .. _`issue tracker`: https://github.com/erikrose/blessings/issues/new
-        
-        License
-        =======
-        
-        Blessings is under the MIT License. See the LICENSE file.
-        
-        Version History
-        ===============
-        
-        1.3
-          * Add ``number_of_colors``, which tells you how many colors the terminal
-            supports.
-          * Made ``color(n)`` and ``on_color(n)`` callable to wrap a string, like the
-            named colors can. Also, make them both fall back to the ``setf`` and
-            ``setb`` capabilities (like the named colors do) if the ANSI ``setaf`` and
-            ``setab`` aren't available.
-          * Allow ``color`` attr to act as an unparametrized string, not just a
-            callable.
-          * Make ``height`` and ``width`` examine any passed-in stream before falling
-            back to stdout. (This rarely if ever affects actual behavior; it's mostly
-            philosophical.)
-          * Make caching simpler and slightly more efficient.
-          * Get rid of a reference cycle between Terminals and FormattingStrings.
-          * Update docs to reflect that terminal addressing (as in ``location()``) is
-            0-based.
-        
-        1.2
-          * Added support for Python 3! We need 3.2.3 or greater, because the curses
-            library couldn't decide whether to accept strs or bytes before that
-            (http://bugs.python.org/issue10570).
-          * Everything that comes out of the library is now unicode. This lets us
-            support Python 3 without making a mess of the code, and Python 2 should
-            continue to work unless you were testing types (and badly). Please file a
-            bug if this causes trouble for you.
-          * Changed to the MIT License for better world domination.
-          * Added Sphinx docs.
-        
-        1.1
-          * Added nicely named attributes for colors.
-          * Introduced compound formatting.
-          * Added wrapper behavior for styling and colors.
-          * Let you force capabilities to be non-empty, even if the output stream is
-            not a terminal.
-          * Added the ``is_a_tty`` attribute for telling whether the output stream is a
-            terminal.
-          * Sugared the remaining interesting string capabilities.
-          * Let ``location()`` operate on just an x *or* y coordinate.
-        
-        1.0
-          * Extracted Blessings from nose-progressive, my `progress-bar-having,
-            traceback-shortcutting, rootin', tootin' testrunner`_. It provided the
-            tootin' functionality.
-        
-        .. _`progress-bar-having, traceback-shortcutting, rootin', tootin' testrunner`: http://pypi.python.org/pypi/nose-progressive/
-        
-Keywords: terminal,tty,curses,ncurses,formatting,style,color,console
-Platform: UNKNOWN
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Environment :: Console :: Curses
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.5
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: User Interfaces
-Classifier: Topic :: Terminals
diff --git a/third_party/python/blessings/README.rst b/third_party/python/blessings/README.rst
deleted file mode 100644
index 59983de8600b..000000000000
--- a/third_party/python/blessings/README.rst
+++ /dev/null
@@ -1,399 +0,0 @@
-=========
-Blessings
-=========
-
-Coding with Blessings looks like this... ::
-
-    from blessings import Terminal
-
-    t = Terminal()
-
-    print t.bold('Hi there!')
-    print t.bold_red_on_bright_green('It hurts my eyes!')
-
-    with t.location(0, t.height - 1):
-        print 'This is at the bottom.'
-
-Or, for byte-level control, you can drop down and play with raw terminal
-capabilities::
-
-    print '{t.bold}All your {t.red}bold and red base{t.normal}'.format(t=t)
-    print t.wingo(2)
-
-The Pitch
-=========
-
-Blessings lifts several of curses_' limiting assumptions, and it makes your
-code pretty, too:
-
-* Use styles, color, and maybe a little positioning without clearing the whole
-  screen first.
-* Leave more than one screenful of scrollback in the buffer after your program
-  exits, like a well-behaved command-line app should.
-* Get rid of all those noisy, C-like calls to ``tigetstr`` and ``tparm``, so
-  your code doesn't get crowded out by terminal bookkeeping.
-* Act intelligently when somebody redirects your output to a file, omitting the
-  terminal control codes the user doesn't want to see (optional).
-
-.. _curses: http://docs.python.org/library/curses.html
-
-Before And After
-----------------
-
-Without Blessings, this is how you'd print some underlined text at the bottom
-of the screen::
-
-    from curses import tigetstr, setupterm, tparm
-    from fcntl import ioctl
-    from os import isatty
-    import struct
-    import sys
-    from termios import TIOCGWINSZ
-
-    # If we want to tolerate having our output piped to other commands or
-    # files without crashing, we need to do all this branching:
-    if hasattr(sys.stdout, 'fileno') and isatty(sys.stdout.fileno()):
-        setupterm()
-        sc = tigetstr('sc')
-        cup = tigetstr('cup')
-        rc = tigetstr('rc')
-        underline = tigetstr('smul')
-        normal = tigetstr('sgr0')
-    else:
-        sc = cup = rc = underline = normal = ''
-    print sc  # Save cursor position.
-    if cup:
-        # tigetnum('lines') doesn't always update promptly, hence this:
-        height = struct.unpack('hhhh', ioctl(0, TIOCGWINSZ, '\000' * 8))[0]
-        print tparm(cup, height - 1, 0)  # Move cursor to bottom.
-    print 'This is {under}underlined{normal}!'.format(under=underline,
-                                                      normal=normal)
-    print rc  # Restore cursor position.
-
-Phew! That was long and full of incomprehensible trash! Let's try it again,
-this time with Blessings::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    with term.location(0, term.height - 1):
-        print 'This is', term.underline('pretty!')
-
-Much better.
-
-What It Provides
-================
-
-Blessings provides just one top-level object: ``Terminal``. Instantiating a
-``Terminal`` figures out whether you're on a terminal at all and, if so, does
-any necessary terminal setup. After that, you can proceed to ask it all sorts
-of things about the terminal. Terminal terminal terminal.
-
-Simple Formatting
------------------
-
-Lots of handy formatting codes ("capabilities" in low-level parlance) are
-available as attributes on a ``Terminal``. For example::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    print 'I am ' + term.bold + 'bold' + term.normal + '!'
-
-You can also use them as wrappers so you don't have to say ``normal``
-afterward::
-
-    print 'I am', term.bold('bold') + '!'
-
-Or, if you want fine-grained control while maintaining some semblance of
-brevity, you can combine it with Python's string formatting, which makes
-attributes easy to access::
-
-    print 'All your {t.red}base {t.underline}are belong to us{t.normal}'.format(t=term)
-
-Simple capabilities of interest include...
-
-* ``bold``
-* ``reverse``
-* ``underline``
-* ``no_underline`` (which turns off underlining)
-* ``blink``
-* ``normal`` (which turns off everything, even colors)
-* ``clear_eol`` (clear to the end of the line)
-* ``clear_bol`` (clear to beginning of line)
-* ``clear_eos`` (clear to end of screen)
-
-Here are a few more which are less likely to work on all terminals:
-
-* ``dim``
-* ``italic`` and ``no_italic``
-* ``shadow`` and ``no_shadow``
-* ``standout`` and ``no_standout``
-* ``subscript`` and ``no_subscript``
-* ``superscript`` and ``no_superscript``
-* ``flash`` (which flashes the screen once)
-
-Note that, while the inverse of ``underline`` is ``no_underline``, the only way
-to turn off ``bold`` or ``reverse`` is ``normal``, which also cancels any
-custom colors. This is because there's no way to tell the terminal to undo
-certain pieces of formatting, even at the lowest level.
-
-You might notice that the above aren't the typical incomprehensible terminfo
-capability names; we alias a few of the harder-to-remember ones for
-readability. However, you aren't limited to these: you can reference any
-string-returning capability listed on the `terminfo man page`_ by the name
-under the "Cap-name" column: for example, ``term.rum``.
-
-.. _`terminfo man page`: http://www.manpagez.com/man/5/terminfo/
-
-Color
------
-
-16 colors, both foreground and background, are available as easy-to-remember
-attributes::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    print term.red + term.on_green + 'Red on green? Ick!' + term.normal
-    print term.bright_red + term.on_bright_blue + 'This is even worse!' + term.normal
-
-You can also call them as wrappers, which sets everything back to normal at the
-end::
-
-    print term.red_on_green('Red on green? Ick!')
-    print term.yellow('I can barely see it.')
-
-The available colors are...
-
-* ``black``
-* ``red``
-* ``green``
-* ``yellow``
-* ``blue``
-* ``magenta``
-* ``cyan``
-* ``white``
-
-You can set the background color instead of the foreground by prepending
-``on_``, as in ``on_blue``. There is also a ``bright`` version of each color:
-for example, ``on_bright_blue``.
-
-There is also a numerical interface to colors, which takes an integer from
-0-15::
-
-    term.color(5) + 'Hello' + term.normal
-    term.on_color(3) + 'Hello' + term.normal
-
-    term.color(5)('Hello')
-    term.on_color(3)('Hello')
-
-If some color is unsupported (for instance, if only the normal colors are
-available, not the bright ones), trying to use it will, on most terminals, have
-no effect: the foreground and background colors will stay as they were. You can
-get fancy and do different things depending on the supported colors by checking
-`number_of_colors`_.
-
-.. _`number_of_colors`: http://packages.python.org/blessings/#blessings.Terminal.number_of_colors
-
-Compound Formatting
--------------------
-
-If you want to do lots of crazy formatting all at once, you can just mash it
-all together::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    print term.bold_underline_green_on_yellow + 'Woo' + term.normal
-
-Or you can use your newly coined attribute as a wrapper, which implicitly sets
-everything back to normal afterward::
-
-    print term.bold_underline_green_on_yellow('Woo')
-
-This compound notation comes in handy if you want to allow users to customize
-the formatting of your app: just have them pass in a format specifier like
-"bold_green" on the command line, and do a quick ``getattr(term,
-that_option)('Your text')`` when you do your formatting.
-
-I'd be remiss if I didn't credit couleur_, where I probably got the idea for
-all this mashing.
-
-.. _couleur: http://pypi.python.org/pypi/couleur
-
-Parametrized Capabilities
--------------------------
-
-Some capabilities take parameters. Rather than making you dig up ``tparm()``
-all the time, we simply make such capabilities into callable strings. You can
-pass the parameters right in::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    print term.move(10, 1)
-
-Here are some of interest:
-
-``move``
-  Position the cursor elsewhere. Parameters are y coordinate, then x
-  coordinate.
-``move_x``
-  Move the cursor to the given column.
-``move_y``
-  Move the cursor to the given row.
-
-You can also reference any other string-returning capability listed on the
-`terminfo man page`_ by its name under the "Cap-name" column.
-
-.. _`terminfo man page`: http://www.manpagez.com/man/5/terminfo/
-
-Height and Width
-----------------
-
-It's simple to get the height and width of the terminal, in characters::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    height = term.height
-    width = term.width
-
-These are newly updated each time you ask for them, so they're safe to use from
-SIGWINCH handlers.
-
-Temporary Repositioning
------------------------
-
-Sometimes you need to flit to a certain location, print something, and then
-return: for example, when updating a progress bar at the bottom of the screen.
-``Terminal`` provides a context manager for doing this concisely::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    with term.location(0, term.height - 1):
-        print 'Here is the bottom.'
-    print 'This is back where I came from.'
-
-Parameters to ``location()`` are ``x`` and then ``y``, but you can also pass
-just one of them, leaving the other alone. For example... ::
-
-    with term.location(y=10):
-        print 'We changed just the row.'
-
-If you want to reposition permanently, see ``move``, in an example above.
-
-Pipe Savvy
-----------
-
-If your program isn't attached to a terminal, like if it's being piped to
-another command or redirected to a file, all the capability attributes on
-``Terminal`` will return empty strings. You'll get a nice-looking file without
-any formatting codes gumming up the works.
-
-If you want to override this--like if you anticipate your program being piped
-through ``less -r``, which handles terminal escapes just fine--pass
-``force_styling=True`` to the ``Terminal`` constructor.
-
-In any case, there is an ``is_a_tty`` attribute on ``Terminal`` that lets you
-see whether the attached stream seems to be a terminal. If it's false, you
-might refrain from drawing progress bars and other frippery, since you're
-apparently headed into a pipe::
-
-    from blessings import Terminal
-
-    term = Terminal()
-    if term.is_a_tty:
-        with term.location(0, term.height - 1):
-            print 'Progress: [=======>   ]'
-    print term.bold('Important stuff')
-
-Shopping List
-=============
-
-There are decades of legacy tied up in terminal interaction, so attention to
-detail and behavior in edge cases make a difference. Here are some ways
-Blessings has your back:
-
-* Uses the terminfo database so it works with any terminal type
-* Provides up-to-the-moment terminal height and width, so you can respond to
-  terminal size changes (SIGWINCH signals). (Most other libraries query the
-  ``COLUMNS`` and ``LINES`` environment variables or the ``cols`` or ``lines``
-  terminal capabilities, which don't update promptly, if at all.)
-* Avoids making a mess if the output gets piped to a non-terminal
-* Works great with standard Python string templating
-* Provides convenient access to all terminal capabilities, not just a sugared
-  few
-* Outputs to any file-like object, not just stdout
-* Keeps a minimum of internal state, so you can feel free to mix and match with
-  calls to curses or whatever other terminal libraries you like
-
-Blessings does not provide...
-
-* Native color support on the Windows command prompt. However, it should work
-  when used in concert with colorama_.
-
-.. _colorama: http://pypi.python.org/pypi/colorama/0.2.4
-
-Bugs
-====
-
-Bugs or suggestions? Visit the `issue tracker`_.
-
-.. _`issue tracker`: https://github.com/erikrose/blessings/issues/new
-
-License
-=======
-
-Blessings is under the MIT License. See the LICENSE file.
-
-Version History
-===============
-
-1.3
-  * Add ``number_of_colors``, which tells you how many colors the terminal
-    supports.
-  * Made ``color(n)`` and ``on_color(n)`` callable to wrap a string, like the
-    named colors can. Also, make them both fall back to the ``setf`` and
-    ``setb`` capabilities (like the named colors do) if the ANSI ``setaf`` and
-    ``setab`` aren't available.
-  * Allow ``color`` attr to act as an unparametrized string, not just a
-    callable.
-  * Make ``height`` and ``width`` examine any passed-in stream before falling
-    back to stdout. (This rarely if ever affects actual behavior; it's mostly
-    philosophical.)
-  * Make caching simpler and slightly more efficient.
-  * Get rid of a reference cycle between Terminals and FormattingStrings.
-  * Update docs to reflect that terminal addressing (as in ``location()``) is
-    0-based.
-
-1.2
-  * Added support for Python 3! We need 3.2.3 or greater, because the curses
-    library couldn't decide whether to accept strs or bytes before that
-    (http://bugs.python.org/issue10570).
-  * Everything that comes out of the library is now unicode. This lets us
-    support Python 3 without making a mess of the code, and Python 2 should
-    continue to work unless you were testing types (and badly). Please file a
-    bug if this causes trouble for you.
-  * Changed to the MIT License for better world domination.
-  * Added Sphinx docs.
-
-1.1
-  * Added nicely named attributes for colors.
-  * Introduced compound formatting.
-  * Added wrapper behavior for styling and colors.
-  * Let you force capabilities to be non-empty, even if the output stream is
-    not a terminal.
-  * Added the ``is_a_tty`` attribute for telling whether the output stream is a
-    terminal.
-  * Sugared the remaining interesting string capabilities.
-  * Let ``location()`` operate on just an x *or* y coordinate.
-
-1.0
-  * Extracted Blessings from nose-progressive, my `progress-bar-having,
-    traceback-shortcutting, rootin', tootin' testrunner`_. It provided the
-    tootin' functionality.
-
-.. _`progress-bar-having, traceback-shortcutting, rootin', tootin' testrunner`: http://pypi.python.org/pypi/nose-progressive/
diff --git a/third_party/python/blessings/blessings/__init__.py b/third_party/python/blessings/blessings/__init__.py
index 081288ba68b1..810d367bcf3f 100644
--- a/third_party/python/blessings/blessings/__init__.py
+++ b/third_party/python/blessings/blessings/__init__.py
@@ -1,14 +1,18 @@
-from collections import defaultdict
+"""A thin, practical wrapper around terminal coloring, styling, and
+positioning"""
+
+from contextlib import contextmanager
 import curses
-from curses import tigetstr, tigetnum, setupterm, tparm
+from curses import setupterm, tigetnum, tigetstr, tparm
 from fcntl import ioctl
+
 try:
     from io import UnsupportedOperation as IOUnsupportedOperation
 except ImportError:
     class IOUnsupportedOperation(Exception):
-        """A dummy exception to take the place of Python 3's ``io.UnsupportedOperation`` in Python 2"""
-        pass
-import os
+        """A dummy exception to take the place of Python 3's
+        ``io.UnsupportedOperation`` in Python 2"""
+
 from os import isatty, environ
 from platform import python_version_tuple
 import struct
@@ -16,15 +20,16 @@ import sys
 from termios import TIOCGWINSZ
 
 
-if ('3', '0', '0') <= python_version_tuple() < ('3', '2', '2+'):  # Good till 3.2.10
+__all__ = ['Terminal']
+
+
+if ('3', '0', '0') <= python_version_tuple() < ('3', '2', '2+'):  # Good till
+                                                                  # 3.2.10
     # Python 3.x < 3.2.3 has a bug in which tparm() erroneously takes a string.
     raise ImportError('Blessings needs Python 3.2.3 or greater for Python 3 '
                       'support due to http://bugs.python.org/issue10570.')
 
 
-__all__ = ['Terminal']
-
-
 class Terminal(object):
     """An abstraction around terminal capabilities
 
@@ -40,9 +45,6 @@ class Terminal(object):
         around with the terminal; it's almost always needed when the terminal
         is and saves sticking lots of extra args on client functions in
         practice.
-      ``is_a_tty``
-        Whether ``stream`` appears to be a terminal. You can examine this value
-        to decide whether to draw progress bars or other frippery.
 
     """
     def __init__(self, kind=None, stream=None, force_styling=False):
@@ -69,26 +71,31 @@ class Terminal(object):
             somewhere, and stdout is probably where the output is ultimately
             headed. If not, stderr is probably bound to the same terminal.)
 
+            If you want to force styling to not happen, pass
+            ``force_styling=None``.
+
         """
         if stream is None:
             stream = sys.__stdout__
         try:
             stream_descriptor = (stream.fileno() if hasattr(stream, 'fileno')
-                                                 and callable(stream.fileno)
+                                 and callable(stream.fileno)
                                  else None)
         except IOUnsupportedOperation:
             stream_descriptor = None
 
-        self.is_a_tty = stream_descriptor is not None and isatty(stream_descriptor)
-        self._does_styling = self.is_a_tty or force_styling
+        self._is_a_tty = (stream_descriptor is not None and
+                         isatty(stream_descriptor))
+        self._does_styling = ((self.is_a_tty or force_styling) and
+                              force_styling is not None)
 
-        # The desciptor to direct terminal initialization sequences to.
+        # The descriptor to direct terminal initialization sequences to.
         # sys.__stdout__ seems to always have a descriptor of 1, even if output
         # is redirected.
         self._init_descriptor = (sys.__stdout__.fileno()
                                  if stream_descriptor is None
                                  else stream_descriptor)
-        if self._does_styling:
+        if self.does_styling:
             # Make things like tigetstr() work. Explicit args make setupterm()
             # work even when -s is passed to nosetests. Lean toward sending
             # init sequences to the stream if it has a file descriptor, and
@@ -111,10 +118,20 @@ class Terminal(object):
         clear_eol='el',
         clear_bol='el1',
         clear_eos='ed',
+        # 'clear' clears the whole screen.
         position='cup',  # deprecated
+        enter_fullscreen='smcup',
+        exit_fullscreen='rmcup',
         move='cup',
         move_x='hpa',
         move_y='vpa',
+        move_left='cub1',
+        move_right='cuf1',
+        move_up='cuu1',
+        move_down='cud1',
+
+        hide_cursor='civis',
+        normal_cursor='cnorm',
 
         reset_colors='op',  # oc doesn't work on my OS X terminal.
 
@@ -138,7 +155,7 @@ class Terminal(object):
         no_underline='rmul')
 
     def __getattr__(self, attr):
-        """Return parametrized terminal capabilities, like bold.
+        """Return a terminal capability, like bold.
 
         For example, you can say ``term.bold`` to get the string that turns on
         bold formatting and ``term.normal`` to get the string that turns it off
@@ -154,10 +171,27 @@ class Terminal(object):
         Return values are always Unicode.
 
         """
-        resolution = self._resolve_formatter(attr) if self._does_styling else NullCallableString()
+        resolution = (self._resolve_formatter(attr) if self.does_styling
+                      else NullCallableString())
         setattr(self, attr, resolution)  # Cache capability codes.
         return resolution
 
+    @property
+    def does_styling(self):
+        """Whether attempt to emit capabilities
+
+        This is influenced by the ``is_a_tty`` property and by the
+        ``force_styling`` argument to the constructor. You can examine
+        this value to decide whether to draw progress bars or other frippery.
+
+        """
+        return self._does_styling
+
+    @property
+    def is_a_tty(self):
+        """Whether my ``stream`` appears to be associated with a terminal"""
+        return self._is_a_tty
+
     @property
     def height(self):
         """The height of the terminal in characters
@@ -167,8 +201,8 @@ class Terminal(object):
         piping to things that eventually display on the terminal (like ``less
         -R``) work. If a stream representing a terminal was passed in, return
         the dimensions of that terminal. If there somehow is no controlling
-        terminal, return ``None``. (Thus, you should check that ``is_a_tty`` is
-        true before doing any math on the result.)
+        terminal, return ``None``. (Thus, you should check that the property
+        ``is_a_tty`` is true before doing any math on the result.)
 
         """
         return self._height_and_width()[0]
@@ -183,16 +217,30 @@ class Terminal(object):
         return self._height_and_width()[1]
 
     def _height_and_width(self):
-        """Return a tuple of (terminal height, terminal width)."""
+        """Return a tuple of (terminal height, terminal width).
+
+        Start by trying TIOCGWINSZ (Terminal I/O-Control: Get Window Size),
+        falling back to environment variables (LINES, COLUMNS), and returning
+        (None, None) if those are unavailable or invalid.
+
+        """
         # tigetnum('lines') and tigetnum('cols') update only if we call
         # setupterm() again.
         for descriptor in self._init_descriptor, sys.__stdout__:
             try:
-                return struct.unpack('hhhh', ioctl(descriptor, TIOCGWINSZ, '\000' * 8))[0:2]
+                return struct.unpack(
+                        'hhhh', ioctl(descriptor, TIOCGWINSZ, '\000' * 8))[0:2]
             except IOError:
+                # when the output stream or init descriptor is not a tty, such
+                # as when when stdout is piped to another program, fe. tee(1),
+                # these ioctls will raise IOError
                 pass
-        return None, None  # Should never get here
+        try:
+            return int(environ.get('LINES')), int(environ.get('COLUMNS'))
+        except TypeError:
+            return None, None
 
+    @contextmanager
     def location(self, x=None, y=None):
         """Return a context manager for temporarily moving the cursor.
 
@@ -206,10 +254,45 @@ class Terminal(object):
                     print 'I can do it %i times!' % x
 
         Specify ``x`` to move to a certain column, ``y`` to move to a certain
-        row, or both.
+        row, both, or neither. If you specify neither, only the saving and
+        restoration of cursor position will happen. This can be useful if you
+        simply want to restore your place after doing some manual cursor
+        movement.
 
         """
-        return Location(self, x, y)
+        # Save position and move to the requested column, row, or both:
+        self.stream.write(self.save)
+        if x is not None and y is not None:
+            self.stream.write(self.move(y, x))
+        elif x is not None:
+            self.stream.write(self.move_x(x))
+        elif y is not None:
+            self.stream.write(self.move_y(y))
+        try:
+            yield
+        finally:
+            # Restore original cursor position:
+            self.stream.write(self.restore)
+
+    @contextmanager
+    def fullscreen(self):
+        """Return a context manager that enters fullscreen mode while inside it
+        and restores normal mode on leaving."""
+        self.stream.write(self.enter_fullscreen)
+        try:
+            yield
+        finally:
+            self.stream.write(self.exit_fullscreen)
+
+    @contextmanager
+    def hidden_cursor(self):
+        """Return a context manager that hides the cursor while inside it and
+        makes it visible on leaving."""
+        self.stream.write(self.hide_cursor)
+        try:
+            yield
+        finally:
+            self.stream.write(self.normal_cursor)
 
     @property
     def color(self):
@@ -254,12 +337,22 @@ class Terminal(object):
         # don't name it after the underlying capability, because we deviate
         # slightly from its behavior, and we might someday wish to give direct
         # access to it.
-        colors = tigetnum('colors')  # Returns -1 if no color support, -2 if no such cap.
-        #self.__dict__['colors'] = ret  # Cache it. It's not changing. (Doesn't work.)
+        if not self._does_styling:
+            return 0
+
+        colors = tigetnum('colors')  # Returns -1 if no color support, -2 if no
+                                     # such cap.
+        #  self.__dict__['colors'] = ret  # Cache it. It's not changing.
+                                          # (Doesn't work.)
         return colors if colors >= 0 else 0
 
     def _resolve_formatter(self, attr):
-        """Resolve a sugary or plain capability name, color, or compound formatting function name into a callable capability."""
+        """Resolve a sugary or plain capability name, color, or compound
+        formatting function name into a callable capability.
+
+        Return a ``ParametrizingString`` or a ``FormattingString``.
+
+        """
         if attr in COLORS:
             return self._resolve_color(attr)
         elif attr in COMPOUNDABLES:
@@ -277,7 +370,8 @@ class Terminal(object):
                 return ParametrizingString(self._resolve_capability(attr))
 
     def _resolve_capability(self, atom):
-        """Return a terminal code for a capname or a sugary name, or an empty Unicode.
+        """Return a terminal code for a capname or a sugary name, or an empty
+        Unicode.
 
         The return value is always Unicode, because otherwise it is clumsy
         (especially in Python 3) to concatenate with real (Unicode) strings.
@@ -285,14 +379,13 @@ class Terminal(object):
         """
         code = tigetstr(self._sugar.get(atom, atom))
         if code:
-            # We can encode escape sequences as UTF-8 because they never
-            # contain chars > 127, and UTF-8 never changes anything within that
-            # range..
-            return code.decode('utf-8')
+            # See the comment in ParametrizingString for why this is latin1.
+            return code.decode('latin1')
         return u''
 
     def _resolve_color(self, color):
-        """Resolve a color like red or on_bright_green into a callable capability."""
+        """Resolve a color like red or on_bright_green into a callable
+        capability."""
         # TODO: Does curses automatically exchange red and blue and cyan and
         # yellow when a terminal supports setf/setb rather than setaf/setab?
         # I'll be blasted if I can find any documentation. The following
@@ -315,7 +408,8 @@ class Terminal(object):
         return self.setab or self.setb
 
     def _formatting_string(self, formatting):
-        """Return a new ``FormattingString`` which implicitly receives my notion of "normal"."""
+        """Return a new ``FormattingString`` which implicitly receives my
+        notion of "normal"."""
         return FormattingString(formatting, self.normal)
 
 
@@ -326,7 +420,8 @@ def derivative_colors(colors):
                [('on_bright_' + c) for c in colors])
 
 
-COLORS = set(['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'])
+COLORS = set(['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan',
+              'white'])
 COLORS.update(derivative_colors(COLORS))
 COMPOUNDABLES = (COLORS |
                  set(['bold', 'underline', 'reverse', 'blink', 'dim', 'italic',
@@ -334,7 +429,9 @@ COMPOUNDABLES = (COLORS |
 
 
 class ParametrizingString(unicode):
-    """A Unicode string which can be called to parametrize it as a terminal capability"""
+    """A Unicode string which can be called to parametrize it as a terminal
+    capability"""
+
     def __new__(cls, formatting, normal=None):
         """Instantiate.
 
@@ -352,7 +449,15 @@ class ParametrizingString(unicode):
             # Re-encode the cap, because tparm() takes a bytestring in Python
             # 3. However, appear to be a plain Unicode string otherwise so
             # concats work.
-            parametrized = tparm(self.encode('utf-8'), *args).decode('utf-8')
+            #
+            # We use *latin1* encoding so that bytes emitted by tparm are
+            # encoded to their native value: some terminal kinds, such as
+            # 'avatar' or 'kermit', emit 8-bit bytes in range 0x7f to 0xff.
+            # latin1 leaves these values unmodified in their conversion to
+            # unicode byte values. The terminal emulator will "catch" and
+            # handle these values, even if emitting utf8-encoded text, where
+            # these bytes would otherwise be illegal utf8 start bytes.
+            parametrized = tparm(self.encode('latin1'), *args).decode('latin1')
             return (parametrized if self._normal is None else
                     FormattingString(parametrized, self._normal))
         except curses.error:
@@ -376,7 +481,9 @@ class ParametrizingString(unicode):
 
 
 class FormattingString(unicode):
-    """A Unicode string which can be called upon a piece of text to wrap it in formatting"""
+    """A Unicode string which can be called upon a piece of text to wrap it in
+    formatting"""
+
     def __new__(cls, formatting, normal):
         new = unicode.__new__(cls, formatting)
         new._normal = normal
@@ -394,21 +501,48 @@ class FormattingString(unicode):
 
 
 class NullCallableString(unicode):
-    """A dummy class to stand in for ``FormattingString`` and ``ParametrizingString``
+    """A dummy callable Unicode to stand in for ``FormattingString`` and
+    ``ParametrizingString``
 
-    A callable bytestring that returns an empty Unicode when called with an int
-    and the arg otherwise. We use this when there is no tty and so all
-    capabilities are blank.
+    We use this when there is no tty and thus all capabilities should be blank.
 
     """
     def __new__(cls):
         new = unicode.__new__(cls, u'')
         return new
 
-    def __call__(self, arg):
-        if isinstance(arg, int):
+    def __call__(self, *args):
+        """Return a Unicode or whatever you passed in as the first arg
+        (hopefully a string of some kind).
+
+        When called with an int as the first arg, return an empty Unicode. An
+        int is a good hint that I am a ``ParametrizingString``, as there are
+        only about half a dozen string-returning capabilities on OS X's
+        terminfo man page which take any param that's not an int, and those are
+        seldom if ever used on modern terminal emulators. (Most have to do with
+        programming function keys. Blessings' story for supporting
+        non-string-returning caps is undeveloped.) And any parametrized
+        capability in a situation where all capabilities themselves are taken
+        to be blank are, of course, themselves blank.
+
+        When called with a non-int as the first arg (no no args at all), return
+        the first arg. I am acting as a ``FormattingString``.
+
+        """
+        if len(args) != 1 or isinstance(args[0], int):
+            # I am acting as a ParametrizingString.
+
+            # tparm can take not only ints but also (at least) strings as its
+            # second...nth args. But we don't support callably parametrizing
+            # caps that take non-ints yet, so we can cheap out here. TODO: Go
+            # through enough of the motions in the capability resolvers to
+            # determine which of 2 special-purpose classes,
+            # NullParametrizableString or NullFormattingString, to return, and
+            # retire this one.
             return u''
-        return arg  # TODO: Force even strs in Python 2.x to be unicodes? Nah. How would I know what encoding to use to convert it?
+        return args[0]  # Should we force even strs in Python 2.x to be
+                        # unicodes? No. How would I know what encoding to use
+                        # to convert it?
 
 
 def split_into_formatters(compound):
@@ -427,24 +561,3 @@ def split_into_formatters(compound):
         else:
             merged_segs.append(s)
     return merged_segs
-
-
-class Location(object):
-    """Context manager for temporarily moving the cursor"""
-    def __init__(self, term, x=None, y=None):
-        self.x, self.y = x, y
-        self.term = term
-
-    def __enter__(self):
-        """Save position and move to the requested column, row, or both."""
-        self.term.stream.write(self.term.save)  # save position
-        if self.x and self.y:
-            self.term.stream.write(self.term.move(self.y, self.x))
-        elif self.x:
-            self.term.stream.write(self.term.move_x(self.x))
-        elif self.y:
-            self.term.stream.write(self.term.move_y(self.y))
-
-    def __exit__(self, type, value, tb):
-        """Restore original cursor position."""
-        self.term.stream.write(self.term.restore)
diff --git a/third_party/python/blessings/blessings/tests.py b/third_party/python/blessings/blessings/tests.py
index a02a3924a8fc..aff3a2f249c0 100644
--- a/third_party/python/blessings/blessings/tests.py
+++ b/third_party/python/blessings/blessings/tests.py
@@ -28,12 +28,12 @@ TestTerminal = partial(Terminal, kind='xterm-256color')
 
 def unicode_cap(cap):
     """Return the result of ``tigetstr`` except as Unicode."""
-    return tigetstr(cap).decode('utf-8')
+    return tigetstr(cap).decode('latin1')
 
 
 def unicode_parm(cap, *parms):
     """Return the result of ``tparm(tigetstr())`` except as Unicode."""
-    return tparm(tigetstr(cap), *parms).decode('utf-8')
+    return tparm(tigetstr(cap), *parms).decode('latin1')
 
 
 def test_capability():
@@ -57,7 +57,8 @@ def test_capability_without_tty():
 
 
 def test_capability_with_forced_tty():
-    """If we force styling, capabilities had better not (generally) be empty."""
+    """If we force styling, capabilities had better not (generally) be
+    empty."""
     t = TestTerminal(stream=StringIO(), force_styling=True)
     eq_(t.save, unicode_cap('sc'))
 
@@ -67,15 +68,16 @@ def test_parametrization():
     eq_(TestTerminal().cup(3, 4), unicode_parm('cup', 3, 4))
 
 
-def height_and_width():
+def test_height_and_width():
     """Assert that ``height_and_width()`` returns ints."""
     t = TestTerminal()  # kind shouldn't matter.
-    assert isinstance(int, t.height)
-    assert isinstance(int, t.width)
+    assert isinstance(t.height, int)
+    assert isinstance(t.width, int)
 
 
 def test_stream_attr():
-    """Make sure Terminal exposes a ``stream`` attribute that defaults to something sane."""
+    """Make sure Terminal exposes a ``stream`` attribute that defaults to
+    something sane."""
     eq_(Terminal().stream, sys.__stdout__)
 
 
@@ -102,6 +104,25 @@ def test_horizontal_location():
                              unicode_cap('rc'))
 
 
+def test_null_location():
+    """Make sure ``location()`` with no args just does position restoration."""
+    t = TestTerminal(stream=StringIO(), force_styling=True)
+    with t.location():
+        pass
+    eq_(t.stream.getvalue(), unicode_cap('sc') +
+                             unicode_cap('rc'))
+
+
+def test_zero_location():
+    """Make sure ``location()`` pays attention to 0-valued args."""
+    t = TestTerminal(stream=StringIO(), force_styling=True)
+    with t.location(0, 0):
+        pass
+    eq_(t.stream.getvalue(), unicode_cap('sc') +
+                             unicode_parm('cup', 0, 0) +
+                             unicode_cap('rc'))
+
+
 def test_null_fileno():
     """Make sure ``Terminal`` works when ``fileno`` is ``None``.
 
@@ -178,7 +199,8 @@ def test_number_of_colors_with_tty():
 def test_formatting_functions():
     """Test crazy-ass formatting wrappers, both simple and compound."""
     t = TestTerminal()
-    # By now, it should be safe to use sugared attributes. Other tests test those.
+    # By now, it should be safe to use sugared attributes. Other tests test
+    # those.
     eq_(t.bold(u'hi'), t.bold + u'hi' + t.normal)
     eq_(t.green('hi'), t.green + u'hi' + t.normal)  # Plain strs for Python 2.x
     # Test some non-ASCII chars, probably not necessary:
@@ -187,7 +209,8 @@ def test_formatting_functions():
         t.bold + t.underline + t.green + t.on_red + u'boo' + t.normal)
     # Don't spell things like this:
     eq_(t.on_bright_red_bold_bright_green_underline('meh'),
-        t.on_bright_red + t.bold + t.bright_green + t.underline + u'meh' + t.normal)
+        t.on_bright_red + t.bold + t.bright_green + t.underline + u'meh' +
+                          t.normal)
 
 
 def test_formatting_functions_without_tty():
@@ -229,3 +252,19 @@ def test_init_descriptor_always_initted():
     """We should be able to get a height and width even on no-tty Terminals."""
     t = Terminal(stream=StringIO())
     eq_(type(t.height), int)
+
+
+def test_force_styling_none():
+    """If ``force_styling=None`` is passed to the constructor, don't ever do
+    styling."""
+    t = TestTerminal(force_styling=None)
+    eq_(t.save, '')
+
+
+def test_null_callable_string():
+    """Make sure NullCallableString tolerates all numbers and kinds of args it
+    might receive."""
+    t = TestTerminal(stream=StringIO())
+    eq_(t.clear, '')
+    eq_(t.move(1, 2), '')
+    eq_(t.move_x(1), '')
diff --git a/third_party/python/blessings/setup.cfg b/third_party/python/blessings/setup.cfg
deleted file mode 100644
index 861a9f554263..000000000000
--- a/third_party/python/blessings/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-
diff --git a/third_party/python/blessings/setup.py b/third_party/python/blessings/setup.py
deleted file mode 100644
index 6af55452d867..000000000000
--- a/third_party/python/blessings/setup.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import sys
-
-from setuptools import setup, find_packages
-
-
-extra_setup = {}
-if sys.version_info >= (3,):
-    extra_setup['use_2to3'] = True
-
-setup(
-    name='blessings',
-    version='1.3',
-    description='A thin, practical wrapper around terminal formatting, positioning, and more',
-    long_description=open('README.rst').read(),
-    author='Erik Rose',
-    author_email='erikrose@grinchcentral.com',
-    license='MIT',
-    packages=find_packages(exclude=['ez_setup']),
-    tests_require=['Nose'],
-    url='https://github.com/erikrose/blessings',
-    include_package_data=True,
-    classifiers=[
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Environment :: Console :: Curses',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: POSIX',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Topic :: Software Development :: Libraries',
-        'Topic :: Software Development :: User Interfaces',
-        'Topic :: Terminals'
-        ],
-    keywords=['terminal', 'tty', 'curses', 'ncurses', 'formatting', 'style', 'color', 'console'],
-    **extra_setup
-)
diff --git a/third_party/python/blessings/tox.ini b/third_party/python/blessings/tox.ini
deleted file mode 100644
index e1753f2614da..000000000000
--- a/third_party/python/blessings/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[tox]
-envlist = py25, py26, py27, py32
-
-[testenv]
-commands = nosetests blessings
-deps = nose
-changedir = .tox  # So Python 3 runs don't pick up incompatible, un-2to3'd source from the cwd
diff --git a/third_party/python/json-e/jsone/interpreter.py b/third_party/python/json-e/jsone/interpreter.py
index 4d15264e9e02..eb38a9c85bce 100644
--- a/third_party/python/json-e/jsone/interpreter.py
+++ b/third_party/python/json-e/jsone/interpreter.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from .prattparser import PrattParser, infix, prefix
-from .shared import TemplateError, string
+from .shared import TemplateError, InterpreterError, string
 import operator
 import json
 
@@ -21,8 +21,9 @@ OPERATORS = {
 }
 
 
-def expectationError(operator, expected):
-    return TemplateError('{} expected {}'.format(operator, expected))
+def infixExpectationError(operator, expected):
+    return InterpreterError('infix: {} expects {} {} {}'.
+                            format(operator, expected, operator, expected))
 
 
 class ExpressionEvaluator(PrattParser):
@@ -44,9 +45,9 @@ class ExpressionEvaluator(PrattParser):
         'null', 'number', 'identifier', 'string',
     ]
     precedence = [
-        ['in'],
         ['||'],
         ['&&'],
+        ['in'],
         ['==', '!='],
         ['>=', '<=', '<', '>'],
         ['+', '-'],
@@ -80,14 +81,14 @@ class ExpressionEvaluator(PrattParser):
     def uminus(self, token, pc):
         v = pc.parse('unary')
         if not isNumber(v):
-            raise expectationError('unary -', 'number')
+            raise InterpreterError('{} expects {}'.format('unary -', 'number'))
         return -v
 
     @prefix("+")
     def uplus(self, token, pc):
         v = pc.parse('unary')
         if not isNumber(v):
-            raise expectationError('unary +', 'number')
+            raise InterpreterError('{} expects {}'.format('unary +', 'number'))
         return v
 
     @prefix("identifier")
@@ -95,8 +96,8 @@ class ExpressionEvaluator(PrattParser):
         try:
             return self.context[token.value]
         except KeyError:
-            raise TemplateError(
-                'no context value named "{}"'.format(token.value))
+            raise InterpreterError(
+                'unknown context value {}'.format(token.value))
 
     @prefix("null")
     def null(self, token, pc):
@@ -131,23 +132,23 @@ class ExpressionEvaluator(PrattParser):
     @infix("+")
     def plus(self, left, token, pc):
         if not isinstance(left, (string, int, float)) or isinstance(left, bool):
-            raise expectationError('+', 'number or string')
+            raise infixExpectationError('+', 'number/string')
         right = pc.parse(token.kind)
         if not isinstance(right, (string, int, float)) or isinstance(right, bool):
-            raise expectationError('+', 'number or string')
+            raise infixExpectationError('+', 'number/string')
         if type(right) != type(left) and \
                 (isinstance(left, string) or isinstance(right, string)):
-            raise expectationError('+', 'matching types')
+            raise infixExpectationError('+', 'numbers/strings')
         return left + right
 
     @infix('-', '*', '/', '**')
     def arith(self, left, token, pc):
         op = token.kind
         if not isNumber(left):
-            raise expectationError(op, 'number')
+            raise infixExpectationError(op, 'number')
         right = pc.parse({'**': '**-right-associative'}.get(op))
         if not isNumber(right):
-            raise expectationError(op, 'number')
+            raise infixExpectationError(op, 'number')
         return OPERATORS[op](left, right)
 
     @infix("[")
@@ -175,7 +176,7 @@ class ExpressionEvaluator(PrattParser):
     @infix(".")
     def property_dot(self, left, token, pc):
         if not isinstance(left, dict):
-            raise expectationError('.', 'object')
+            raise infixExpectationError('.', 'object')
         k = pc.require('identifier').value
         try:
             return left[k]
@@ -202,7 +203,7 @@ class ExpressionEvaluator(PrattParser):
         right = pc.parse(op)
         if type(left) != type(right) or \
                 not (isinstance(left, (int, float, string)) and not isinstance(left, bool)):
-            raise expectationError(op, 'matching types')
+            raise infixExpectationError(op, 'numbers/strings')
         return OPERATORS[op](left, right)
 
     @infix("in")
@@ -210,17 +211,17 @@ class ExpressionEvaluator(PrattParser):
         right = pc.parse(token.kind)
         if isinstance(right, dict):
             if not isinstance(left, string):
-                raise expectationError('in-object', 'string on left side')
+                raise infixExpectationError('in-object', 'string on left side')
         elif isinstance(right, string):
             if not isinstance(left, string):
-                raise expectationError('in-string', 'string on left side')
+                raise infixExpectationError('in-string', 'string on left side')
         elif not isinstance(right, list):
-            raise expectationError(
+            raise infixExpectationError(
                 'in', 'Array, string, or object on right side')
         try:
             return left in right
         except TypeError:
-            raise expectationError('in', 'scalar value, collection')
+            raise infixExpectationError('in', 'scalar value, collection')
 
 
 def isNumber(v):
@@ -268,19 +269,19 @@ def accessProperty(value, a, b, is_interval):
             try:
                 return value[a:b]
             except TypeError:
-                raise expectationError('[..]', 'integer')
+                raise infixExpectationError('[..]', 'integer')
         else:
             try:
                 return value[a]
             except IndexError:
                 raise TemplateError('index out of bounds')
             except TypeError:
-                raise expectationError('[..]', 'integer')
+                raise infixExpectationError('[..]', 'integer')
 
     if not isinstance(value, dict):
-        raise expectationError('[..]', 'object, array, or string')
+        raise infixExpectationError('[..]', 'object, array, or string')
     if not isinstance(a, string):
-        raise expectationError('[..]', 'string index')
+        raise infixExpectationError('[..]', 'string index')
 
     try:
         return value[a]
diff --git a/third_party/python/json-e/jsone/prattparser.py b/third_party/python/json-e/jsone/prattparser.py
index 0c871abbadf8..5bf250a8161a 100644
--- a/third_party/python/json-e/jsone/prattparser.py
+++ b/third_party/python/json-e/jsone/prattparser.py
@@ -11,7 +11,7 @@ class SyntaxError(TemplateError):
     @classmethod
     def unexpected(cls, got, exp):
         exp = ', '.join(sorted(exp))
-        return cls('Found {}, expected {}'.format(got, exp))
+        return cls('Found {}, expected {}'.format(got.value, exp))
 
 
 Token = namedtuple('Token', ['kind', 'value', 'start', 'end'])
@@ -92,7 +92,7 @@ class PrattParser(with_metaclass(PrattParserMeta, object)):
         # if there are any tokens remaining, that's an error..
         token = pc.attempt()
         if token:
-            raise SyntaxError.unexpected(token.kind, self.infix_rules)
+            raise SyntaxError.unexpected(token, self.infix_rules)
         return result
 
     def parseUntilTerminator(self, source, terminator):
@@ -100,7 +100,7 @@ class PrattParser(with_metaclass(PrattParserMeta, object)):
         result = pc.parse()
         token = pc.attempt()
         if token.kind != terminator:
-            raise SyntaxError.unexpected(token.kind, [terminator])
+            raise SyntaxError.unexpected(token, [terminator])
         return (result, token.start)
 
     def _generate_tokens(self, source):
@@ -169,7 +169,7 @@ class ParseContext(object):
         if not token:
             raise SyntaxError('Unexpected end of input')
         if kinds and token.kind not in kinds:
-            raise SyntaxError.unexpected(token.kind, kinds)
+            raise SyntaxError.unexpected(token, kinds)
         return token
 
     def parse(self, precedence=None):
@@ -178,7 +178,7 @@ class ParseContext(object):
         token = self.require()
         prefix_rule = parser.prefix_rules.get(token.kind)
         if not prefix_rule:
-            raise SyntaxError.unexpected(token.kind, parser.prefix_rules)
+            raise SyntaxError.unexpected(token, parser.prefix_rules)
         left = prefix_rule(parser, token, self)
         while self.next_token:
             kind = self.next_token.kind
diff --git a/third_party/python/json-e/jsone/render.py b/third_party/python/json-e/jsone/render.py
index c48b96cb5098..5f46bbf5ae92 100644
--- a/third_party/python/json-e/jsone/render.py
+++ b/third_party/python/json-e/jsone/render.py
@@ -72,7 +72,10 @@ def checkUndefinedProperties(template, allowed):
 
 @operator('$eval')
 def eval(template, context):
-    return evaluateExpression(renderValue(template['$eval'], context), context)
+    checkUndefinedProperties(template, ['\$eval'])
+    if not isinstance(template['$eval'], string):
+        raise TemplateError("$eval must be given a string expression")
+    return evaluateExpression(template['$eval'], context)
 
 
 @operator('$flatten')
@@ -140,21 +143,21 @@ def ifConstruct(template, context):
 def jsonConstruct(template, context):
     checkUndefinedProperties(template, ['\$json'])
     value = renderValue(template['$json'], context)
-    return json.dumps(value, separators=(',', ':'))
+    return json.dumps(value, separators=(',', ':'), sort_keys=True)
 
 
 @operator('$let')
 def let(template, context):
     checkUndefinedProperties(template, ['\$let', 'in'])
-    variables = renderValue(template['$let'], context)
-    if not isinstance(variables, dict):
-        raise TemplateError("$let value must evaluate to an object")
-    else:
-        if not all(IDENTIFIER_RE.match(variableNames) for variableNames in variables.keys()):
-            raise TemplateError('top level keys of $let must follow /[a-zA-Z_][a-zA-Z0-9_]*/')
+    if not isinstance(template['$let'], dict):
+        raise TemplateError("$let value must be an object")
 
     subcontext = context.copy()
-    subcontext.update(variables)
+    for k, v in template['$let'].items():
+        if not IDENTIFIER_RE.match(k):
+            raise TemplateError('top level keys of $let must follow /[a-zA-Z_][a-zA-Z0-9_]*/')
+        subcontext[k] = renderValue(v, context)
+
     try:
         in_expression = template['in']
     except KeyError:
@@ -243,7 +246,7 @@ def reverse(template, context):
     checkUndefinedProperties(template, ['\$reverse'])
     value = renderValue(template['$reverse'], context)
     if not isinstance(value, list):
-        raise TemplateError("$reverse value must evaluate to an array")
+        raise TemplateError("$reverse value must evaluate to an array of objects")
     return list(reversed(value))
 
 
@@ -253,7 +256,7 @@ def sort(template, context):
     checkUndefinedProperties(template, ['\$sort', BY_RE])
     value = renderValue(template['$sort'], context)
     if not isinstance(value, list):
-        raise TemplateError("$sort value must evaluate to an array")
+        raise TemplateError('$sorted values to be sorted must have the same type')
 
     # handle by(..) if given, applying the schwartzian transform
     by_keys = [k for k in template if k.startswith('by(')]
@@ -279,9 +282,9 @@ def sort(template, context):
     except IndexError:
         return []
     if eltype in (list, dict, bool, type(None)):
-        raise TemplateError('$sort values must be sortable')
+        raise TemplateError('$sorted values to be sorted must have the same type')
     if not all(isinstance(e[0], eltype) for e in to_sort):
-        raise TemplateError('$sorted values must all have the same type')
+        raise TemplateError('$sorted values to be sorted must have the same type')
 
     # unzip the schwartzian transform
     return list(e[1] for e in sorted(to_sort))
diff --git a/third_party/python/json-e/jsone/shared.py b/third_party/python/json-e/jsone/shared.py
index df6f08d5dfec..0e70e21f8163 100644
--- a/third_party/python/json-e/jsone/shared.py
+++ b/third_party/python/json-e/jsone/shared.py
@@ -28,6 +28,10 @@ class TemplateError(JSONTemplateError):
     pass
 
 
+class InterpreterError(JSONTemplateError):
+    pass
+
+
 # Regular expression matching: X days Y hours Z minutes
 # todo: support hr, wk, yr
 FROMNOW_RE = re.compile(''.join([
@@ -109,7 +113,13 @@ def to_str(v):
 
 def stringDate(date):
     # Convert to isoFormat
-    string = date.isoformat()
+    try:
+        string = date.isoformat(timespec='microseconds')
+    # py2.7 to py3.5 does not have timespec
+    except TypeError as e:
+        string = date.isoformat()
+        if string.find('.') == -1:
+            string += '.000'
     string = datefmt_re.sub(r'\1Z', string)
     return string
 
diff --git a/third_party/rust/serde/.cargo-checksum.json b/third_party/rust/serde/.cargo-checksum.json
index 9d6c69eecd0e..961f58d249c3 100644
--- a/third_party/rust/serde/.cargo-checksum.json
+++ b/third_party/rust/serde/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f98dcc6eedbfb307be98a2d8ca49d3cc10a76a08e7d7dfa2f6ec69987f0c679d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/de/from_primitive.rs":"28ec3ab1c430cf27d632b642ccfccb6d055eeb9fb576e7e446ba24c66f507fb4","src/de/ignored_any.rs":"1b5ee592f5ae58d69e321144d4397f149c047e327529d0b880e1a5285e781a35","src/de/impls.rs":"d220ded8bebc3367c3a0ac1360b59be1b435df40be65a5b688a6ba8108e96bea","src/de/mod.rs":"b8fd19e4a2d40369cb85e3ed6bc5197800c06b2271a846ed6e9b0cb7af41c5f0","src/de/utf8.rs":"956b124b7ce98353cb781b56e43a6fed2e67f1389d35b7a468d5be75b1485853","src/de/value.rs":"fe31174cc41035a1b53d4657b6cae6f3bcb660be39eccaae281a6e3705655578","src/export.rs":"7477f5bd345ca9e0b8d56bccdc62484e42a92fc6cd909bf17fb6e05cd1eb7946","src/lib.rs":"f549fbbd92b2e5e946a327eadf18216b9fe076f569bd623a32872797dc9eb4bc","src/macros.rs":"e1d542b1dac2c1d1f9d5ada7cc5b6639767fc67851421cc3adfb942a7cf750b6","src/private/de.rs":"15b82edcadaa60e748bf6ee0e0e14464cf945f39cb7493d3c1684cc34f6594b6","src/private/macros.rs":"6861a4f332ea24d0ed5db1c28fe3105d2716523902f045c0bbbd439ebf9e44de","src/private/mod.rs":"bcd7c54838e139475c23a323678e20eccbe88c0be93f7977f7675cead4d3b6ed","src/private/ser.rs":"eec5aecf077cebf4dc3fdbe83780f716bf33d311806ee59ce42a0c53c2f92211","src/ser/impls.rs":"dc5219e898d67c9422fef81d1f36d25ea92341c5ad3d976c0017886f371a8d51","src/ser/impossible.rs":"35bd09bb517b28eda0048b0622eb5a0313d5aebf37c03b5a44dbca200d0a9ac8","src/ser/mod.rs":"3d92794f13c8d90c2ebc33716bd6e4d4dde552c6f7de42dfaf9967d8a9ab7d10"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"b5e865ec105f4f546fecdf164172e670b2b82a2533700f556cc1c1c246a4ce14","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/de/from_primitive.rs":"28ec3ab1c430cf27d632b642ccfccb6d055eeb9fb576e7e446ba24c66f507fb4","src/de/ignored_any.rs":"864eaefef0aaae36daf0c2bdee08165dabbf60710f3217142d5e280c0a35c1fe","src/de/impls.rs":"e0d8b5255afb175daf720dd5b1072d2d1888fce6790de57fe51d8d2b51fc1603","src/de/mod.rs":"2984925d7844816cacc290067db049766912d1393732d9df280e6ba020582afc","src/de/utf8.rs":"956b124b7ce98353cb781b56e43a6fed2e67f1389d35b7a468d5be75b1485853","src/de/value.rs":"463e107e9ce9a56cc22901aeb60edbf0d10b144ca03dcdb78988d68f6c96022b","src/export.rs":"dd08253f225862aa5009b27900e04187480c96562c35205b71b36b2ac64c4cce","src/lib.rs":"d8411e8311ec29d8d7184556e014a11f03fe84af26f64daeaf34ad449310084d","src/macros.rs":"e1d542b1dac2c1d1f9d5ada7cc5b6639767fc67851421cc3adfb942a7cf750b6","src/private/de.rs":"55403af32b5b4112ab2203c1598bb033308f8c59ed5c4b5f4730dc2f26d3808d","src/private/macros.rs":"6861a4f332ea24d0ed5db1c28fe3105d2716523902f045c0bbbd439ebf9e44de","src/private/mod.rs":"bcd7c54838e139475c23a323678e20eccbe88c0be93f7977f7675cead4d3b6ed","src/private/ser.rs":"fed0c80a55a214c9bf411fe591f8f99562b01fcd27dfe968f6cc9d694a9c60b2","src/ser/impls.rs":"7eb99e5a74a3fcbb611a6ad762d1915a0ae1f5bb7a95f54115936db3bdde32ca","src/ser/impossible.rs":"009dce92e20bd25335db7d747c595111f5eb8d21dda0f6c75bccf0d0608c5751","src/ser/mod.rs":"b0b970c9e4987db7fbd7bc3bb9f32448e2de864c6596829922cf8fe131dae23d"},"package":"db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"}
\ No newline at end of file
diff --git a/third_party/rust/serde/Cargo.toml b/third_party/rust/serde/Cargo.toml
index 0e44a8db93f2..1741977aa944 100644
--- a/third_party/rust/serde/Cargo.toml
+++ b/third_party/rust/serde/Cargo.toml
@@ -1,68 +1,44 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
 [package]
 name = "serde"
-version = "1.0.23" # remember to update html_root_url
+version = "1.0.27"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
-license = "MIT/Apache-2.0"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "A generic serialization/deserialization framework"
 homepage = "https://serde.rs"
-repository = "https://github.com/serde-rs/serde"
 documentation = "https://docs.serde.rs/serde/"
+readme = "README.md"
 keywords = ["serde", "serialization", "no_std"]
 categories = ["encoding"]
-readme = "README.md"
-include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
-
-[badges]
-travis-ci = { repository = "serde-rs/serde" }
-appveyor = { repository = "serde-rs/serde" }
-
-[dependencies]
-serde_derive = { version = "1.0", optional = true, path = "../serde_derive" }
-
-[dev-dependencies]
-serde_derive = { version = "1.0", path = "../serde_derive" }
-
-
-### FEATURES #################################################################
+license = "MIT/Apache-2.0"
+repository = "https://github.com/serde-rs/serde"
+[dependencies.serde_derive]
+version = "1.0"
+optional = true
+[dev-dependencies.serde_derive]
+version = "1.0"
 
 [features]
-default = ["std"]
-
-# Re-export the derive(Serialize, Deserialize) macros. This is specifically
-# intended for library crates that provide optional Serde impls behind a Cargo
-# cfg of their own. All other crates should depend on serde_derive directly.
-#
-# Please refer to the long comment above the line `pub use serde_derive::*` in
-# src/lib.rs before enabling this feature. If you think you need this feature
-# and your use case does not precisely match the one described in the comment,
-# please open an issue to let us know about your use case.
-derive = ["serde_derive"]
-
-# Provide impls for common standard library types like Vec<T> and HashMap<K, V>.
-# Requires a dependency on the Rust standard library.
-std = []
-
-# Provide impls for types that require unstable functionality. For tracking and
-# discussion of unstable functionality please refer to this issue:
-#
-#    https://github.com/serde-rs/serde/issues/812
-unstable = []
-
-# Provide impls for types in the Rust core allocation and collections library
-# including String, Box<T>, Vec<T>, and Cow<T>. This is a subset of std but may
-# be enabled without depending on all of std.
-#
-# Requires a dependency on the unstable core allocation library:
-#
-#    https://doc.rust-lang.org/alloc/
 alloc = ["unstable"]
-
-# Opt into impls for Rc<T> and Arc<T>. Serializing and deserializing these types
-# does not preserve identity and may result in multiple copies of the same data.
-# Be sure that this is what you want before enabling this feature.
-rc = []
-
-# Get serde_derive picked up by the Integer 32 playground. Not public API.
-#
-#    http://play.integer32.com/
+default = ["std"]
+derive = ["serde_derive"]
 playground = ["serde_derive"]
+rc = []
+std = []
+unstable = []
+[badges.appveyor]
+repository = "serde-rs/serde"
+
+[badges.travis-ci]
+repository = "serde-rs/serde"
diff --git a/third_party/rust/serde/src/de/ignored_any.rs b/third_party/rust/serde/src/de/ignored_any.rs
index a4f3abe26479..20b06b90bd58 100644
--- a/third_party/rust/serde/src/de/ignored_any.rs
+++ b/third_party/rust/serde/src/de/ignored_any.rs
@@ -8,7 +8,7 @@
 
 use lib::*;
 
-use de::{Deserialize, Deserializer, Visitor, SeqAccess, MapAccess, Error};
+use de::{Deserialize, Deserializer, Error, MapAccess, SeqAccess, Visitor};
 
 /// An efficient way of discarding data from a deserializer.
 ///
diff --git a/third_party/rust/serde/src/de/impls.rs b/third_party/rust/serde/src/de/impls.rs
index c7ea2ede2f44..d872cbe61e1c 100644
--- a/third_party/rust/serde/src/de/impls.rs
+++ b/third_party/rust/serde/src/de/impls.rs
@@ -15,7 +15,7 @@ use de::{Deserialize, Deserializer, EnumAccess, Error, SeqAccess, Unexpected, Va
 use de::MapAccess;
 
 use de::from_primitive::FromPrimitive;
-use private::de::DeserializeFromSeed;
+use private::de::InPlaceSeed;
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 use private::de::size_hint;
@@ -52,7 +52,6 @@ impl<'de> Deserialize<'de> for () {
 
 struct BoolVisitor;
 
-
 impl<'de> Visitor<'de> for BoolVisitor {
     type Value = bool;
 
@@ -213,7 +212,7 @@ impl<'de> Deserialize<'de> for char {
 #[cfg(any(feature = "std", feature = "alloc"))]
 struct StringVisitor;
 #[cfg(any(feature = "std", feature = "alloc"))]
-struct StringFromVisitor<'a>(&'a mut String);
+struct StringInPlaceVisitor<'a>(&'a mut String);
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 impl<'de> Visitor<'de> for StringVisitor {
@@ -253,13 +252,16 @@ impl<'de> Visitor<'de> for StringVisitor {
     {
         match String::from_utf8(v) {
             Ok(s) => Ok(s),
-            Err(e) => Err(Error::invalid_value(Unexpected::Bytes(&e.into_bytes()), &self),),
+            Err(e) => Err(Error::invalid_value(
+                Unexpected::Bytes(&e.into_bytes()),
+                &self,
+            )),
         }
     }
 }
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-impl<'a, 'de> Visitor<'de> for StringFromVisitor<'a> {
+impl<'a, 'de> Visitor<'de> for StringInPlaceVisitor<'a> {
     type Value = ();
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -306,7 +308,10 @@ impl<'a, 'de> Visitor<'de> for StringFromVisitor<'a> {
                 *self.0 = s;
                 Ok(())
             }
-            Err(e) => Err(Error::invalid_value(Unexpected::Bytes(&e.into_bytes()), &self),),
+            Err(e) => Err(Error::invalid_value(
+                Unexpected::Bytes(&e.into_bytes()),
+                &self,
+            )),
         }
     }
 }
@@ -320,11 +325,11 @@ impl<'de> Deserialize<'de> for String {
         deserializer.deserialize_string(StringVisitor)
     }
 
-    fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
+    fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
     where
         D: Deserializer<'de>,
     {
-        deserializer.deserialize_string(StringFromVisitor(self))
+        deserializer.deserialize_string(StringInPlaceVisitor(place))
     }
 }
 
@@ -485,7 +490,6 @@ forwarded_impl!((), Box<CStr>, CString::into_boxed_c_str);
 struct OptionVisitor<T> {
     marker: PhantomData<T>,
 }
-struct OptionFromVisitor<'a, T: 'a>(&'a mut Option<T>);
 
 impl<'de, T> Visitor<'de> for OptionVisitor<T>
 where
@@ -522,49 +526,6 @@ where
     }
 }
 
-impl<'a, 'de, T> Visitor<'de> for OptionFromVisitor<'a, T>
-where
-    T: Deserialize<'de>,
-{
-    type Value = ();
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("option")
-    }
-
-    #[inline]
-    fn visit_unit<E>(self) -> Result<(), E>
-    where
-        E: Error,
-    {
-        *self.0 = None;
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_none<E>(self) -> Result<(), E>
-    where
-        E: Error,
-    {
-        *self.0 = None;
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_some<D>(self, deserializer: D) -> Result<(), D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        // The some enum's repr is opaque, so we can't play cute tricks with
-        // its tag to build this in place unconditionally.
-        //
-        // FIXME: investigate whether branching on the old value being Some to
-        // deserialize_from the value is profitable (probably data-dependent?)
-        *self.0 = try!(T::deserialize(deserializer).map(Some));
-        Ok(())
-    }
-}
-
 impl<'de, T> Deserialize<'de> for Option<T>
 where
     T: Deserialize<'de>,
@@ -573,24 +534,25 @@ where
     where
         D: Deserializer<'de>,
     {
-        deserializer.deserialize_option(OptionVisitor { marker: PhantomData })
+        deserializer.deserialize_option(OptionVisitor {
+            marker: PhantomData,
+        })
     }
 
-    fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        deserializer.deserialize_option(OptionFromVisitor(self))
-    }
+    // The Some variant's repr is opaque, so we can't play cute tricks with its
+    // tag to have deserialize_in_place build the content in place unconditionally.
+    //
+    // FIXME: investigate whether branching on the old value being Some to
+    // deserialize_in_place the value is profitable (probably data-dependent?)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-struct PhantomDataVisitor<T> {
+struct PhantomDataVisitor<T: ?Sized> {
     marker: PhantomData<T>,
 }
 
-impl<'de, T> Visitor<'de> for PhantomDataVisitor<T> {
+impl<'de, T: ?Sized> Visitor<'de> for PhantomDataVisitor<T> {
     type Value = PhantomData<T>;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -606,12 +568,14 @@ impl<'de, T> Visitor<'de> for PhantomDataVisitor<T> {
     }
 }
 
-impl<'de, T> Deserialize<'de> for PhantomData<T> {
+impl<'de, T: ?Sized> Deserialize<'de> for PhantomData<T> {
     fn deserialize<D>(deserializer: D) -> Result<PhantomData<T>, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let visitor = PhantomDataVisitor { marker: PhantomData };
+        let visitor = PhantomDataVisitor {
+            marker: PhantomData,
+        };
         deserializer.deserialize_unit_struct("PhantomData", visitor)
     }
 }
@@ -672,13 +636,13 @@ macro_rules! seq_impl {
                 deserializer.deserialize_seq(visitor)
             }
 
-            fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
+            fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
             where
                 D: Deserializer<'de>,
             {
-                struct SeqVisitor<'a, T: 'a $(, $typaram: 'a)*>(&'a mut $ty<T $(, $typaram)*>);
+                struct SeqInPlaceVisitor<'a, T: 'a $(, $typaram: 'a)*>(&'a mut $ty<T $(, $typaram)*>);
 
-                impl<'a, 'de, T $(, $typaram)*> Visitor<'de> for SeqVisitor<'a, T $(, $typaram)*>
+                impl<'a, 'de, T $(, $typaram)*> Visitor<'de> for SeqInPlaceVisitor<'a, T $(, $typaram)*>
                 where
                     T: Deserialize<'de> $(+ $tbound1 $(+ $tbound2)*)*,
                     $($typaram: $bound1 $(+ $bound2)*,)*
@@ -706,7 +670,7 @@ macro_rules! seq_impl {
                     }
                 }
 
-                deserializer.deserialize_seq(SeqVisitor(self))
+                deserializer.deserialize_seq(SeqInPlaceVisitor(place))
             }
         }
     }
@@ -714,7 +678,7 @@ macro_rules! seq_impl {
 
 // Dummy impl of reserve
 #[cfg(any(feature = "std", feature = "alloc"))]
-fn nop_reserve<T, U>(_x: T, _y: U) { }
+fn nop_reserve<T>(_seq: T, _n: usize) {}
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 seq_impl!(
@@ -744,7 +708,8 @@ seq_impl!(
     LinkedList::clear,
     LinkedList::new(),
     nop_reserve,
-    LinkedList::push_back);
+    LinkedList::push_back
+);
 
 #[cfg(feature = "std")]
 seq_impl!(
@@ -764,7 +729,8 @@ seq_impl!(
     Vec::clear,
     Vec::with_capacity(size_hint::cautious(seq.size_hint())),
     Vec::reserve,
-    Vec::push);
+    Vec::push
+);
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 seq_impl!(
@@ -774,18 +740,21 @@ seq_impl!(
     VecDeque::clear,
     VecDeque::with_capacity(size_hint::cautious(seq.size_hint())),
     VecDeque::reserve,
-    VecDeque::push_back);
+    VecDeque::push_back
+);
 
 ////////////////////////////////////////////////////////////////////////////////
 
 struct ArrayVisitor<A> {
     marker: PhantomData<A>,
 }
-struct ArrayFromVisitor<'a, A: 'a>(&'a mut A);
+struct ArrayInPlaceVisitor<'a, A: 'a>(&'a mut A);
 
 impl<A> ArrayVisitor<A> {
     fn new() -> Self {
-        ArrayVisitor { marker: PhantomData }
+        ArrayVisitor {
+            marker: PhantomData,
+        }
     }
 }
 
@@ -844,7 +813,7 @@ macro_rules! array_impls {
                 }
             }
 
-            impl<'a, 'de, T> Visitor<'de> for ArrayFromVisitor<'a, [T; $len]>
+            impl<'a, 'de, T> Visitor<'de> for ArrayInPlaceVisitor<'a, [T; $len]>
             where
                 T: Deserialize<'de>,
             {
@@ -861,7 +830,7 @@ macro_rules! array_impls {
                 {
                     let mut fail_idx = None;
                     for (idx, dest) in self.0[..].iter_mut().enumerate() {
-                        if try!(seq.next_element_seed(DeserializeFromSeed(dest))).is_none() {
+                        if try!(seq.next_element_seed(InPlaceSeed(dest))).is_none() {
                             fail_idx = Some(idx);
                             break;
                         }
@@ -884,11 +853,11 @@ macro_rules! array_impls {
                     deserializer.deserialize_tuple($len, ArrayVisitor::<[T; $len]>::new())
                 }
 
-                fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
+                fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
                 where
                     D: Deserializer<'de>,
                 {
-                    deserializer.deserialize_tuple($len, ArrayFromVisitor(self))
+                    deserializer.deserialize_tuple($len, ArrayInPlaceVisitor(place))
                 }
             }
         )+
@@ -973,13 +942,13 @@ macro_rules! tuple_impls {
                 }
 
                 #[inline]
-                fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
+                fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
                 where
                     D: Deserializer<'de>,
                 {
-                    struct TupleVisitor<'a, $($name: 'a,)+>(&'a mut ($($name,)+));
+                    struct TupleInPlaceVisitor<'a, $($name: 'a,)+>(&'a mut ($($name,)+));
 
-                    impl<'a, 'de, $($name: Deserialize<'de>),+> Visitor<'de> for TupleVisitor<'a, $($name,)+> {
+                    impl<'a, 'de, $($name: Deserialize<'de>),+> Visitor<'de> for TupleInPlaceVisitor<'a, $($name,)+> {
                         type Value = ();
 
                         fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -993,7 +962,7 @@ macro_rules! tuple_impls {
                             A: SeqAccess<'de>,
                         {
                             $(
-                                if try!(seq.next_element_seed(DeserializeFromSeed(&mut (self.0).$n))).is_none() {
+                                if try!(seq.next_element_seed(InPlaceSeed(&mut (self.0).$n))).is_none() {
                                     return Err(Error::invalid_length($n, &self));
                                 }
                             )+
@@ -1002,7 +971,7 @@ macro_rules! tuple_impls {
                         }
                     }
 
-                    deserializer.deserialize_tuple($len, TupleVisitor(self))
+                    deserializer.deserialize_tuple($len, TupleInPlaceVisitor(place))
                 }
             }
         )+
@@ -1302,7 +1271,12 @@ impl<'de> Deserialize<'de> for net::SocketAddr {
 parse_socket_impl!(net::SocketAddrV4, net::SocketAddrV4::new);
 
 #[cfg(feature = "std")]
-parse_socket_impl!(net::SocketAddrV6, |ip, port| net::SocketAddrV6::new(ip, port, 0, 0));
+parse_socket_impl!(net::SocketAddrV6, |ip, port| net::SocketAddrV6::new(
+    ip,
+    port,
+    0,
+    0
+));
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -1413,7 +1387,9 @@ impl<'de> Visitor<'de> for OsStringVisitor {
 
         match try!(data.variant()) {
             (OsStringKind::Unix, v) => v.newtype_variant().map(OsString::from_vec),
-            (OsStringKind::Windows, _) => Err(Error::custom("cannot deserialize Windows OS string on Unix",),),
+            (OsStringKind::Windows, _) => Err(Error::custom(
+                "cannot deserialize Windows OS string on Unix",
+            )),
         }
     }
 
@@ -1425,11 +1401,11 @@ impl<'de> Visitor<'de> for OsStringVisitor {
         use std::os::windows::ffi::OsStringExt;
 
         match try!(data.variant()) {
-            (OsStringKind::Windows, v) => {
-                v.newtype_variant::<Vec<u16>>()
-                    .map(|vec| OsString::from_wide(&vec))
-            }
-            (OsStringKind::Unix, _) => Err(Error::custom("cannot deserialize Unix OS string on Windows",),),
+            (OsStringKind::Windows, v) => v.newtype_variant::<Vec<u16>>()
+                .map(|vec| OsString::from_wide(&vec)),
+            (OsStringKind::Unix, _) => Err(Error::custom(
+                "cannot deserialize Unix OS string on Windows",
+            )),
         }
     }
 }
@@ -1755,13 +1731,17 @@ impl<'de> Deserialize<'de> for SystemTime {
                     match key {
                         Field::Secs => {
                             if secs.is_some() {
-                                return Err(<A::Error as Error>::duplicate_field("secs_since_epoch"));
+                                return Err(<A::Error as Error>::duplicate_field(
+                                    "secs_since_epoch",
+                                ));
                             }
                             secs = Some(try!(map.next_value()));
                         }
                         Field::Nanos => {
                             if nanos.is_some() {
-                                return Err(<A::Error as Error>::duplicate_field("nanos_since_epoch"));
+                                return Err(<A::Error as Error>::duplicate_field(
+                                    "nanos_since_epoch",
+                                ));
                             }
                             nanos = Some(try!(map.next_value()));
                         }
@@ -1925,7 +1905,13 @@ where
         }
 
         const FIELDS: &'static [&'static str] = &["start", "end"];
-        deserializer.deserialize_struct("Range", FIELDS, RangeVisitor { phantom: PhantomData })
+        deserializer.deserialize_struct(
+            "Range",
+            FIELDS,
+            RangeVisitor {
+                phantom: PhantomData,
+            },
+        )
     }
 }
 
@@ -1990,9 +1976,10 @@ where
                         match value {
                             0 => Ok(Field::Ok),
                             1 => Ok(Field::Err),
-                            _ => {
-                                Err(Error::invalid_value(Unexpected::Unsigned(value as u64), &self),)
-                            }
+                            _ => Err(Error::invalid_value(
+                                Unexpected::Unsigned(value as u64),
+                                &self,
+                            )),
                         }
                     }
 
@@ -2014,14 +2001,12 @@ where
                         match value {
                             b"Ok" => Ok(Field::Ok),
                             b"Err" => Ok(Field::Err),
-                            _ => {
-                                match str::from_utf8(value) {
-                                    Ok(value) => Err(Error::unknown_variant(value, VARIANTS)),
-                                    Err(_) => {
-                                        Err(Error::invalid_value(Unexpected::Bytes(value), &self))
-                                    }
+                            _ => match str::from_utf8(value) {
+                                Ok(value) => Err(Error::unknown_variant(value, VARIANTS)),
+                                Err(_) => {
+                                    Err(Error::invalid_value(Unexpected::Bytes(value), &self))
                                 }
-                            }
+                            },
                         }
                     }
                 }
@@ -2065,7 +2050,7 @@ where
 #[cfg(feature = "std")]
 impl<'de, T> Deserialize<'de> for Wrapping<T>
 where
-    T: Deserialize<'de>
+    T: Deserialize<'de>,
 {
     fn deserialize<D>(deserializer: D) -> Result<Wrapping<T>, D::Error>
     where
diff --git a/third_party/rust/serde/src/de/mod.rs b/third_party/rust/serde/src/de/mod.rs
index aa1cc3af7945..fe5b35b3ee04 100644
--- a/third_party/rust/serde/src/de/mod.rs
+++ b/third_party/rust/serde/src/de/mod.rs
@@ -518,19 +518,19 @@ pub trait Deserialize<'de>: Sized {
     /// when the next deserialization occurs.
     ///
     /// If you manually implement this, your recursive deserializations should
-    /// use `deserialize_from`.
+    /// use `deserialize_in_place`.
     ///
-    /// TODO: example
-    ///
-    /// ```
-    /// // Something with a loop that returns on error.
-    ///
-    /// ```
-    fn deserialize_from<D>(&mut self, deserializer: D) -> Result<(), D::Error>
-        where D: Deserializer<'de>
+    /// This method is stable and an official public API, but hidden from the
+    /// documentation because it is almost never what newbies are looking for.
+    /// Showing it in rustdoc would cause it to be featured more prominently
+    /// than it deserves.
+    #[doc(hidden)]
+    fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
+    where
+        D: Deserializer<'de>,
     {
         // Default implementation just delegates to `deserialize` impl.
-        *self = Deserialize::deserialize(deserializer)?;
+        *place = Deserialize::deserialize(deserializer)?;
         Ok(())
     }
 }
@@ -1107,7 +1107,9 @@ pub trait Deserializer<'de>: Sized {
     /// change, as a value serialized in human-readable mode is not required to
     /// deserialize from the same data in compact mode.
     #[inline]
-    fn is_human_readable(&self) -> bool { true }
+    fn is_human_readable(&self) -> bool {
+        true
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/third_party/rust/serde/src/de/value.rs b/third_party/rust/serde/src/de/value.rs
index 241d4df8a5f1..6dd1d21f02e0 100644
--- a/third_party/rust/serde/src/de/value.rs
+++ b/third_party/rust/serde/src/de/value.rs
@@ -37,7 +37,7 @@
 
 use lib::*;
 
-use de::{self, IntoDeserializer, Expected, SeqAccess};
+use de::{self, Expected, IntoDeserializer, SeqAccess};
 use private::de::size_hint;
 use ser;
 use self::private::{First, Second};
@@ -62,7 +62,9 @@ impl de::Error for Error {
     where
         T: Display,
     {
-        Error { err: msg.to_string().into_boxed_str() }
+        Error {
+            err: msg.to_string().into_boxed_str(),
+        }
     }
 
     #[cfg(not(any(feature = "std", feature = "alloc")))]
@@ -112,7 +114,9 @@ where
     type Deserializer = UnitDeserializer<E>;
 
     fn into_deserializer(self) -> UnitDeserializer<E> {
-        UnitDeserializer { marker: PhantomData }
+        UnitDeserializer {
+            marker: PhantomData,
+        }
     }
 }
 
@@ -658,7 +662,10 @@ where
         } else {
             // First argument is the number of elements in the data, second
             // argument is the number of elements expected by the Deserialize.
-            Err(de::Error::invalid_length(self.count + remaining, &ExpectedInSeq(self.count)),)
+            Err(de::Error::invalid_length(
+                self.count + remaining,
+                &ExpectedInSeq(self.count),
+            ))
         }
     }
 }
@@ -852,7 +859,10 @@ where
         } else {
             // First argument is the number of elements in the data, second
             // argument is the number of elements expected by the Deserialize.
-            Err(de::Error::invalid_length(self.count + remaining, &ExpectedInMap(self.count)),)
+            Err(de::Error::invalid_length(
+                self.count + remaining,
+                &ExpectedInMap(self.count),
+            ))
         }
     }
 }
@@ -901,11 +911,7 @@ where
         Ok(value)
     }
 
-    fn deserialize_tuple<V>(
-        self,
-        len: usize,
-        visitor: V,
-    ) -> Result<V::Value, Self::Error>
+    fn deserialize_tuple<V>(self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: de::Visitor<'de>,
     {
@@ -1223,7 +1229,12 @@ mod private {
     }
 
     pub fn unit_only<T, E>(t: T) -> (T, UnitOnly<E>) {
-        (t, UnitOnly { marker: PhantomData })
+        (
+            t,
+            UnitOnly {
+                marker: PhantomData,
+            },
+        )
     }
 
     impl<'de, E> de::VariantAccess<'de> for UnitOnly<E>
@@ -1240,14 +1251,20 @@ mod private {
         where
             T: de::DeserializeSeed<'de>,
         {
-            Err(de::Error::invalid_type(Unexpected::UnitVariant, &"newtype variant"),)
+            Err(de::Error::invalid_type(
+                Unexpected::UnitVariant,
+                &"newtype variant",
+            ))
         }
 
         fn tuple_variant<V>(self, _len: usize, _visitor: V) -> Result<V::Value, Self::Error>
         where
             V: de::Visitor<'de>,
         {
-            Err(de::Error::invalid_type(Unexpected::UnitVariant, &"tuple variant"),)
+            Err(de::Error::invalid_type(
+                Unexpected::UnitVariant,
+                &"tuple variant",
+            ))
         }
 
         fn struct_variant<V>(
@@ -1258,7 +1275,10 @@ mod private {
         where
             V: de::Visitor<'de>,
         {
-            Err(de::Error::invalid_type(Unexpected::UnitVariant, &"struct variant"),)
+            Err(de::Error::invalid_type(
+                Unexpected::UnitVariant,
+                &"struct variant",
+            ))
         }
     }
 
diff --git a/third_party/rust/serde/src/export.rs b/third_party/rust/serde/src/export.rs
index cb416d9f094a..772f310330e4 100644
--- a/third_party/rust/serde/src/export.rs
+++ b/third_party/rust/serde/src/export.rs
@@ -12,7 +12,7 @@ pub use lib::default::Default;
 pub use lib::fmt::{self, Formatter};
 pub use lib::marker::PhantomData;
 pub use lib::option::Option::{self, None, Some};
-pub use lib::result::Result::{self, Ok, Err};
+pub use lib::result::Result::{self, Err, Ok};
 
 pub use self::string::from_utf8_lossy;
 
diff --git a/third_party/rust/serde/src/lib.rs b/third_party/rust/serde/src/lib.rs
index 5aa38ce1dc80..b68f2574de77 100644
--- a/third_party/rust/serde/src/lib.rs
+++ b/third_party/rust/serde/src/lib.rs
@@ -79,30 +79,21 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.23")]
-
+#![doc(html_root_url = "https://docs.rs/serde/1.0.27")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
-
 // Unstable functionality only if the user asks for it. For tracking and
 // discussion of these features please refer to this issue:
 //
 //    https://github.com/serde-rs/serde/issues/812
 #![cfg_attr(feature = "unstable", feature(nonzero, specialization))]
 #![cfg_attr(feature = "alloc", feature(alloc))]
-
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Whitelisted clippy lints
-#![cfg_attr(feature = "cargo-clippy", allow(
-    cast_lossless,
-    const_static_lifetime,
-    doc_markdown,
-    linkedlist,
-    needless_pass_by_value,
-    type_complexity,
-    unreadable_literal,
-    zero_prefixed_literal,
-))]
+#![cfg_attr(feature = "cargo-clippy",
+            allow(cast_lossless, const_static_lifetime, doc_markdown, linkedlist,
+                  needless_pass_by_value, type_complexity, unreadable_literal,
+                  zero_prefixed_literal))]
 // Whitelisted clippy_pedantic lints
 #![cfg_attr(feature = "cargo-clippy", allow(
 // integer and float ser/de requires these sorts of casts
@@ -125,7 +116,6 @@
     empty_enum,
     use_debug,
 ))]
-
 // Blacklisted Rust lints.
 #![deny(missing_docs, unused_imports)]
 
@@ -149,8 +139,8 @@ mod lib {
     }
 
     pub use self::core::{cmp, iter, mem, ops, slice, str};
-    pub use self::core::{i8, i16, i32, i64, isize};
-    pub use self::core::{u8, u16, u32, u64, usize};
+    pub use self::core::{isize, i16, i32, i64, i8};
+    pub use self::core::{usize, u16, u32, u64, u8};
     pub use self::core::{f32, f64};
 
     pub use self::core::cell::{Cell, RefCell};
@@ -193,9 +183,9 @@ mod lib {
     pub use alloc::arc::Arc;
 
     #[cfg(feature = "std")]
-    pub use std::collections::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque};
+    pub use std::collections::{BTreeMap, BTreeSet, BinaryHeap, LinkedList, VecDeque};
     #[cfg(all(feature = "alloc", not(feature = "std")))]
-    pub use alloc::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque};
+    pub use alloc::{BTreeMap, BTreeSet, BinaryHeap, LinkedList, VecDeque};
 
     #[cfg(feature = "std")]
     pub use std::{error, net};
@@ -203,9 +193,9 @@ mod lib {
     #[cfg(feature = "std")]
     pub use std::collections::{HashMap, HashSet};
     #[cfg(feature = "std")]
-    pub use std::ffi::{CString, CStr, OsString, OsStr};
+    pub use std::ffi::{CStr, CString, OsStr, OsString};
     #[cfg(feature = "std")]
-    pub use std::hash::{Hash, BuildHasher};
+    pub use std::hash::{BuildHasher, Hash};
     #[cfg(feature = "std")]
     pub use std::io::Write;
     #[cfg(feature = "std")]
diff --git a/third_party/rust/serde/src/private/de.rs b/third_party/rust/serde/src/private/de.rs
index a3134e69ffef..33b91a478ecd 100644
--- a/third_party/rust/serde/src/private/de.rs
+++ b/third_party/rust/serde/src/private/de.rs
@@ -8,16 +8,16 @@
 
 use lib::*;
 
-use de::{Deserialize, Deserializer, DeserializeSeed, IntoDeserializer, Error, Visitor};
+use de::{Deserialize, DeserializeSeed, Deserializer, Error, IntoDeserializer, Visitor};
 
 #[cfg(any(feature = "std", feature = "alloc"))]
 use de::Unexpected;
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub use self::content::{Content, ContentRefDeserializer, ContentDeserializer,
-                        TaggedContentVisitor, TagOrContentField, TagOrContentFieldVisitor,
-                        TagContentOtherField, TagContentOtherFieldVisitor,
-                        InternallyTaggedUnitVisitor, UntaggedUnitVisitor};
+pub use self::content::{Content, ContentDeserializer, ContentRefDeserializer,
+                        InternallyTaggedUnitVisitor, TagContentOtherField,
+                        TagContentOtherFieldVisitor, TagOrContentField, TagOrContentFieldVisitor,
+                        TaggedContentVisitor, UntaggedUnitVisitor};
 
 /// If the missing field is of type `Option<T>` then treat is as `None`,
 /// otherwise it is an error.
@@ -120,7 +120,10 @@ where
         {
             match String::from_utf8(v) {
                 Ok(s) => Ok(Cow::Owned(s)),
-                Err(e) => Err(Error::invalid_value(Unexpected::Bytes(&e.into_bytes()), &self),),
+                Err(e) => Err(Error::invalid_value(
+                    Unexpected::Bytes(&e.into_bytes()),
+                    &self,
+                )),
             }
         }
     }
@@ -225,8 +228,8 @@ mod content {
 
     use lib::*;
 
-    use de::{self, Deserialize, DeserializeSeed, Deserializer, Visitor, SeqAccess, MapAccess,
-             EnumAccess, Unexpected};
+    use de::{self, Deserialize, DeserializeSeed, Deserializer, EnumAccess, MapAccess, SeqAccess,
+             Unexpected, Visitor};
     use super::size_hint;
 
     /// Used from generated code to buffer the contents of the Deserializer when
@@ -502,7 +505,9 @@ mod content {
         where
             V: EnumAccess<'de>,
         {
-            Err(de::Error::custom("untagged and internally tagged enums do not support enum input",),)
+            Err(de::Error::custom(
+                "untagged and internally tagged enums do not support enum input",
+            ))
         }
     }
 
@@ -521,7 +526,10 @@ mod content {
 
     impl<'de> TagOrContentVisitor<'de> {
         fn new(name: &'static str) -> Self {
-            TagOrContentVisitor { name: name, value: PhantomData }
+            TagOrContentVisitor {
+                name: name,
+                value: PhantomData,
+            }
         }
     }
 
@@ -558,7 +566,9 @@ mod content {
         where
             F: de::Error,
         {
-            ContentVisitor::new().visit_i8(value).map(TagOrContent::Content)
+            ContentVisitor::new()
+                .visit_i8(value)
+                .map(TagOrContent::Content)
         }
 
         fn visit_i16<F>(self, value: i16) -> Result<Self::Value, F>
@@ -592,7 +602,9 @@ mod content {
         where
             F: de::Error,
         {
-            ContentVisitor::new().visit_u8(value).map(TagOrContent::Content)
+            ContentVisitor::new()
+                .visit_u8(value)
+                .map(TagOrContent::Content)
         }
 
         fn visit_u16<F>(self, value: u16) -> Result<Self::Value, F>
@@ -731,14 +743,18 @@ mod content {
         where
             F: de::Error,
         {
-            ContentVisitor::new().visit_unit().map(TagOrContent::Content)
+            ContentVisitor::new()
+                .visit_unit()
+                .map(TagOrContent::Content)
         }
 
         fn visit_none<F>(self) -> Result<Self::Value, F>
         where
             F: de::Error,
         {
-            ContentVisitor::new().visit_none().map(TagOrContent::Content)
+            ContentVisitor::new()
+                .visit_none()
+                .map(TagOrContent::Content)
         }
 
         fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -861,8 +877,7 @@ mod content {
         {
             let mut tag = None;
             let mut vec = Vec::with_capacity(size_hint::cautious(map.size_hint()));
-            while let Some(k) =
-                try!(map.next_key_seed(TagOrContentVisitor::new(self.tag_name))) {
+            while let Some(k) = try!(map.next_key_seed(TagOrContentVisitor::new(self.tag_name))) {
                 match k {
                     TagOrContent::Tag => {
                         if tag.is_some() {
@@ -878,14 +893,10 @@ mod content {
             }
             match tag {
                 None => Err(de::Error::missing_field(self.tag_name)),
-                Some(tag) => {
-                    Ok(
-                        TaggedContent {
-                            tag: tag,
-                            content: Content::Map(vec),
-                        },
-                    )
-                }
+                Some(tag) => Ok(TaggedContent {
+                    tag: tag,
+                    content: Content::Map(vec),
+                }),
             }
         }
     }
@@ -967,7 +978,11 @@ mod content {
         type Value = TagContentOtherField;
 
         fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            write!(formatter, "{:?}, {:?}, or other ignored fields", self.tag, self.content)
+            write!(
+                formatter,
+                "{:?}, {:?}, or other ignored fields",
+                self.tag, self.content
+            )
         }
 
         fn visit_str<E>(self, field: &str) -> Result<Self::Value, E>
@@ -1031,10 +1046,8 @@ mod content {
                     Ok(value)
                 }
                 Content::Map(v) => {
-                    let map = v.into_iter().map(|(k, v)| {
-                                                    (ContentDeserializer::new(k),
-                                                    ContentDeserializer::new(v))
-                                                });
+                    let map = v.into_iter()
+                        .map(|(k, v)| (ContentDeserializer::new(k), ContentDeserializer::new(v)));
                     let mut map_visitor = de::value::MapDeserializer::new(map);
                     let value = try!(visitor.visit_map(&mut map_visitor));
                     try!(map_visitor.end());
@@ -1081,44 +1094,41 @@ mod content {
                     let (variant, value) = match iter.next() {
                         Some(v) => v,
                         None => {
-                            return Err(
-                                de::Error::invalid_value(
-                                    de::Unexpected::Map,
-                                    &"map with a single key",
-                                ),
-                            );
+                            return Err(de::Error::invalid_value(
+                                de::Unexpected::Map,
+                                &"map with a single key",
+                            ));
                         }
                     };
                     // enums are encoded in json as maps with a single key:value pair
                     if iter.next().is_some() {
-                        return Err(
-                            de::Error::invalid_value(
-                                de::Unexpected::Map,
-                                &"map with a single key",
-                            ),
-                        );
+                        return Err(de::Error::invalid_value(
+                            de::Unexpected::Map,
+                            &"map with a single key",
+                        ));
                     }
                     (variant, Some(value))
                 }
                 s @ Content::String(_) | s @ Content::Str(_) => (s, None),
                 other => {
-                    return Err(de::Error::invalid_type(other.unexpected(), &"string or map"),);
+                    return Err(de::Error::invalid_type(
+                        other.unexpected(),
+                        &"string or map",
+                    ));
                 }
             };
 
-            visitor.visit_enum(
-                EnumDeserializer {
-                    variant: variant,
-                    value: value,
-                    err: PhantomData,
-                },
-            )
+            visitor.visit_enum(EnumDeserializer {
+                variant: variant,
+                value: value,
+                err: PhantomData,
+            })
         }
 
         fn deserialize_unit_struct<V>(
             self,
             _name: &'static str,
-            visitor: V
+            visitor: V,
         ) -> Result<V::Value, Self::Error>
         where
             V: Visitor<'de>,
@@ -1216,9 +1226,10 @@ mod content {
         {
             match self.value {
                 Some(value) => seed.deserialize(ContentDeserializer::new(value)),
-                None => {
-                    Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"newtype variant"),)
-                }
+                None => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"newtype variant",
+                )),
             }
         }
 
@@ -1230,8 +1241,14 @@ mod content {
                 Some(Content::Seq(v)) => {
                     de::Deserializer::deserialize_any(SeqDeserializer::new(v), visitor)
                 }
-                Some(other) => Err(de::Error::invalid_type(other.unexpected(), &"tuple variant"),),
-                None => Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"tuple variant"),),
+                Some(other) => Err(de::Error::invalid_type(
+                    other.unexpected(),
+                    &"tuple variant",
+                )),
+                None => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"tuple variant",
+                )),
             }
         }
 
@@ -1250,8 +1267,14 @@ mod content {
                 Some(Content::Seq(v)) => {
                     de::Deserializer::deserialize_any(SeqDeserializer::new(v), visitor)
                 }
-                Some(other) => Err(de::Error::invalid_type(other.unexpected(), &"struct variant"),),
-                _ => Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"struct variant"),),
+                Some(other) => Err(de::Error::invalid_type(
+                    other.unexpected(),
+                    &"struct variant",
+                )),
+                _ => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"struct variant",
+                )),
             }
         }
     }
@@ -1319,10 +1342,7 @@ mod content {
             T: de::DeserializeSeed<'de>,
         {
             match self.iter.next() {
-                Some(value) => {
-                    seed.deserialize(ContentDeserializer::new(value))
-                        .map(Some)
-                }
+                Some(value) => seed.deserialize(ContentDeserializer::new(value)).map(Some),
                 None => Ok(None),
             }
         }
@@ -1458,12 +1478,12 @@ mod content {
                     Ok(value)
                 }
                 Content::Map(ref v) => {
-                    let map = v.into_iter()
-                        .map(
-                            |&(ref k, ref v)| {
-                                (ContentRefDeserializer::new(k), ContentRefDeserializer::new(v))
-                            },
-                        );
+                    let map = v.into_iter().map(|&(ref k, ref v)| {
+                        (
+                            ContentRefDeserializer::new(k),
+                            ContentRefDeserializer::new(v),
+                        )
+                    });
                     let mut map_visitor = de::value::MapDeserializer::new(map);
                     let value = try!(visitor.visit_map(&mut map_visitor));
                     try!(map_visitor.end());
@@ -1506,38 +1526,35 @@ mod content {
                     let &(ref variant, ref value) = match iter.next() {
                         Some(v) => v,
                         None => {
-                            return Err(
-                                de::Error::invalid_value(
-                                    de::Unexpected::Map,
-                                    &"map with a single key",
-                                ),
-                            );
+                            return Err(de::Error::invalid_value(
+                                de::Unexpected::Map,
+                                &"map with a single key",
+                            ));
                         }
                     };
                     // enums are encoded in json as maps with a single key:value pair
                     if iter.next().is_some() {
-                        return Err(
-                            de::Error::invalid_value(
-                                de::Unexpected::Map,
-                                &"map with a single key",
-                            ),
-                        );
+                        return Err(de::Error::invalid_value(
+                            de::Unexpected::Map,
+                            &"map with a single key",
+                        ));
                     }
                     (variant, Some(value))
                 }
                 ref s @ Content::String(_) | ref s @ Content::Str(_) => (s, None),
                 ref other => {
-                    return Err(de::Error::invalid_type(other.unexpected(), &"string or map"),);
+                    return Err(de::Error::invalid_type(
+                        other.unexpected(),
+                        &"string or map",
+                    ));
                 }
             };
 
-            visitor.visit_enum(
-                EnumRefDeserializer {
-                    variant: variant,
-                    value: value,
-                    err: PhantomData,
-                },
-            )
+            visitor.visit_enum(EnumRefDeserializer {
+                variant: variant,
+                value: value,
+                err: PhantomData,
+            })
         }
 
         forward_to_deserialize_any! {
@@ -1613,9 +1630,10 @@ mod content {
         {
             match self.value {
                 Some(value) => seed.deserialize(ContentRefDeserializer::new(value)),
-                None => {
-                    Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"newtype variant"),)
-                }
+                None => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"newtype variant",
+                )),
             }
         }
 
@@ -1627,8 +1645,14 @@ mod content {
                 Some(&Content::Seq(ref v)) => {
                     de::Deserializer::deserialize_any(SeqRefDeserializer::new(v), visitor)
                 }
-                Some(other) => Err(de::Error::invalid_type(other.unexpected(), &"tuple variant"),),
-                None => Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"tuple variant"),),
+                Some(other) => Err(de::Error::invalid_type(
+                    other.unexpected(),
+                    &"tuple variant",
+                )),
+                None => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"tuple variant",
+                )),
             }
         }
 
@@ -1647,8 +1671,14 @@ mod content {
                 Some(&Content::Seq(ref v)) => {
                     de::Deserializer::deserialize_any(SeqRefDeserializer::new(v), visitor)
                 }
-                Some(other) => Err(de::Error::invalid_type(other.unexpected(), &"struct variant"),),
-                _ => Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"struct variant"),),
+                Some(other) => Err(de::Error::invalid_type(
+                    other.unexpected(),
+                    &"struct variant",
+                )),
+                _ => Err(de::Error::invalid_type(
+                    de::Unexpected::UnitVariant,
+                    &"struct variant",
+                )),
             }
         }
     }
@@ -1716,10 +1746,8 @@ mod content {
             T: de::DeserializeSeed<'de>,
         {
             match self.iter.next() {
-                Some(value) => {
-                    seed.deserialize(ContentRefDeserializer::new(value))
-                        .map(Some)
-                }
+                Some(value) => seed.deserialize(ContentRefDeserializer::new(value))
+                    .map(Some),
                 None => Ok(None),
             }
         }
@@ -1764,8 +1792,7 @@ mod content {
             match self.iter.next() {
                 Some(&(ref key, ref value)) => {
                     self.value = Some(value);
-                    seed.deserialize(ContentRefDeserializer::new(key))
-                        .map(Some)
+                    seed.deserialize(ContentRefDeserializer::new(key)).map(Some)
                 }
                 None => Ok(None),
             }
@@ -1851,7 +1878,11 @@ mod content {
         type Value = ();
 
         fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            write!(formatter, "unit variant {}::{}", self.type_name, self.variant_name)
+            write!(
+                formatter,
+                "unit variant {}::{}",
+                self.type_name, self.variant_name
+            )
         }
 
         fn visit_seq<S>(self, _: S) -> Result<(), S::Error>
@@ -1891,7 +1922,11 @@ mod content {
         type Value = ();
 
         fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            write!(formatter, "unit variant {}::{}", self.type_name, self.variant_name)
+            write!(
+                formatter,
+                "unit variant {}::{}",
+                self.type_name, self.variant_name
+            )
         }
 
         fn visit_unit<E>(self) -> Result<(), E>
@@ -2010,19 +2045,20 @@ where
     }
 }
 
-/// A DeserializeSeed helper for implementing deserialize_from Visitors.
+/// A DeserializeSeed helper for implementing deserialize_in_place Visitors.
 ///
-/// Wraps a mutable reference and calls deserialize_from on it.
-pub struct DeserializeFromSeed<'a, T: 'a>(pub &'a mut T);
+/// Wraps a mutable reference and calls deserialize_in_place on it.
+pub struct InPlaceSeed<'a, T: 'a>(pub &'a mut T);
 
-impl<'a, 'de, T> DeserializeSeed<'de> for DeserializeFromSeed<'a, T>
-    where T: Deserialize<'de>,
+impl<'a, 'de, T> DeserializeSeed<'de> for InPlaceSeed<'a, T>
+where
+    T: Deserialize<'de>,
 {
     type Value = ();
     fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
     where
         D: Deserializer<'de>,
     {
-       self.0.deserialize_from(deserializer)
+        T::deserialize_in_place(deserializer, self.0)
     }
 }
diff --git a/third_party/rust/serde/src/private/ser.rs b/third_party/rust/serde/src/private/ser.rs
index 3f60d7cd1f1f..932ebf4aefcb 100644
--- a/third_party/rust/serde/src/private/ser.rs
+++ b/third_party/rust/serde/src/private/ser.rs
@@ -8,10 +8,10 @@
 
 use lib::*;
 
-use ser::{self, Serialize, Serializer, SerializeMap, SerializeStruct, Impossible};
+use ser::{self, Impossible, Serialize, SerializeMap, SerializeStruct, Serializer};
 
 #[cfg(any(feature = "std", feature = "alloc"))]
-use self::content::{SerializeTupleVariantAsMapValue, SerializeStructVariantAsMapValue};
+use self::content::{SerializeStructVariantAsMapValue, SerializeTupleVariantAsMapValue};
 
 /// Used to check that serde(getter) attributes return the expected type.
 /// Not public API.
@@ -32,15 +32,13 @@ where
     S: Serializer,
     T: Serialize,
 {
-    value.serialize(
-        TaggedSerializer {
-            type_ident: type_ident,
-            variant_ident: variant_ident,
-            tag: tag,
-            variant_name: variant_name,
-            delegate: serializer,
-        },
-    )
+    value.serialize(TaggedSerializer {
+        type_ident: type_ident,
+        variant_ident: variant_ident,
+        tag: tag,
+        variant_name: variant_name,
+        delegate: serializer,
+    })
 }
 
 struct TaggedSerializer<S> {
@@ -92,13 +90,10 @@ where
     S: Serializer,
 {
     fn bad_type(self, what: Unsupported) -> S::Error {
-        ser::Error::custom(
-            format_args!(
+        ser::Error::custom(format_args!(
             "cannot serialize tagged newtype variant {}::{} containing {}",
-            self.type_ident,
-            self.variant_ident,
-            what),
-        )
+            self.type_ident, self.variant_ident, what
+        ))
     }
 }
 
@@ -281,7 +276,11 @@ where
         let mut map = try!(self.delegate.serialize_map(Some(2)));
         try!(map.serialize_entry(self.tag, self.variant_name));
         try!(map.serialize_key(inner_variant));
-        Ok(SerializeTupleVariantAsMapValue::new(map, inner_variant, len),)
+        Ok(SerializeTupleVariantAsMapValue::new(
+            map,
+            inner_variant,
+            len,
+        ))
     }
 
     fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
@@ -324,7 +323,11 @@ where
         let mut map = try!(self.delegate.serialize_map(Some(2)));
         try!(map.serialize_entry(self.tag, self.variant_name));
         try!(map.serialize_key(inner_variant));
-        Ok(SerializeStructVariantAsMapValue::new(map, inner_variant, len),)
+        Ok(SerializeStructVariantAsMapValue::new(
+            map,
+            inner_variant,
+            len,
+        ))
     }
 
     #[cfg(not(any(feature = "std", feature = "alloc")))]
@@ -402,7 +405,10 @@ mod content {
         }
 
         fn end(mut self) -> Result<M::Ok, M::Error> {
-            try!(self.map.serialize_value(&Content::TupleStruct(self.name, self.fields)));
+            try!(
+                self.map
+                    .serialize_value(&Content::TupleStruct(self.name, self.fields))
+            );
             self.map.end()
         }
     }
@@ -444,7 +450,10 @@ mod content {
         }
 
         fn end(mut self) -> Result<M::Ok, M::Error> {
-            try!(self.map.serialize_value(&Content::Struct(self.name, self.fields)));
+            try!(
+                self.map
+                    .serialize_value(&Content::Struct(self.name, self.fields))
+            );
             self.map.end()
         }
     }
@@ -485,7 +494,12 @@ mod content {
         TupleVariant(&'static str, u32, &'static str, Vec<Content>),
         Map(Vec<(Content, Content)>),
         Struct(&'static str, Vec<(&'static str, Content)>),
-        StructVariant(&'static str, u32, &'static str, Vec<(&'static str, Content)>),
+        StructVariant(
+            &'static str,
+            u32,
+            &'static str,
+            Vec<(&'static str, Content)>,
+        ),
     }
 
     impl Serialize for Content {
@@ -687,7 +701,10 @@ mod content {
         where
             T: Serialize,
         {
-            Ok(Content::NewtypeStruct(name, Box::new(try!(value.serialize(self)))),)
+            Ok(Content::NewtypeStruct(
+                name,
+                Box::new(try!(value.serialize(self))),
+            ))
         }
 
         fn serialize_newtype_variant<T: ?Sized>(
@@ -700,32 +717,26 @@ mod content {
         where
             T: Serialize,
         {
-            Ok(
-                Content::NewtypeVariant(
-                    name,
-                    variant_index,
-                    variant,
-                    Box::new(try!(value.serialize(self))),
-                ),
-            )
+            Ok(Content::NewtypeVariant(
+                name,
+                variant_index,
+                variant,
+                Box::new(try!(value.serialize(self))),
+            ))
         }
 
         fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, E> {
-            Ok(
-                SerializeSeq {
-                    elements: Vec::with_capacity(len.unwrap_or(0)),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeSeq {
+                elements: Vec::with_capacity(len.unwrap_or(0)),
+                error: PhantomData,
+            })
         }
 
         fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, E> {
-            Ok(
-                SerializeTuple {
-                    elements: Vec::with_capacity(len),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeTuple {
+                elements: Vec::with_capacity(len),
+                error: PhantomData,
+            })
         }
 
         fn serialize_tuple_struct(
@@ -733,13 +744,11 @@ mod content {
             name: &'static str,
             len: usize,
         ) -> Result<Self::SerializeTupleStruct, E> {
-            Ok(
-                SerializeTupleStruct {
-                    name: name,
-                    fields: Vec::with_capacity(len),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeTupleStruct {
+                name: name,
+                fields: Vec::with_capacity(len),
+                error: PhantomData,
+            })
         }
 
         fn serialize_tuple_variant(
@@ -749,25 +758,21 @@ mod content {
             variant: &'static str,
             len: usize,
         ) -> Result<Self::SerializeTupleVariant, E> {
-            Ok(
-                SerializeTupleVariant {
-                    name: name,
-                    variant_index: variant_index,
-                    variant: variant,
-                    fields: Vec::with_capacity(len),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeTupleVariant {
+                name: name,
+                variant_index: variant_index,
+                variant: variant,
+                fields: Vec::with_capacity(len),
+                error: PhantomData,
+            })
         }
 
         fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, E> {
-            Ok(
-                SerializeMap {
-                    entries: Vec::with_capacity(len.unwrap_or(0)),
-                    key: None,
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeMap {
+                entries: Vec::with_capacity(len.unwrap_or(0)),
+                key: None,
+                error: PhantomData,
+            })
         }
 
         fn serialize_struct(
@@ -775,13 +780,11 @@ mod content {
             name: &'static str,
             len: usize,
         ) -> Result<Self::SerializeStruct, E> {
-            Ok(
-                SerializeStruct {
-                    name: name,
-                    fields: Vec::with_capacity(len),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeStruct {
+                name: name,
+                fields: Vec::with_capacity(len),
+                error: PhantomData,
+            })
         }
 
         fn serialize_struct_variant(
@@ -791,15 +794,13 @@ mod content {
             variant: &'static str,
             len: usize,
         ) -> Result<Self::SerializeStructVariant, E> {
-            Ok(
-                SerializeStructVariant {
-                    name: name,
-                    variant_index: variant_index,
-                    variant: variant,
-                    fields: Vec::with_capacity(len),
-                    error: PhantomData,
-                },
-            )
+            Ok(SerializeStructVariant {
+                name: name,
+                variant_index: variant_index,
+                variant: variant,
+                fields: Vec::with_capacity(len),
+                error: PhantomData,
+            })
         }
     }
 
@@ -907,7 +908,12 @@ mod content {
         }
 
         fn end(self) -> Result<Content, E> {
-            Ok(Content::TupleVariant(self.name, self.variant_index, self.variant, self.fields),)
+            Ok(Content::TupleVariant(
+                self.name,
+                self.variant_index,
+                self.variant,
+                self.fields,
+            ))
         }
     }
 
@@ -1013,7 +1019,12 @@ mod content {
         }
 
         fn end(self) -> Result<Content, E> {
-            Ok(Content::StructVariant(self.name, self.variant_index, self.variant, self.fields),)
+            Ok(Content::StructVariant(
+                self.name,
+                self.variant_index,
+                self.variant,
+                self.fields,
+            ))
         }
     }
 }
diff --git a/third_party/rust/serde/src/ser/impls.rs b/third_party/rust/serde/src/ser/impls.rs
index 3d124ab10926..f62a3b2cb09c 100644
--- a/third_party/rust/serde/src/ser/impls.rs
+++ b/third_party/rust/serde/src/ser/impls.rs
@@ -111,7 +111,7 @@ where
 
 ////////////////////////////////////////////////////////////////////////////////
 
-impl<T> Serialize for PhantomData<T> {
+impl<T: ?Sized> Serialize for PhantomData<T> {
     #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -464,7 +464,8 @@ impl Serialize for SystemTime {
         S: Serializer,
     {
         use super::SerializeStruct;
-        let duration_since_epoch = self.duration_since(UNIX_EPOCH).expect("SystemTime must be later than UNIX_EPOCH");
+        let duration_since_epoch = self.duration_since(UNIX_EPOCH)
+            .expect("SystemTime must be later than UNIX_EPOCH");
         let mut state = try!(serializer.serialize_struct("SystemTime", 2));
         try!(state.serialize_field("secs_since_epoch", &duration_since_epoch.as_secs()));
         try!(state.serialize_field("nanos_since_epoch", &duration_since_epoch.subsec_nanos()));
@@ -513,10 +514,12 @@ impl Serialize for net::IpAddr {
             }
         } else {
             match *self {
-                net::IpAddr::V4(ref a) =>
-                    serializer.serialize_newtype_variant("IpAddr", 0, "V4", a),
-                net::IpAddr::V6(ref a) =>
-                    serializer.serialize_newtype_variant("IpAddr", 1, "V6", a),
+                net::IpAddr::V4(ref a) => {
+                    serializer.serialize_newtype_variant("IpAddr", 0, "V4", a)
+                }
+                net::IpAddr::V6(ref a) => {
+                    serializer.serialize_newtype_variant("IpAddr", 1, "V6", a)
+                }
             }
         }
     }
@@ -567,10 +570,12 @@ impl Serialize for net::SocketAddr {
             }
         } else {
             match *self {
-                net::SocketAddr::V4(ref addr) =>
-                    serializer.serialize_newtype_variant("SocketAddr", 0, "V4", addr),
-                net::SocketAddr::V6(ref addr) =>
-                    serializer.serialize_newtype_variant("SocketAddr", 1, "V6", addr),
+                net::SocketAddr::V4(ref addr) => {
+                    serializer.serialize_newtype_variant("SocketAddr", 0, "V4", addr)
+                }
+                net::SocketAddr::V6(ref addr) => {
+                    serializer.serialize_newtype_variant("SocketAddr", 1, "V6", addr)
+                }
             }
         }
     }
@@ -600,7 +605,10 @@ impl Serialize for net::SocketAddrV6 {
     {
         if serializer.is_human_readable() {
             const MAX_LEN: usize = 47;
-            debug_assert_eq!(MAX_LEN, "[1001:1002:1003:1004:1005:1006:1007:1008]:65000".len());
+            debug_assert_eq!(
+                MAX_LEN,
+                "[1001:1002:1003:1004:1005:1006:1007:1008]:65000".len()
+            );
             serialize_display_bounded_length!(self, MAX_LEN, serializer)
         } else {
             (self.ip(), self.port()).serialize(serializer)
diff --git a/third_party/rust/serde/src/ser/impossible.rs b/third_party/rust/serde/src/ser/impossible.rs
index f72748f69be2..af49d14dab34 100644
--- a/third_party/rust/serde/src/ser/impossible.rs
+++ b/third_party/rust/serde/src/ser/impossible.rs
@@ -10,8 +10,8 @@
 
 use lib::*;
 
-use ser::{self, Serialize, SerializeSeq, SerializeTuple, SerializeTupleStruct,
-          SerializeTupleVariant, SerializeMap, SerializeStruct, SerializeStructVariant};
+use ser::{self, Serialize, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant,
+          SerializeTuple, SerializeTupleStruct, SerializeTupleVariant};
 
 /// Helper type for implementing a `Serializer` that does not support
 /// serializing one of the compound types.
diff --git a/third_party/rust/serde/src/ser/mod.rs b/third_party/rust/serde/src/ser/mod.rs
index bd0a69edf73d..e23ef04aaafa 100644
--- a/third_party/rust/serde/src/ser/mod.rs
+++ b/third_party/rust/serde/src/ser/mod.rs
@@ -1412,7 +1412,9 @@ pub trait Serializer: Sized {
     /// change, as a value serialized in human-readable mode is not required to
     /// deserialize from the same data in compact mode.
     #[inline]
-    fn is_human_readable(&self) -> bool { true }
+    fn is_human_readable(&self) -> bool {
+        true
+    }
 }
 
 /// Returned from `Serializer::serialize_seq`.
diff --git a/third_party/rust/serde_derive/.cargo-checksum.json b/third_party/rust/serde_derive/.cargo-checksum.json
index d51859d98b7c..3f199072c1e0 100644
--- a/third_party/rust/serde_derive/.cargo-checksum.json
+++ b/third_party/rust/serde_derive/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"972517c9f00568bfc6806f09dad62aa94ed9f86afe35b4ab0e8d30f1600a04c5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/bound.rs":"4999df0c898ae4d5f0fdcd7a6365edabd5101027d67224ce54901c1653060f15","src/de.rs":"6783ba15e53f5d494c9af609474fa15d99d5e76bb0fea71e4d85829f3eeec2d0","src/fragment.rs":"f1642a1c2abbc36191206a5ec8077e314bdc20a420d7649e4bec3a69d555f78d","src/lib.rs":"49832577d7d7451cb6aedab7fdb1c9013e4ad0b8962d0d5d0936e69c9c9fc7ce","src/ser.rs":"e10042683c58f5eb833d9811ed3c2115e93f412188ac6f116c063851584fbec5"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"f4d63b1c5051b3e0e32fe70dabff07245e8d7e89381b1ed99789072083453201","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/bound.rs":"a10e5a103ce3866f8701e80c429106aa6b67b8250026ed2c0d36977748d4cc97","src/de.rs":"991ec19db1b486c2e91bce3f097f8f247ab6122eb8900a2c9267fa9c9e493417","src/fragment.rs":"5a63181171d4d05cea9f28d8ed27a550bc8ac176ee90a911a0598fbe340eec1a","src/lib.rs":"40817849b19a73459fbe5955cf22fb73f634e54df53bb309a0b6e4750b310ea6","src/ser.rs":"0ca344ccbe227f99bb875fe583b97757beb8233dc39acb1836782937c9036bd6"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/serde_derive/Cargo.toml b/third_party/rust/serde_derive/Cargo.toml
index 1b868d8d0b2b..8dd851f25a1e 100644
--- a/third_party/rust/serde_derive/Cargo.toml
+++ b/third_party/rust/serde_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_derive"
-version = "1.0.23" # remember to update html_root_url
+version = "1.0.27" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
@@ -16,7 +16,7 @@ travis-ci = { repository = "serde-rs/serde" }
 
 [features]
 default = []
-deserialize_from = []
+deserialize_in_place = []
 
 [lib]
 name = "serde_derive"
@@ -24,7 +24,7 @@ proc-macro = true
 
 [dependencies]
 quote = "0.3.8"
-serde_derive_internals = { version = "=0.17.0", default-features = false, path = "../serde_derive_internals" }
+serde_derive_internals = { version = "=0.19.0", default-features = false, path = "../serde_derive_internals" }
 syn = { version = "0.11", features = ["visit"] }
 
 [dev-dependencies]
diff --git a/third_party/rust/serde_derive/src/bound.rs b/third_party/rust/serde_derive/src/bound.rs
index 1a01ab2f0b73..9197a18396e4 100644
--- a/third_party/rust/serde_derive/src/bound.rs
+++ b/third_party/rust/serde_derive/src/bound.rs
@@ -27,14 +27,10 @@ pub fn without_defaults(generics: &syn::Generics) -> syn::Generics {
         ty_params: generics
             .ty_params
             .iter()
-            .map(
-                |ty_param| {
-                    syn::TyParam {
-                        default: None,
-                        ..ty_param.clone()
-                    }
-                },
-            )
+            .map(|ty_param| syn::TyParam {
+                default: None,
+                ..ty_param.clone()
+            })
             .collect(),
         ..generics.clone()
     }
@@ -137,17 +133,15 @@ where
         relevant_ty_params: HashSet::new(),
     };
     match cont.body {
-        Body::Enum(_, ref variants) => {
-            for variant in variants.iter() {
-                let relevant_fields = variant
-                    .fields
-                    .iter()
-                    .filter(|field| filter(&field.attrs, Some(&variant.attrs)));
-                for field in relevant_fields {
-                    visit::walk_ty(&mut visitor, field.ty);
-                }
+        Body::Enum(_, ref variants) => for variant in variants.iter() {
+            let relevant_fields = variant
+                .fields
+                .iter()
+                .filter(|field| filter(&field.attrs, Some(&variant.attrs)));
+            for field in relevant_fields {
+                visit::walk_ty(&mut visitor, field.ty);
             }
-        }
+        },
         Body::Struct(_, ref fields) => {
             for field in fields.iter().filter(|field| filter(&field.attrs, None)) {
                 visit::walk_ty(&mut visitor, field.ty);
@@ -160,27 +154,23 @@ where
         .iter()
         .map(|ty_param| ty_param.ident.clone())
         .filter(|id| visitor.relevant_ty_params.contains(id))
-        .map(
-            |id| {
-                syn::WherePredicate::BoundPredicate(
-                    syn::WhereBoundPredicate {
-                        bound_lifetimes: Vec::new(),
-                        // the type parameter that is being bounded e.g. T
-                        bounded_ty: syn::Ty::Path(None, id.into()),
-                        // the bound e.g. Serialize
-                        bounds: vec![
-                            syn::TyParamBound::Trait(
-                                syn::PolyTraitRef {
-                                    bound_lifetimes: Vec::new(),
-                                    trait_ref: bound.clone(),
-                                },
-                                syn::TraitBoundModifier::None,
-                            ),
-                        ],
-                    },
-                )
-            },
-        );
+        .map(|id| {
+            syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate {
+                bound_lifetimes: Vec::new(),
+                // the type parameter that is being bounded e.g. T
+                bounded_ty: syn::Ty::Path(None, id.into()),
+                // the bound e.g. Serialize
+                bounds: vec![
+                    syn::TyParamBound::Trait(
+                        syn::PolyTraitRef {
+                            bound_lifetimes: Vec::new(),
+                            trait_ref: bound.clone(),
+                        },
+                        syn::TraitBoundModifier::None,
+                    ),
+                ],
+            })
+        });
 
     let mut generics = generics.clone();
     generics.where_clause.predicates.extend(new_predicates);
@@ -196,25 +186,23 @@ pub fn with_self_bound(
     generics
         .where_clause
         .predicates
-        .push(
-            syn::WherePredicate::BoundPredicate(
-                syn::WhereBoundPredicate {
-                    bound_lifetimes: Vec::new(),
-                    // the type that is being bounded e.g. MyStruct<'a, T>
-                    bounded_ty: type_of_item(cont),
-                    // the bound e.g. Default
-                    bounds: vec![
-                        syn::TyParamBound::Trait(
-                            syn::PolyTraitRef {
-                                bound_lifetimes: Vec::new(),
-                                trait_ref: bound.clone(),
-                            },
-                            syn::TraitBoundModifier::None,
-                        ),
-                    ],
-                },
-            ),
-        );
+        .push(syn::WherePredicate::BoundPredicate(
+            syn::WhereBoundPredicate {
+                bound_lifetimes: Vec::new(),
+                // the type that is being bounded e.g. MyStruct<'a, T>
+                bounded_ty: type_of_item(cont),
+                // the bound e.g. Default
+                bounds: vec![
+                    syn::TyParamBound::Trait(
+                        syn::PolyTraitRef {
+                            bound_lifetimes: Vec::new(),
+                            trait_ref: bound.clone(),
+                        },
+                        syn::TraitBoundModifier::None,
+                    ),
+                ],
+            },
+        ));
     generics
 }
 
@@ -231,15 +219,11 @@ pub fn with_lifetime_bound(generics: &syn::Generics, lifetime: &str) -> syn::Gen
             .push(syn::TyParamBound::Region(syn::Lifetime::new(lifetime)));
     }
 
-    generics
-        .lifetimes
-        .push(
-            syn::LifetimeDef {
-                attrs: Vec::new(),
-                lifetime: syn::Lifetime::new(lifetime),
-                bounds: Vec::new(),
-            },
-        );
+    generics.lifetimes.push(syn::LifetimeDef {
+        attrs: Vec::new(),
+        lifetime: syn::Lifetime::new(lifetime),
+        bounds: Vec::new(),
+    });
 
     generics
 }
diff --git a/third_party/rust/serde_derive/src/de.rs b/third_party/rust/serde_derive/src/de.rs
index b0a69b4bf98a..633d0ca48e08 100644
--- a/third_party/rust/serde_derive/src/de.rs
+++ b/third_party/rust/serde_derive/src/de.rs
@@ -7,13 +7,17 @@
 // except according to those terms.
 
 use syn::{self, Ident};
-use quote::{self, Tokens, ToTokens};
+use quote::{self, ToTokens, Tokens};
 
 use bound;
-use fragment::{Fragment, Expr, Stmts, Match};
-use internals::ast::{Body, Container, Field, Repr, Style, Variant};
+use fragment::{Expr, Fragment, Match, Stmts};
+use internals::ast::{Body, Container, Field, Style, Variant};
 use internals::{self, attr};
 
+#[cfg(feature = "deserialize_in_place")]
+use internals::ast::Repr;
+
+
 use std::collections::BTreeSet;
 
 pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<Tokens, String> {
@@ -25,7 +29,7 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<Tokens, Str
     let params = Parameters::new(&cont);
     let (de_impl_generics, _, ty_generics, where_clause) = split_with_de_lifetime(&params);
     let dummy_const = Ident::new(format!("_IMPL_DESERIALIZE_FOR_{}", ident));
-    let main_body = Stmts(deserialize_body(&cont, &params));
+    let body = Stmts(deserialize_body(&cont, &params));
     let delife = params.borrowed.de_lifetime();
 
     let impl_block = if let Some(remote) = cont.attrs.remote() {
@@ -35,23 +39,12 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<Tokens, Str
                 #vis fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result<#remote #ty_generics, __D::Error>
                     where __D: _serde::Deserializer<#delife>
                 {
-                    #main_body
+                    #body
                 }
             }
         }
     } else {
-        let from_body = deserialize_from_body(&cont, &params);
-        let from_impl = from_body.map(|from_body| {
-            let from_body = Stmts(from_body);
-
-            quote! {
-                fn deserialize_from<__D>(&mut self, __deserializer: __D) -> _serde::export::Result<(), __D::Error>
-                    where __D: _serde::Deserializer<#delife>
-                {
-                    #from_body
-                }
-            }
-        });
+        let fn_deserialize_in_place = deserialize_in_place_body(&cont, &params);
 
         quote! {
             #[automatically_derived]
@@ -59,10 +52,10 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<Tokens, Str
                 fn deserialize<__D>(__deserializer: __D) -> _serde::export::Result<Self, __D::Error>
                     where __D: _serde::Deserializer<#delife>
                 {
-                    #main_body
+                    #body
                 }
 
-                #from_impl
+                #fn_deserialize_in_place
             }
         }
     };
@@ -141,8 +134,7 @@ fn build_generics(cont: &Container, borrowed: &BorrowedLifetimes) -> syn::Generi
                 attr::Default::Default => {
                     bound::with_self_bound(cont, &generics, &path!(_serde::export::Default))
                 }
-                attr::Default::None |
-                attr::Default::Path(_) => generics,
+                attr::Default::None | attr::Default::Path(_) => generics,
             };
 
             let delife = borrowed.de_lifetime();
@@ -168,10 +160,8 @@ fn build_generics(cont: &Container, borrowed: &BorrowedLifetimes) -> syn::Generi
 // attribute specify their own bound so we do not generate one. All other fields
 // may need a `T: Deserialize` bound where T is the type of the field.
 fn needs_deserialize_bound(field: &attr::Field, variant: Option<&attr::Variant>) -> bool {
-    !field.skip_deserializing() &&
-    field.deserialize_with().is_none() &&
-    field.de_bound().is_none() &&
-    variant.map_or(true, |variant| variant.deserialize_with().is_none())
+    !field.skip_deserializing() && field.deserialize_with().is_none() && field.de_bound().is_none()
+        && variant.map_or(true, |variant| variant.deserialize_with().is_none())
 }
 
 // Fields with a `default` attribute (not `default=...`), and fields with a
@@ -196,13 +186,11 @@ impl BorrowedLifetimes {
 
     fn de_lifetime_def(&self) -> Option<syn::LifetimeDef> {
         match *self {
-            BorrowedLifetimes::Borrowed(ref bounds) => {
-                Some(syn::LifetimeDef {
-                    attrs: Vec::new(),
-                    lifetime: syn::Lifetime::new("'de"),
-                    bounds: bounds.iter().cloned().collect(),
-                })
-            }
+            BorrowedLifetimes::Borrowed(ref bounds) => Some(syn::LifetimeDef {
+                attrs: Vec::new(),
+                lifetime: syn::Lifetime::new("'de"),
+                bounds: bounds.iter().cloned().collect(),
+            }),
             BorrowedLifetimes::Static => None,
         }
     }
@@ -243,8 +231,7 @@ fn deserialize_body(cont: &Container, params: &Parameters) -> Fragment {
                 }
                 deserialize_struct(None, params, fields, &cont.attrs, None, Untagged::No)
             }
-            Body::Struct(Style::Tuple, ref fields) |
-            Body::Struct(Style::Newtype, ref fields) => {
+            Body::Struct(Style::Tuple, ref fields) | Body::Struct(Style::Newtype, ref fields) => {
                 if fields.iter().any(|field| field.ident.is_some()) {
                     panic!("tuple struct has named fields");
                 }
@@ -262,27 +249,55 @@ fn deserialize_body(cont: &Container, params: &Parameters) -> Fragment {
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_body(cont: &Container, params: &Parameters) -> Option<Fragment> {
-    if let (None, attr::Identifier::No) = (cont.attrs.from_type(), cont.attrs.identifier()) {
-        match cont.body {
-            Body::Enum(ref repr, ref variants) => deserialize_from_enum(params, repr, variants, &cont.attrs),
-            Body::Struct(Style::Struct, ref fields) => {
-                deserialize_from_struct(None, params, fields, &cont.attrs, None, Untagged::No)
-            }
-            Body::Struct(Style::Tuple, ref fields) |
-            Body::Struct(Style::Newtype, ref fields) => {
-                deserialize_from_tuple(None, params, fields, &cont.attrs, None)
-            }
-            Body::Struct(Style::Unit, _) => None,
-        }
-    }  else {
-        None
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_in_place_body(cont: &Container, params: &Parameters) -> Option<Stmts> {
+    // Only remote derives have getters, and we do not generate
+    // deserialize_in_place for remote derives.
+    assert!(!params.has_getter);
+
+    if cont.attrs.from_type().is_some() || cont.attrs.identifier().is_some()
+        || cont.body
+            .all_fields()
+            .all(|f| f.attrs.deserialize_with().is_some())
+    {
+        return None;
     }
+
+    let code = match cont.body {
+        Body::Struct(Style::Struct, ref fields) => {
+            deserialize_struct_in_place(None, params, fields, &cont.attrs, None, Untagged::No)
+        }
+        Body::Struct(Style::Tuple, ref fields) | Body::Struct(Style::Newtype, ref fields) => {
+            deserialize_tuple_in_place(None, params, fields, &cont.attrs, None)
+        }
+        Body::Enum(ref repr, ref variants) => {
+            if let Some(x) = deserialize_enum_in_place(params, repr, variants, &cont.attrs) {
+                x
+            } else {
+                return None;
+            }
+        }
+        Body::Struct(Style::Unit, _) => {
+            return None;
+        }
+    };
+
+    let delife = params.borrowed.de_lifetime();
+    let stmts = Stmts(code);
+
+    let fn_deserialize_in_place = quote_block! {
+        fn deserialize_in_place<__D>(__deserializer: __D, __place: &mut Self) -> _serde::export::Result<(), __D::Error>
+            where __D: _serde::Deserializer<#delife>
+        {
+            #stmts
+        }
+    };
+
+    Some(Stmts(fn_deserialize_in_place))
 }
 
-#[cfg(not(feature = "deserialize_from"))]
-fn deserialize_from_body(_cont: &Container, _params: &Parameters) -> Option<Fragment> {
+#[cfg(not(feature = "deserialize_in_place"))]
+fn deserialize_in_place_body(_cont: &Container, _params: &Parameters) -> Option<Stmts> {
     None
 }
 
@@ -330,7 +345,8 @@ fn deserialize_tuple(
     deserializer: Option<Tokens>,
 ) -> Fragment {
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     // If there are getters (implying private fields), construct the local type
@@ -381,9 +397,7 @@ fn deserialize_tuple(
         quote!(_serde::Deserializer::deserialize_tuple_struct(__deserializer, #type_name, #nfields, #visitor_expr))
     };
 
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
     let visitor_var = if all_skipped {
         quote!(_)
     } else {
@@ -417,33 +431,20 @@ fn deserialize_tuple(
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_tuple(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_tuple_in_place(
     variant_ident: Option<&syn::Ident>,
     params: &Parameters,
     fields: &[Field],
     cattrs: &attr::Container,
     deserializer: Option<Tokens>,
-) -> Option<Fragment> {
+) -> Fragment {
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
-    // If there are getters (implying private fields), construct the local type
-    // and use an `Into` conversion to get the remote type. If there are no
-    // getters then construct the target type directly.
-    let construct = if params.has_getter {
-        let local = &params.local;
-        quote!(#local)
-    } else {
-        quote!(#this)
-    };
-
     let is_enum = variant_ident.is_some();
-    let type_path = match variant_ident {
-        Some(variant_ident) => quote!(#construct::#variant_ident),
-        None => construct,
-    };
     let expecting = match variant_ident {
         Some(variant_ident) => format!("tuple variant {}::{}", params.type_name(), variant_ident),
         None => format!("tuple struct {}", params.type_name()),
@@ -452,24 +453,24 @@ fn deserialize_from_tuple(
     let nfields = fields.len();
 
     let visit_newtype_struct = if !is_enum && nfields == 1 {
-        Some(deserialize_from_newtype_struct(&type_path, params, &fields[0]))
+        Some(deserialize_newtype_struct_in_place(params, &fields[0]))
     } else {
         None
     };
 
-    let visit_seq = Stmts(deserialize_from_seq(params, fields, is_enum, cattrs));
+    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, is_enum, cattrs));
 
     let visitor_expr = if is_enum {
         quote! {
             __Visitor {
-                dest: this,
+                place: this,
                 lifetime: _serde::export::PhantomData,
             }
         }
     } else {
         quote! {
             __Visitor {
-                dest: self,
+                place: __place,
                 lifetime: _serde::export::PhantomData,
             }
         }
@@ -487,46 +488,41 @@ fn deserialize_from_tuple(
         quote!(_serde::Deserializer::deserialize_tuple_struct(__deserializer, #type_name, #nfields, #visitor_expr))
     };
 
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
     let visitor_var = if all_skipped {
         quote!(_)
     } else {
         quote!(mut __seq)
     };
 
-    if params.has_getter {
-        None
-    } else {
-        let de_from_impl_generics = de_impl_generics.with_dest();
-        let de_from_ty_generics = de_ty_generics.with_dest();
-        let dest_life = dest_lifetime();
-        Some(quote_block! {
-            struct __Visitor #de_from_impl_generics #where_clause {
-                dest: &#dest_life mut #this #ty_generics,
-                lifetime: _serde::export::PhantomData<&#delife ()>,
+    let in_place_impl_generics = de_impl_generics.in_place();
+    let in_place_ty_generics = de_ty_generics.in_place();
+    let place_life = place_lifetime();
+
+    quote_block! {
+        struct __Visitor #in_place_impl_generics #where_clause {
+            place: &#place_life mut #this #ty_generics,
+            lifetime: _serde::export::PhantomData<&#delife ()>,
+        }
+
+        impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause {
+            type Value = ();
+
+            fn expecting(&self, formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
+                _serde::export::Formatter::write_str(formatter, #expecting)
             }
 
-            impl #de_from_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_from_ty_generics #where_clause {
-                type Value = ();
+            #visit_newtype_struct
 
-                fn expecting(&self, formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                    _serde::export::Formatter::write_str(formatter, #expecting)
-                }
-
-                #visit_newtype_struct
-
-                #[inline]
-                fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
-                    where __A: _serde::de::SeqAccess<#delife>
-                {
-                    #visit_seq
-                }
+            #[inline]
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+                where __A: _serde::de::SeqAccess<#delife>
+            {
+                #visit_seq
             }
+        }
 
-            #dispatch
-        })
+        #dispatch
     }
 }
 
@@ -546,42 +542,40 @@ fn deserialize_seq(
     let expecting = format!("tuple of {} elements", deserialized_count);
 
     let mut index_in_seq = 0usize;
-    let let_values = vars.clone().zip(fields)
-        .map(|(var, field)| {
-            if field.attrs.skip_deserializing() {
-                let default = Expr(expr_is_missing(&field, cattrs));
-                quote! {
-                    let #var = #default;
-                }
-            } else {
-                let visit = match field.attrs.deserialize_with() {
-                    None => {
-                        let field_ty = &field.ty;
-                        quote!(try!(_serde::de::SeqAccess::next_element::<#field_ty>(&mut __seq)))
-                    }
-                    Some(path) => {
-                        let (wrapper, wrapper_ty) = wrap_deserialize_field_with(
-                            params, field.ty, path);
-                        quote!({
-                            #wrapper
-                            _serde::export::Option::map(
-                                try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)),
-                                |__wrap| __wrap.value)
-                        })
-                    }
-                };
-                let assign = quote! {
-                    let #var = match #visit {
-                        _serde::export::Some(__value) => __value,
-                        _serde::export::None => {
-                            return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
-                        }
-                    };
-                };
-                index_in_seq += 1;
-                assign
+    let let_values = vars.clone().zip(fields).map(|(var, field)| {
+        if field.attrs.skip_deserializing() {
+            let default = Expr(expr_is_missing(&field, cattrs));
+            quote! {
+                let #var = #default;
             }
-        });
+        } else {
+            let visit = match field.attrs.deserialize_with() {
+                None => {
+                    let field_ty = &field.ty;
+                    quote!(try!(_serde::de::SeqAccess::next_element::<#field_ty>(&mut __seq)))
+                }
+                Some(path) => {
+                    let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
+                    quote!({
+                        #wrapper
+                        _serde::export::Option::map(
+                            try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)),
+                            |__wrap| __wrap.value)
+                    })
+                }
+            };
+            let assign = quote! {
+                let #var = match #visit {
+                    _serde::export::Some(__value) => __value,
+                    _serde::export::None => {
+                        return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
+                    }
+                };
+            };
+            index_in_seq += 1;
+            assign
+        }
+    });
 
     let mut result = if is_struct {
         let names = fields.iter().map(|f| &f.ident);
@@ -601,20 +595,35 @@ fn deserialize_seq(
         };
     }
 
+    let let_default = match *cattrs.default() {
+        attr::Default::Default => Some(quote!(
+            let __default: Self::Value = _serde::export::Default::default();
+        )),
+        attr::Default::Path(ref path) => Some(quote!(
+            let __default: Self::Value = #path();
+        )),
+        attr::Default::None => {
+            // We don't need the default value, to prevent an unused variable warning
+            // we'll leave the line empty.
+            None
+        }
+    };
+
     quote_block! {
+        #let_default
         #(#let_values)*
         _serde::export::Ok(#result)
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_seq(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_seq_in_place(
     params: &Parameters,
     fields: &[Field],
     increment_fields: bool,
     cattrs: &attr::Container,
 ) -> Fragment {
-    // For enums there's a secret `tag` field at the start which we shouldn't touch, 
+    // For enums there's a secret `tag` field at the start which we shouldn't touch,
     // so we need to bump all the indices up by 1.
     let index_names = if increment_fields {
         (0..fields.len())
@@ -630,41 +639,48 @@ fn deserialize_from_seq(
     let expecting = format!("tuple of {} elements", deserialized_count);
 
     let mut index_in_seq = 0usize;
-    let write_values = vars.clone().zip(fields).enumerate()
+    let write_values = vars.clone()
+        .zip(fields)
+        .enumerate()
         .map(|(field_index, (_, field))| {
             // If there's no field name, assume we're a tuple-struct and use a numeric index
-            let field_name = field.ident.clone()
+            let field_name = field
+                .ident
+                .clone()
                 .unwrap_or_else(|| Ident::new(field_index.to_string()));
 
             if field.attrs.skip_deserializing() {
                 let default = Expr(expr_is_missing(&field, cattrs));
                 quote! {
-                    self.dest.#field_name = #default;
+                    self.place.#field_name = #default;
                 }
             } else {
-                let handle_none = quote! {
-                    if visit.is_none() {
-                        return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
-                    }
+                let return_invalid_length = quote! {
+                    return _serde::export::Err(_serde::de::Error::invalid_length(#index_in_seq, &#expecting));
                 };
                 let write = match field.attrs.deserialize_with() {
                     None => {
                         quote! {
-                            let visit = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
-                                _serde::private::de::DeserializeFromSeed(&mut self.dest.#field_name)));
-                            #handle_none
+                            if let _serde::export::None = try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
+                                _serde::private::de::InPlaceSeed(&mut self.place.#field_name)))
+                            {
+                                #return_invalid_length
+                            }
                         }
                     }
                     Some(path) => {
-                        let (wrapper, wrapper_ty) = wrap_deserialize_field_with(
-                            params, field.ty, path);
+                        let (wrapper, wrapper_ty) =
+                            wrap_deserialize_field_with(params, field.ty, path);
                         quote!({
                             #wrapper
-                            let visit = _serde::export::Option::map(
-                                try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)),
-                                |__wrap| __wrap.value);
-                            #handle_none
-                            self.dest.#field_name = visit.unwrap();
+                            match try!(_serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)) {
+                                _serde::export::Some(__wrap) => {
+                                    self.place.#field_name = __wrap.value;
+                                }
+                                _serde::export::None => {
+                                    #return_invalid_length
+                                }
+                            }
                         })
                     }
                 };
@@ -673,7 +689,24 @@ fn deserialize_from_seq(
             }
         });
 
+    let this = &params.this;
+    let (_, ty_generics, _) = params.generics.split_for_impl();
+    let let_default = match *cattrs.default() {
+        attr::Default::Default => Some(quote!(
+            let __default: #this #ty_generics  = _serde::export::Default::default();
+        )),
+        attr::Default::Path(ref path) => Some(quote!(
+            let __default: #this #ty_generics  = #path();
+        )),
+        attr::Default::None => {
+            // We don't need the default value, to prevent an unused variable warning
+            // we'll leave the line empty.
+            None
+        }
+    };
+
     quote_block! {
+        #let_default
         #(#write_values)*
         _serde::export::Ok(())
     }
@@ -716,59 +749,19 @@ fn deserialize_newtype_struct(type_path: &Tokens, params: &Parameters, field: &F
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_newtype_struct(
-    type_path: &Tokens,
-    params: &Parameters,
-    field: &Field
-) -> Tokens {
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_newtype_struct_in_place(params: &Parameters, field: &Field) -> Tokens {
+    // We do not generate deserialize_in_place if every field has a deserialize_with.
+    assert!(field.attrs.deserialize_with().is_none());
+
     let delife = params.borrowed.de_lifetime();
 
-    // FIXME: can we reject this condition earlier so we don't have to handle it?
-    // If there's conversions that we need to do, we can't do this properly.
-    if field.attrs.deserialize_with().is_some() || params.has_getter {
-        let value = match field.attrs.deserialize_with() {
-            None => {
-                let field_ty = &field.ty;
-                quote! {
-                    try!(<#field_ty as _serde::Deserialize>::deserialize(__e))
-                }
-            }
-            Some(path) => {
-                let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
-                quote!({
-                    #wrapper
-                    try!(<#wrapper_ty as _serde::Deserialize>::deserialize(__e)).value
-                })
-            }
-        };
-
-        let mut result = quote!(#type_path(#value));
-        if params.has_getter {
-            let this = &params.this;
-            result = quote! {
-                _serde::export::Into::<#this>::into(#result)
-            };
-        }
-
-        quote! {
-            #[inline]
-            fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
-                where __E: _serde::Deserializer<#delife>
-            {
-                *self.dest = #result;
-                _serde::export::Ok(())
-            }
-        }
-    } else {
-        // No conversions, just recurse on the field.
-        quote! {
-            #[inline]
-            fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
-                where __E: _serde::Deserializer<#delife>
-            {
-                _serde::Deserialize::deserialize_from(&mut self.dest.0, __e)
-            }
+    quote! {
+        #[inline]
+        fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
+            where __E: _serde::Deserializer<#delife>
+        {
+            _serde::Deserialize::deserialize_in_place(__e, &mut self.place.0)
         }
     }
 }
@@ -789,7 +782,8 @@ fn deserialize_struct(
     let is_enum = variant_ident.is_some();
 
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     // If there are getters (implying private fields), construct the local type
@@ -840,9 +834,7 @@ fn deserialize_struct(
         }
     };
 
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
     let visitor_var = if all_skipped {
         quote!(_)
     } else {
@@ -852,16 +844,14 @@ fn deserialize_struct(
     // untagged struct variants do not get a visit_seq method
     let visit_seq = match untagged {
         Untagged::Yes => None,
-        Untagged::No => {
-            Some(quote! {
-                #[inline]
-                fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
-                    where __A: _serde::de::SeqAccess<#delife>
-                {
-                    #visit_seq
-                }
-            })
-        }
+        Untagged::No => Some(quote! {
+            #[inline]
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+                where __A: _serde::de::SeqAccess<#delife>
+            {
+                #visit_seq
+            }
+        }),
     };
 
     quote_block! {
@@ -895,19 +885,20 @@ fn deserialize_struct(
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_struct(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_struct_in_place(
     variant_ident: Option<&syn::Ident>,
     params: &Parameters,
     fields: &[Field],
     cattrs: &attr::Container,
     deserializer: Option<Tokens>,
     untagged: Untagged,
-) -> Option<Fragment> {
+) -> Fragment {
     let is_enum = variant_ident.is_some();
 
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     let expecting = match variant_ident {
@@ -915,17 +906,17 @@ fn deserialize_from_struct(
         None => format!("struct {}", params.type_name()),
     };
 
-    let visit_seq = Stmts(deserialize_from_seq(params, fields, false, cattrs));
+    let visit_seq = Stmts(deserialize_seq_in_place(params, fields, false, cattrs));
 
     let (field_visitor, fields_stmt, visit_map) =
-        deserialize_from_struct_visitor(params, fields, cattrs);
+        deserialize_struct_in_place_visitor(params, fields, cattrs);
     let field_visitor = Stmts(field_visitor);
     let fields_stmt = Stmts(fields_stmt);
     let visit_map = Stmts(visit_map);
 
     let visitor_expr = quote! {
         __Visitor {
-            dest: self,
+            place: __place,
             lifetime: _serde::export::PhantomData,
         }
     };
@@ -944,10 +935,7 @@ fn deserialize_from_struct(
         }
     };
 
-
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
     let visitor_var = if all_skipped {
         quote!(_)
     } else {
@@ -957,56 +945,48 @@ fn deserialize_from_struct(
     // untagged struct variants do not get a visit_seq method
     let visit_seq = match untagged {
         Untagged::Yes => None,
-        Untagged::No => {
-            Some(quote! {
-                #[inline]
-                fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
-                    where __A: _serde::de::SeqAccess<#delife>
-                {
-                    #visit_seq
-                }
-            })
-
-        }
+        Untagged::No => Some(quote! {
+            #[inline]
+            fn visit_seq<__A>(self, #visitor_var: __A) -> _serde::export::Result<Self::Value, __A::Error>
+                where __A: _serde::de::SeqAccess<#delife>
+            {
+                #visit_seq
+            }
+        }),
     };
 
-    if params.has_getter {
-        None
-    } else {
-        let de_from_impl_generics = de_impl_generics.with_dest();
-        let de_from_ty_generics = de_ty_generics.with_dest();
-        let dest_life = dest_lifetime();
+    let in_place_impl_generics = de_impl_generics.in_place();
+    let in_place_ty_generics = de_ty_generics.in_place();
+    let place_life = place_lifetime();
 
-        Some(quote_block! {
-            #field_visitor
+    quote_block! {
+        #field_visitor
 
-            struct __Visitor #de_from_impl_generics #where_clause {
-                dest: &#dest_life mut #this #ty_generics,
-                lifetime: _serde::export::PhantomData<&#delife ()>,
+        struct __Visitor #in_place_impl_generics #where_clause {
+            place: &#place_life mut #this #ty_generics,
+            lifetime: _serde::export::PhantomData<&#delife ()>,
+        }
+
+        impl #in_place_impl_generics _serde::de::Visitor<#delife> for __Visitor #in_place_ty_generics #where_clause {
+            type Value = ();
+
+            fn expecting(&self, formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
+                _serde::export::Formatter::write_str(formatter, #expecting)
             }
 
-            impl #de_from_impl_generics _serde::de::Visitor<#delife> for __Visitor #de_from_ty_generics #where_clause {
-                type Value = ();
+            #visit_seq
 
-                fn expecting(&self, formatter: &mut _serde::export::Formatter) -> _serde::export::fmt::Result {
-                    _serde::export::Formatter::write_str(formatter, #expecting)
-                }
-
-                #visit_seq
-
-                #[inline]
-                #[allow(unreachable_code)]
-                fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
-                    where __A: _serde::de::MapAccess<#delife>
-                {
-                    #visit_map
-                }
+            #[inline]
+            fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
+                where __A: _serde::de::MapAccess<#delife>
+            {
+                #visit_map
             }
+        }
 
-            #fields_stmt
+        #fields_stmt
 
-            #dispatch
-        })
+        #dispatch
     }
 }
 
@@ -1028,15 +1008,15 @@ fn deserialize_enum(
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_enum(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_enum_in_place(
     params: &Parameters,
     repr: &Repr,
     variants: &[Variant],
     cattrs: &attr::Container,
 ) -> Option<Fragment> {
     match *cattrs.tag() {
-        attr::EnumTag::External => deserialize_from_externally_tagged_enum(params, repr, variants, cattrs),
+        attr::EnumTag::External => deserialize_externally_tagged_enum_in_place(params, repr, variants, cattrs),
         _ => None,
     }
 }
@@ -1047,7 +1027,8 @@ fn deserialize_externally_tagged_enum(
     cattrs: &attr::Container,
 ) -> Fragment {
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     let type_name = cattrs.name().deserialize_name();
@@ -1058,7 +1039,7 @@ fn deserialize_externally_tagged_enum(
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)),)
+        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
         .collect();
 
     let variants_stmt = {
@@ -1068,24 +1049,30 @@ fn deserialize_externally_tagged_enum(
         }
     };
 
-    let variant_visitor = Stmts(deserialize_generated_identifier(variant_names_idents, cattrs, true),);
+    let variant_visitor = Stmts(deserialize_generated_identifier(
+        variant_names_idents,
+        cattrs,
+        true,
+    ));
 
     // Match arms to extract a variant from a string
     let variant_arms = variants
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(
-            |(i, variant)| {
-                let variant_name = field_i(i);
+        .map(|(i, variant)| {
+            let variant_name = field_i(i);
 
-                let block = Match(deserialize_externally_tagged_variant(params, variant, cattrs),);
+            let block = Match(deserialize_externally_tagged_variant(
+                params,
+                variant,
+                cattrs,
+            ));
 
-                quote! {
-                    (__Field::#variant_name, __variant) => #block
-                }
-            },
-        );
+            quote! {
+                (__Field::#variant_name, __variant) => #block
+            }
+        });
 
     let all_skipped = variants
         .iter()
@@ -1141,8 +1128,8 @@ fn deserialize_externally_tagged_enum(
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_externally_tagged_enum(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_externally_tagged_enum_in_place(
     params: &Parameters,
     repr: &Repr,
     variants: &[Variant],
@@ -1152,12 +1139,12 @@ fn deserialize_from_externally_tagged_enum(
         let int_repr = Ident::new(int_repr);
         quote!(#[repr(#int_repr)])
     });
-    
+
     let unit_variant = variants.iter().position(|variant| is_unit(variant));
     let non_unit_variant = variants.iter().enumerate().find(|&(_, variant)| !is_unit(variant));
-    
+
     // We need an int_repr, unit variant, and a non-unit variant to proceed
-    if int_repr.is_none() || unit_variant.is_none() || non_unit_variant.is_none() { 
+    if int_repr.is_none() || unit_variant.is_none() || non_unit_variant.is_none() {
         return None;
     }
 
@@ -1215,7 +1202,7 @@ fn deserialize_from_externally_tagged_enum(
                 } else {
                     Some(quote!(let this = &mut repr.#variant_name;))
                 };
-                let block = Stmts(deserialize_from_externally_tagged_variant(&sub_params, variant, cattrs));
+                let block = Stmts(deserialize_externally_tagged_variant_in_place(&sub_params, variant, cattrs));
                 quote! {
                     (__Field::#variant_name, __variant) => {
                         {
@@ -1246,10 +1233,10 @@ fn deserialize_from_externally_tagged_enum(
         }
     } else {
         let unit_field = field_i(unit_index);
-        
+
         quote! {
             unsafe {
-                let repr = ::std::mem::transmute::<&mut #this #ty_generics, &mut __EnumRepr>(self.dest);
+                let repr = ::std::mem::transmute::<&mut #this #ty_generics, &mut __EnumRepr>(self.place);
                 #tag_access = __Tag::#unit_field;
                 match try!(_serde::de::EnumAccess::variant(__data)) {
                     #(#variant_arms_from)*
@@ -1282,7 +1269,7 @@ fn deserialize_from_externally_tagged_enum(
                 quote!(#variant_name)
             }
         );
-    
+
 
     let repr_payloads = variants
         .iter()
@@ -1329,7 +1316,7 @@ fn deserialize_from_externally_tagged_enum(
                     }
                     Style::Unit => None,
                 }
-                
+
             }
         );
 
@@ -1350,15 +1337,15 @@ fn deserialize_from_externally_tagged_enum(
         #(#repr_payloads)*
     };
 
-    let de_from_impl_generics = de_impl_generics.with_dest();
-    let de_from_ty_generics = de_ty_generics.with_dest();
-    let dest_life = dest_lifetime();
+    let de_from_impl_generics = de_impl_generics.in_place();
+    let de_from_ty_generics = de_ty_generics.in_place();
+    let dest_life = place_lifetime();
 
     Some(quote_block! {
         #variant_visitor
 
         struct __Visitor #de_from_impl_generics #where_clause {
-            dest: &#dest_life mut #this #ty_generics,
+            place: &#dest_life mut #this #ty_generics,
             lifetime: _serde::export::PhantomData<&#delife ()>,
         }
 
@@ -1382,7 +1369,7 @@ fn deserialize_from_externally_tagged_enum(
 
         _serde::Deserializer::deserialize_enum(__deserializer, #type_name, VARIANTS,
                                                __Visitor {
-                                                   dest: self,
+                                                   place: __place,
                                                    lifetime: _serde::export::PhantomData,
                                                })
     })
@@ -1398,7 +1385,7 @@ fn deserialize_internally_tagged_enum(
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)),)
+        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
         .collect();
 
     let variants_stmt = {
@@ -1408,10 +1395,15 @@ fn deserialize_internally_tagged_enum(
         }
     };
 
-    let variant_visitor = Stmts(deserialize_generated_identifier(variant_names_idents, cattrs, true),);
+    let variant_visitor = Stmts(deserialize_generated_identifier(
+        variant_names_idents,
+        cattrs,
+        true,
+    ));
 
     // Match arms to extract a variant from a string
-    let variant_arms = variants.iter()
+    let variant_arms = variants
+        .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
         .map(|(i, variant)| {
@@ -1421,7 +1413,9 @@ fn deserialize_internally_tagged_enum(
                 params,
                 variant,
                 cattrs,
-                quote!(_serde::private::de::ContentDeserializer::<__D::Error>::new(__tagged.content)),
+                quote!(
+                    _serde::private::de::ContentDeserializer::<__D::Error>::new(__tagged.content)
+                ),
             ));
 
             quote! {
@@ -1452,14 +1446,15 @@ fn deserialize_adjacently_tagged_enum(
     content: &str,
 ) -> Fragment {
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     let variant_names_idents: Vec<_> = variants
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)),)
+        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
         .collect();
 
     let variants_stmt = {
@@ -1469,30 +1464,30 @@ fn deserialize_adjacently_tagged_enum(
         }
     };
 
-    let variant_visitor = Stmts(deserialize_generated_identifier(variant_names_idents, cattrs, true),);
+    let variant_visitor = Stmts(deserialize_generated_identifier(
+        variant_names_idents,
+        cattrs,
+        true,
+    ));
 
     let ref variant_arms: Vec<_> = variants
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(
-            |(i, variant)| {
-                let variant_index = field_i(i);
+        .map(|(i, variant)| {
+            let variant_index = field_i(i);
 
-                let block = Match(
-                    deserialize_untagged_variant(
-                        params,
-                        variant,
-                        cattrs,
-                        quote!(__deserializer),
-                    ),
-                );
+            let block = Match(deserialize_untagged_variant(
+                params,
+                variant,
+                cattrs,
+                quote!(__deserializer),
+            ));
 
-                quote! {
-                    __Field::#variant_index => #block
-                }
-            },
-        )
+            quote! {
+                __Field::#variant_index => #block
+            }
+        })
         .collect();
 
     let expecting = format!("adjacently tagged enum {}", params.type_name());
@@ -1521,25 +1516,21 @@ fn deserialize_adjacently_tagged_enum(
         let fallthrough = if variants.iter().all(is_unit) {
             None
         } else {
-            Some(
-                quote! {
-                    _ => #missing_content
-                },
-            )
+            Some(quote! {
+                _ => #missing_content
+            })
         };
         let arms = variants
             .iter()
             .enumerate()
-            .filter(|&(_, variant)| !variant.attrs.skip_deserializing() && is_unit(variant),)
-            .map(
-                |(i, variant)| {
-                    let variant_index = field_i(i);
-                    let variant_ident = &variant.ident;
-                    quote! {
-                        __Field::#variant_index => _serde::export::Ok(#this::#variant_ident),
-                    }
-                },
-            );
+            .filter(|&(_, variant)| !variant.attrs.skip_deserializing() && is_unit(variant))
+            .map(|(i, variant)| {
+                let variant_index = field_i(i);
+                let variant_ident = &variant.ident;
+                quote! {
+                    __Field::#variant_index => _serde::export::Ok(#this::#variant_ident),
+                }
+            });
         missing_content = quote! {
             match __field {
                 #(#arms)*
@@ -1558,29 +1549,27 @@ fn deserialize_adjacently_tagged_enum(
     let next_relevant_key = if deny_unknown_fields {
         next_key
     } else {
-        quote! {
-            {
-                let mut __rk : _serde::export::Option<_serde::private::de::TagOrContentField> = _serde::export::None;
-                while let _serde::export::Some(__k) = #next_key {
-                    match __k {
-                        _serde::private::de::TagContentOtherField::Other => {
-                            try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map));
-                            continue;
-                        },
-                        _serde::private::de::TagContentOtherField::Tag => {
-                            __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Tag);
-                            break;
-                        }
-                        _serde::private::de::TagContentOtherField::Content => {
-                            __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Content);
-                            break;
-                        }
+        quote!({
+            let mut __rk : _serde::export::Option<_serde::private::de::TagOrContentField> = _serde::export::None;
+            while let _serde::export::Some(__k) = #next_key {
+                match __k {
+                    _serde::private::de::TagContentOtherField::Other => {
+                        try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map));
+                        continue;
+                    },
+                    _serde::private::de::TagContentOtherField::Tag => {
+                        __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Tag);
+                        break;
+                    }
+                    _serde::private::de::TagContentOtherField::Content => {
+                        __rk = _serde::export::Some(_serde::private::de::TagOrContentField::Content);
+                        break;
                     }
                 }
-
-                __rk
             }
-        }
+
+            __rk
+        })
     };
 
     // Step through remaining keys, looking for duplicates of previously-seen
@@ -1742,16 +1731,14 @@ fn deserialize_untagged_enum(
     let attempts = variants
         .iter()
         .filter(|variant| !variant.attrs.skip_deserializing())
-        .map(
-            |variant| {
-                Expr(deserialize_untagged_variant(
+        .map(|variant| {
+            Expr(deserialize_untagged_variant(
                 params,
                 variant,
                 cattrs,
                 quote!(_serde::private::de::ContentRefDeserializer::<__D::Error>::new(&__content)),
             ))
-            },
-        );
+        });
 
     // TODO this message could be better by saving the errors from the failed
     // attempts. The heuristic used by TOML was to count the number of fields
@@ -1759,8 +1746,10 @@ fn deserialize_untagged_enum(
     // largest number of fields. I'm not sure I like that. Maybe it would be
     // better to save all the errors and combine them into one message that
     // explains why none of the variants matched.
-    let fallthrough_msg =
-        format!("data did not match any variant of untagged enum {}", params.type_name());
+    let fallthrough_msg = format!(
+        "data did not match any variant of untagged enum {}",
+        params.type_name()
+    );
 
     quote_block! {
         let __content = try!(<_serde::private::de::Content as _serde::Deserialize>::deserialize(__deserializer));
@@ -1806,14 +1795,19 @@ fn deserialize_externally_tagged_variant(
         Style::Tuple => {
             deserialize_tuple(Some(variant_ident), params, &variant.fields, cattrs, None)
         }
-        Style::Struct => {
-            deserialize_struct(Some(variant_ident), params, &variant.fields, cattrs, None, Untagged::No)
-        }
+        Style::Struct => deserialize_struct(
+            Some(variant_ident),
+            params,
+            &variant.fields,
+            cattrs,
+            None,
+            Untagged::No,
+        ),
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_externally_tagged_variant(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_externally_tagged_variant_in_place(
     params: &Parameters,
     variant: &Variant,
     cattrs: &attr::Container,
@@ -1840,10 +1834,10 @@ fn deserialize_from_externally_tagged_variant(
             }
         }
         Style::Newtype => {
-            deserialize_from_externally_tagged_newtype_variant(variant_ident, params, &variant.fields[0])
+            deserialize_externally_tagged_newtype_variant_in_place(variant_ident, params, &variant.fields[0])
         }
         Style::Tuple => {
-            deserialize_from_tuple(Some(variant_ident), params, &variant.fields, cattrs, None).expect("???")
+            deserialize_tuple_in_place(Some(variant_ident), params, &variant.fields, cattrs, None)
         }
         Style::Struct => {
             unimplemented!()
@@ -1874,24 +1868,20 @@ fn deserialize_internally_tagged_variant(
                 _serde::export::Ok(#this::#variant_ident)
             }
         }
-        Style::Newtype => {
-            deserialize_untagged_newtype_variant(
-                variant_ident,
-                params,
-                &variant.fields[0],
-                deserializer,
-            )
-        }
-        Style::Struct => {
-            deserialize_struct(
-                Some(variant_ident),
-                params,
-                &variant.fields,
-                cattrs,
-                Some(deserializer),
-                Untagged::No,
-            )
-        }
+        Style::Newtype => deserialize_untagged_newtype_variant(
+            variant_ident,
+            params,
+            &variant.fields[0],
+            deserializer,
+        ),
+        Style::Struct => deserialize_struct(
+            Some(variant_ident),
+            params,
+            &variant.fields,
+            cattrs,
+            Some(deserializer),
+            Untagged::No,
+        ),
         Style::Tuple => unreachable!("checked in serde_derive_internals"),
     }
 }
@@ -1928,33 +1918,27 @@ fn deserialize_untagged_variant(
                     |()| #this::#variant_ident)
             }
         }
-        Style::Newtype => {
-            deserialize_untagged_newtype_variant(
-                variant_ident,
-                params,
-                &variant.fields[0],
-                deserializer,
-            )
-        }
-        Style::Tuple => {
-            deserialize_tuple(
-                Some(variant_ident),
-                params,
-                &variant.fields,
-                cattrs,
-                Some(deserializer),
-            )
-        }
-        Style::Struct => {
-            deserialize_struct(
-                Some(variant_ident),
-                params,
-                &variant.fields,
-                cattrs,
-                Some(deserializer),
-                Untagged::Yes,
-            )
-        }
+        Style::Newtype => deserialize_untagged_newtype_variant(
+            variant_ident,
+            params,
+            &variant.fields[0],
+            deserializer,
+        ),
+        Style::Tuple => deserialize_tuple(
+            Some(variant_ident),
+            params,
+            &variant.fields,
+            cattrs,
+            Some(deserializer),
+        ),
+        Style::Struct => deserialize_struct(
+            Some(variant_ident),
+            params,
+            &variant.fields,
+            cattrs,
+            Some(deserializer),
+            Untagged::Yes,
+        ),
     }
 }
 
@@ -1985,7 +1969,8 @@ fn deserialize_externally_tagged_newtype_variant(
     }
 }
 
-fn deserialize_from_externally_tagged_newtype_variant(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_externally_tagged_newtype_variant_in_place(
     _variant_ident: &syn::Ident,
     params: &Parameters,
     field: &Field,
@@ -1994,7 +1979,7 @@ fn deserialize_from_externally_tagged_newtype_variant(
     match field.attrs.deserialize_with() {
         None => {
             quote_expr! {
-                try!(_serde::de::VariantAccess::newtype_variant_seed(__variant, _serde::private::de::DeserializeFromSeed(&mut this.1)));
+                try!(_serde::de::VariantAccess::newtype_variant_seed(__variant, _serde::private::de::InPlaceSeed(&mut this.1)));
             }
         }
         Some(_path) => {
@@ -2056,7 +2041,12 @@ fn deserialize_generated_identifier(
         (Some(ignore_variant), Some(fallthrough))
     };
 
-    let visitor_impl = Stmts(deserialize_identifier(this, &fields, is_variant, fallthrough),);
+    let visitor_impl = Stmts(deserialize_identifier(
+        this,
+        &fields,
+        is_variant,
+        fallthrough,
+    ));
 
     quote_block! {
         #[allow(non_camel_case_types)]
@@ -2122,7 +2112,12 @@ fn deserialize_custom_identifier(
 
     let names_idents: Vec<_> = ordinary
         .iter()
-        .map(|variant| (variant.attrs.name().deserialize_name(), variant.ident.clone()),)
+        .map(|variant| {
+            (
+                variant.attrs.name().deserialize_name(),
+                variant.ident.clone(),
+            )
+        })
         .collect();
 
     let names = names_idents.iter().map(|&(ref name, _)| name);
@@ -2141,10 +2136,15 @@ fn deserialize_custom_identifier(
         Some(fields)
     };
 
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
-    let visitor_impl =
-        Stmts(deserialize_identifier(this.clone(), &names_idents, is_variant, fallthrough),);
+    let visitor_impl = Stmts(deserialize_identifier(
+        this.clone(),
+        &names_idents,
+        is_variant,
+        fallthrough,
+    ));
 
     quote_block! {
         #names_const
@@ -2178,9 +2178,9 @@ fn deserialize_identifier(
     let field_bytes = fields.iter().map(|&(ref name, _)| quote::ByteStr(name));
 
     let constructors: &Vec<_> = &fields
-                                     .iter()
-                                     .map(|&(_, ref ident)| quote!(#this::#ident))
-                                     .collect();
+        .iter()
+        .map(|&(_, ref ident)| quote!(#this::#ident))
+        .collect();
 
     let expecting = if is_variant {
         "variant identifier"
@@ -2188,11 +2188,7 @@ fn deserialize_identifier(
         "field identifier"
     };
 
-    let index_expecting = if is_variant {
-        "variant"
-    } else {
-        "field"
-    };
+    let index_expecting = if is_variant { "variant" } else { "field" };
 
     let variant_indices = 0u64..;
     let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len());
@@ -2276,7 +2272,7 @@ fn deserialize_struct_visitor(
         .iter()
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
-        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)),)
+        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
         .collect();
 
     let fields_stmt = {
@@ -2310,17 +2306,16 @@ fn deserialize_map(
     let let_values = fields_names
         .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
-        .map(
-            |&(field, ref name)| {
-                let field_ty = &field.ty;
-                quote! {
-                    let mut #name: _serde::export::Option<#field_ty> = _serde::export::None;
-                }
-            },
-        );
+        .map(|&(field, ref name)| {
+            let field_ty = &field.ty;
+            quote! {
+                let mut #name: _serde::export::Option<#field_ty> = _serde::export::None;
+            }
+        });
 
     // Match arms to extract a value for a field.
-    let value_arms = fields_names.iter()
+    let value_arms = fields_names
+        .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
         .map(|&(field, ref name)| {
             let deser_name = field.attrs.name().deserialize_name();
@@ -2333,8 +2328,7 @@ fn deserialize_map(
                     }
                 }
                 Some(path) => {
-                    let (wrapper, wrapper_ty) = wrap_deserialize_field_with(
-                        params, field.ty, path);
+                    let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
                     quote!({
                         #wrapper
                         try!(_serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map)).value
@@ -2360,9 +2354,7 @@ fn deserialize_map(
         })
     };
 
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
     let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
         quote! {
             // FIXME: Once we drop support for Rust 1.15:
@@ -2385,51 +2377,34 @@ fn deserialize_map(
     let extract_values = fields_names
         .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
-        .map(
-            |&(field, ref name)| {
-                let missing_expr = Match(expr_is_missing(&field, cattrs));
+        .map(|&(field, ref name)| {
+            let missing_expr = Match(expr_is_missing(&field, cattrs));
 
-                quote! {
-                    let #name = match #name {
-                        _serde::export::Some(#name) => #name,
-                        _serde::export::None => #missing_expr
-                    };
-                }
-            },
-        );
+            quote! {
+                let #name = match #name {
+                    _serde::export::Some(#name) => #name,
+                    _serde::export::None => #missing_expr
+                };
+            }
+        });
 
-    let result = fields_names
-        .iter()
-        .map(
-            |&(field, ref name)| {
-                let ident = field
-                    .ident
-                    .clone()
-                    .expect("struct contains unnamed fields");
-                if field.attrs.skip_deserializing() {
-                    let value = Expr(expr_is_missing(&field, cattrs));
-                    quote!(#ident: #value)
-                } else {
-                    quote!(#ident: #name)
-                }
-            },
-        );
+    let result = fields_names.iter().map(|&(field, ref name)| {
+        let ident = field.ident.clone().expect("struct contains unnamed fields");
+        if field.attrs.skip_deserializing() {
+            let value = Expr(expr_is_missing(&field, cattrs));
+            quote!(#ident: #value)
+        } else {
+            quote!(#ident: #name)
+        }
+    });
 
     let let_default = match *cattrs.default() {
-        attr::Default::Default => {
-            Some(
-                quote!(
-                let __default: Self::Value = _serde::export::Default::default();
-            ),
-            )
-        }
-        attr::Default::Path(ref path) => {
-            Some(
-                quote!(
-                let __default: Self::Value = #path();
-            ),
-            )
-        }
+        attr::Default::Default => Some(quote!(
+            let __default: Self::Value = _serde::export::Default::default();
+        )),
+        attr::Default::Path(ref path) => Some(quote!(
+            let __default: Self::Value = #path();
+        )),
         attr::Default::None => {
             // We don't need the default value, to prevent an unused variable warning
             // we'll leave the line empty.
@@ -2458,8 +2433,8 @@ fn deserialize_map(
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_struct_visitor(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_struct_in_place_visitor(
     params: &Parameters,
     fields: &[Field],
     cattrs: &attr::Container,
@@ -2468,7 +2443,7 @@ fn deserialize_from_struct_visitor(
         .iter()
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
-        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)),)
+        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
         .collect();
 
     let fields_stmt = {
@@ -2480,13 +2455,13 @@ fn deserialize_from_struct_visitor(
 
     let field_visitor = deserialize_generated_identifier(field_names_idents, cattrs, false);
 
-    let visit_map = deserialize_from_map(params, fields, cattrs);
+    let visit_map = deserialize_map_in_place(params, fields, cattrs);
 
     (field_visitor, fields_stmt, visit_map)
 }
 
-#[cfg(feature = "deserialize_from")]
-fn deserialize_from_map(
+#[cfg(feature = "deserialize_in_place")]
+fn deserialize_map_in_place(
     params: &Parameters,
     fields: &[Field],
     cattrs: &attr::Container,
@@ -2498,20 +2473,19 @@ fn deserialize_from_map(
         .map(|(i, field)| (field, field_i(i)))
         .collect();
 
-    // For deserialize_from, declare booleans for each field that will be deserialized.
+    // For deserialize_in_place, declare booleans for each field that will be deserialized.
     let let_flags = fields_names
         .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
-        .map(
-            |&(_, ref name)| {
-                quote! {
-                    let mut #name: bool = false;
-                }
-            },
-        );
+        .map(|&(_, ref name)| {
+            quote! {
+                let mut #name: bool = false;
+            }
+        });
 
     // Match arms to extract a value for a field.
-    let value_arms_from = fields_names.iter()
+    let value_arms_from = fields_names
+        .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
         .map(|&(field, ref name)| {
             let deser_name = field.attrs.name().deserialize_name();
@@ -2520,15 +2494,14 @@ fn deserialize_from_map(
             let visit = match field.attrs.deserialize_with() {
                 None => {
                     quote! {
-                        try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::private::de::DeserializeFromSeed(&mut self.dest.#field_name)))
+                        try!(_serde::de::MapAccess::next_value_seed(&mut __map, _serde::private::de::InPlaceSeed(&mut self.place.#field_name)))
                     }
                 }
                 Some(path) => {
-                    let (wrapper, wrapper_ty) = wrap_deserialize_field_with(
-                        params, field.ty, path);
+                    let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
                     quote!({
                         #wrapper
-                        self.dest.#field_name = try!(_serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map)).value
+                        self.place.#field_name = try!(_serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map)).value
                     })
                 }
             };
@@ -2552,9 +2525,7 @@ fn deserialize_from_map(
         })
     };
 
-    let all_skipped = fields
-        .iter()
-        .all(|field| field.attrs.skip_deserializing());
+    let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
 
     let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
         quote! {
@@ -2578,36 +2549,39 @@ fn deserialize_from_map(
     let check_flags = fields_names
         .iter()
         .filter(|&&(field, _)| !field.attrs.skip_deserializing())
-        .map(
-            |&(field, ref name)| {
-                let missing_expr = Expr(expr_is_missing(&field, cattrs));
-                let field_name = &field.ident;
+        .map(|&(field, ref name)| {
+            let missing_expr = expr_is_missing(&field, cattrs);
+            // If missing_expr unconditionally returns an error, don't try
+            // to assign its value to self.place. Maybe this could be handled
+            // more elegantly.
+            if missing_expr.as_ref().as_str().starts_with("return ") {
+                let missing_expr = Stmts(missing_expr);
                 quote! {
                     if !#name {
-                        self.dest.#field_name = #missing_expr;
+                        #missing_expr;
+                    }
+                }
+            } else {
+                let field_name = &field.ident;
+                let missing_expr = Expr(missing_expr);
+                quote! {
+                    if !#name {
+                        self.place.#field_name = #missing_expr;
                     };
                 }
-            },
-        );
+            }
+        });
 
     let this = &params.this;
-    let (_, _, ty_generics, _) = split_with_de_lifetime(params,);
+    let (_, _, ty_generics, _) = split_with_de_lifetime(params);
 
     let let_default = match *cattrs.default() {
-        attr::Default::Default => {
-            Some(
-                quote!(
-                let __default: #this #ty_generics = _serde::export::Default::default();
-            ),
-            )
-        }
-        attr::Default::Path(ref path) => {
-            Some(
-                quote!(
-                let __default: #this #ty_generics = #path();
-            ),
-            )
-        }
+        attr::Default::Default => Some(quote!(
+            let __default: #this #ty_generics = _serde::export::Default::default();
+        )),
+        attr::Default::Path(ref path) => Some(quote!(
+            let __default: #this #ty_generics = #path();
+        )),
         attr::Default::None => {
             // We don't need the default value, to prevent an unused variable warning
             // we'll leave the line empty.
@@ -2640,7 +2614,8 @@ fn wrap_deserialize_with(
     deserialize_with: &syn::Path,
 ) -> (Tokens, Tokens) {
     let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) = split_with_de_lifetime(params,);
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
     let wrapper = quote! {
@@ -2691,40 +2666,29 @@ fn wrap_deserialize_variant_with(
     let field_access = (0..variant.fields.len()).map(|n| Ident::new(format!("{}", n)));
     let unwrap_fn = match variant.style {
         Style::Struct => {
-            let field_idents = variant.fields.iter().map(|field| field.ident.as_ref().unwrap());
-            quote! {
-                {
-                    |__wrap| {
-                        #this::#variant_ident { #(#field_idents: __wrap.value.#field_access),* }
-                    }
+            let field_idents = variant
+                .fields
+                .iter()
+                .map(|field| field.ident.as_ref().unwrap());
+            quote!({
+                |__wrap| {
+                    #this::#variant_ident { #(#field_idents: __wrap.value.#field_access),* }
                 }
-            }
+            })
         }
-        Style::Tuple => {
-            quote! {
-                {
-                    |__wrap| {
-                        #this::#variant_ident(#(__wrap.value.#field_access),*)
-                    }
-                }
+        Style::Tuple => quote!({
+            |__wrap| {
+                #this::#variant_ident(#(__wrap.value.#field_access),*)
             }
-        }
-        Style::Newtype => {
-            quote! {
-                {
-                    |__wrap| {
-                        #this::#variant_ident(__wrap.value)
-                    }
-                }
+        }),
+        Style::Newtype => quote!({
+            |__wrap| {
+                #this::#variant_ident(__wrap.value)
             }
-        }
-        Style::Unit => {
-            quote! {
-                {
-                    |__wrap| { #this::#variant_ident }
-                }
-            }
-        }
+        }),
+        Style::Unit => quote!({
+            |__wrap| { #this::#variant_ident }
+        }),
     };
 
     (wrapper, wrapper_ty, unwrap_fn)
@@ -2742,8 +2706,7 @@ fn expr_is_missing(field: &Field, cattrs: &attr::Container) -> Fragment {
     }
 
     match *cattrs.default() {
-        attr::Default::Default |
-        attr::Default::Path(_) => {
+        attr::Default::Default | attr::Default::Path(_) => {
             let ident = &field.ident;
             return quote_expr!(__default.#ident);
         }
@@ -2766,8 +2729,8 @@ fn expr_is_missing(field: &Field, cattrs: &attr::Container) -> Fragment {
 }
 
 struct DeImplGenerics<'a>(&'a Parameters);
-#[cfg(feature = "deserialize_from")]
-struct DeFromImplGenerics<'a>(&'a Parameters);
+#[cfg(feature = "deserialize_in_place")]
+struct InPlaceImplGenerics<'a>(&'a Parameters);
 
 impl<'a> ToTokens for DeImplGenerics<'a> {
     fn to_tokens(&self, tokens: &mut Tokens) {
@@ -2780,20 +2743,22 @@ impl<'a> ToTokens for DeImplGenerics<'a> {
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-impl<'a> ToTokens for DeFromImplGenerics<'a> {
+#[cfg(feature = "deserialize_in_place")]
+impl<'a> ToTokens for InPlaceImplGenerics<'a> {
     fn to_tokens(&self, tokens: &mut Tokens) {
-        let dest_lifetime = dest_lifetime();
+        let place_lifetime = place_lifetime();
         let mut generics = self.0.generics.clone();
 
-        // Add lifetime for `&'dest mut Self, and `'a: 'dest`
+        // Add lifetime for `&'place mut Self, and `'a: 'place`
         for lifetime in &mut generics.lifetimes {
-            lifetime.bounds.push(dest_lifetime.lifetime.clone());
+            lifetime.bounds.push(place_lifetime.lifetime.clone());
         }
         for generic in &mut generics.ty_params {
-            generic.bounds.push(syn::TyParamBound::Region(dest_lifetime.lifetime.clone()));
+            generic
+                .bounds
+                .push(syn::TyParamBound::Region(place_lifetime.lifetime.clone()));
         }
-        generics.lifetimes.insert(0, dest_lifetime);
+        generics.lifetimes.insert(0, place_lifetime);
         if let Some(de_lifetime) = self.0.borrowed.de_lifetime_def() {
             generics.lifetimes.insert(0, de_lifetime);
         }
@@ -2802,60 +2767,62 @@ impl<'a> ToTokens for DeFromImplGenerics<'a> {
     }
 }
 
-#[cfg(feature = "deserialize_from")]
+#[cfg(feature = "deserialize_in_place")]
 impl<'a> DeImplGenerics<'a> {
-    fn with_dest(&self) -> DeFromImplGenerics<'a> {
-        DeFromImplGenerics(self.0)
+    fn in_place(self) -> InPlaceImplGenerics<'a> {
+        InPlaceImplGenerics(self.0)
     }
 }
 
 struct DeTyGenerics<'a>(&'a Parameters);
-#[cfg(feature = "deserialize_from")]
-struct DeFromTyGenerics<'a>(&'a Parameters);
+#[cfg(feature = "deserialize_in_place")]
+struct InPlaceTyGenerics<'a>(&'a Parameters);
 
 impl<'a> ToTokens for DeTyGenerics<'a> {
     fn to_tokens(&self, tokens: &mut Tokens) {
         let mut generics = self.0.generics.clone();
         if self.0.borrowed.de_lifetime_def().is_some() {
-            generics
-                .lifetimes
-                .insert(0, syn::LifetimeDef::new("'de"));
+            generics.lifetimes.insert(0, syn::LifetimeDef::new("'de"));
         }
         let (_, ty_generics, _) = generics.split_for_impl();
         ty_generics.to_tokens(tokens);
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-impl<'a> ToTokens for DeFromTyGenerics<'a> {
+#[cfg(feature = "deserialize_in_place")]
+impl<'a> ToTokens for InPlaceTyGenerics<'a> {
     fn to_tokens(&self, tokens: &mut Tokens) {
         let mut generics = self.0.generics.clone();
-        generics.lifetimes.insert(0, dest_lifetime());
+        generics.lifetimes.insert(0, place_lifetime());
 
         if self.0.borrowed.de_lifetime_def().is_some() {
-            generics
-                .lifetimes
-                .insert(0, syn::LifetimeDef::new("'de"));
+            generics.lifetimes.insert(0, syn::LifetimeDef::new("'de"));
         }
         let (_, ty_generics, _) = generics.split_for_impl();
         ty_generics.to_tokens(tokens);
     }
 }
 
-#[cfg(feature = "deserialize_from")]
+#[cfg(feature = "deserialize_in_place")]
 impl<'a> DeTyGenerics<'a> {
-    fn with_dest(&self) -> DeFromTyGenerics<'a> {
-        DeFromTyGenerics(self.0)
+    fn in_place(self) -> InPlaceTyGenerics<'a> {
+        InPlaceTyGenerics(self.0)
     }
 }
 
-#[cfg(feature = "deserialize_from")]
-fn dest_lifetime() -> syn::LifetimeDef {
-    syn::LifetimeDef::new("'dest")
+#[cfg(feature = "deserialize_in_place")]
+fn place_lifetime() -> syn::LifetimeDef {
+    syn::LifetimeDef::new("'place")
 }
 
-fn split_with_de_lifetime(params: &Parameters,)
-    -> (DeImplGenerics, DeTyGenerics, syn::TyGenerics, &syn::WhereClause) {
+fn split_with_de_lifetime(
+    params: &Parameters,
+) -> (
+    DeImplGenerics,
+    DeTyGenerics,
+    syn::TyGenerics,
+    &syn::WhereClause,
+) {
     let de_impl_generics = DeImplGenerics(&params);
     let de_ty_generics = DeTyGenerics(&params);
     let (_, ty_generics, where_clause) = params.generics.split_for_impl();
diff --git a/third_party/rust/serde_derive/src/fragment.rs b/third_party/rust/serde_derive/src/fragment.rs
index 58cf0a2cadbb..d333cd5f995f 100644
--- a/third_party/rust/serde_derive/src/fragment.rs
+++ b/third_party/rust/serde_derive/src/fragment.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use quote::{Tokens, ToTokens};
+use quote::{ToTokens, Tokens};
 
 pub enum Fragment {
     /// Tokens that can be used as an expression.
@@ -73,3 +73,12 @@ impl ToTokens for Match {
         }
     }
 }
+
+impl AsRef<Tokens> for Fragment {
+    fn as_ref(&self) -> &Tokens {
+        match *self {
+            Fragment::Expr(ref expr) => expr,
+            Fragment::Block(ref block) => block,
+        }
+    }
+}
diff --git a/third_party/rust/serde_derive/src/lib.rs b/third_party/rust/serde_derive/src/lib.rs
index aac34ff81436..fc68947b7aeb 100644
--- a/third_party/rust/serde_derive/src/lib.rs
+++ b/third_party/rust/serde_derive/src/lib.rs
@@ -22,17 +22,15 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.23")]
-
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.27")]
 #![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
 #![cfg_attr(feature = "cargo-clippy", allow(used_underscore_binding))]
-
 // The `quote!` macro requires deep recursion.
 #![recursion_limit = "192"]
 
-extern crate syn;
 #[macro_use]
 extern crate quote;
+extern crate syn;
 
 extern crate serde_derive_internals as internals;
 
diff --git a/third_party/rust/serde_derive/src/ser.rs b/third_party/rust/serde_derive/src/ser.rs
index 056dc2c86d6a..8a689ec070b1 100644
--- a/third_party/rust/serde_derive/src/ser.rs
+++ b/third_party/rust/serde_derive/src/ser.rs
@@ -10,7 +10,7 @@ use syn::{self, Ident};
 use quote::Tokens;
 
 use bound;
-use fragment::{Fragment, Stmts, Match};
+use fragment::{Fragment, Match, Stmts};
 use internals::ast::{Body, Container, Field, Style, Variant};
 use internals::{attr, Ctxt};
 
@@ -132,14 +132,12 @@ fn build_generics(cont: &Container) -> syn::Generics {
 
     match cont.attrs.ser_bound() {
         Some(predicates) => bound::with_where_predicates(&generics, predicates),
-        None => {
-            bound::with_bound(
-                cont,
-                &generics,
-                needs_serialize_bound,
-                &path!(_serde::Serialize),
-            )
-        }
+        None => bound::with_bound(
+            cont,
+            &generics,
+            needs_serialize_bound,
+            &path!(_serde::Serialize),
+        ),
     }
 }
 
@@ -149,10 +147,8 @@ fn build_generics(cont: &Container) -> syn::Generics {
 // their own bound so we do not generate one. All other fields may need a `T:
 // Serialize` bound where T is the type of the field.
 fn needs_serialize_bound(field: &attr::Field, variant: Option<&attr::Variant>) -> bool {
-    !field.skip_serializing() &&
-    field.serialize_with().is_none() &&
-    field.ser_bound().is_none() &&
-    variant.map_or(true, |variant| variant.serialize_with().is_none())
+    !field.skip_serializing() && field.serialize_with().is_none() && field.ser_bound().is_none()
+        && variant.map_or(true, |variant| variant.serialize_with().is_none())
 }
 
 fn serialize_body(cont: &Container, params: &Parameters) -> Fragment {
@@ -259,16 +255,14 @@ fn serialize_struct(params: &Parameters, fields: &[Field], cattrs: &attr::Contai
     let let_mut = mut_if(serialized_fields.peek().is_some());
 
     let len = serialized_fields
-        .map(
-            |field| match field.attrs.skip_serializing_if() {
-                None => quote!(1),
-                Some(path) => {
-                    let ident = field.ident.clone().expect("struct has unnamed fields");
-                    let field_expr = get_field(params, field, ident);
-                    quote!(if #path(#field_expr) { 0 } else { 1 })
-                }
-            },
-        )
+        .map(|field| match field.attrs.skip_serializing_if() {
+            None => quote!(1),
+            Some(path) => {
+                let ident = field.ident.clone().expect("struct has unnamed fields");
+                let field_expr = get_field(params, field, ident);
+                quote!(if #path(#field_expr) { 0 } else { 1 })
+            }
+        })
         .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
 
     quote_block! {
@@ -286,11 +280,9 @@ fn serialize_enum(params: &Parameters, variants: &[Variant], cattrs: &attr::Cont
     let arms: Vec<_> = variants
         .iter()
         .enumerate()
-        .map(
-            |(variant_index, variant)| {
-                serialize_variant(params, variant, variant_index as u32, cattrs)
-            },
-        )
+        .map(|(variant_index, variant)| {
+            serialize_variant(params, variant, variant_index as u32, cattrs)
+        })
         .collect();
 
     quote_expr! {
@@ -321,13 +313,7 @@ fn serialize_variant(
         let fields_pat = match variant.style {
             Style::Unit => quote!(),
             Style::Newtype | Style::Tuple => quote!((..)),
-            Style::Struct => {
-                quote!(
-                    {
-                        ..
-                    }
-                )
-            }
+            Style::Struct => quote!({ .. }),
         };
         quote! {
             #this::#variant_ident #fields_pat => #skipped_err,
@@ -356,34 +342,26 @@ fn serialize_variant(
                 let fields = variant
                     .fields
                     .iter()
-                    .map(
-                        |f| {
-                            f.ident
-                                .clone()
-                                .expect("struct variant has unnamed fields")
-                        },
-                    );
+                    .map(|f| f.ident.clone().expect("struct variant has unnamed fields"));
                 quote! {
                     #this::#variant_ident { #(ref #fields),* }
                 }
             }
         };
 
-        let body = Match(
-            match *cattrs.tag() {
-                attr::EnumTag::External => {
-                    serialize_externally_tagged_variant(params, variant, variant_index, cattrs)
-                }
-                attr::EnumTag::Internal { ref tag } => {
-                    serialize_internally_tagged_variant(params, variant, cattrs, tag)
-                }
-                attr::EnumTag::Adjacent {
-                    ref tag,
-                    ref content,
-                } => serialize_adjacently_tagged_variant(params, variant, cattrs, tag, content),
-                attr::EnumTag::None => serialize_untagged_variant(params, variant, cattrs),
-            },
-        );
+        let body = Match(match *cattrs.tag() {
+            attr::EnumTag::External => {
+                serialize_externally_tagged_variant(params, variant, variant_index, cattrs)
+            }
+            attr::EnumTag::Internal { ref tag } => {
+                serialize_internally_tagged_variant(params, variant, cattrs, tag)
+            }
+            attr::EnumTag::Adjacent {
+                ref tag,
+                ref content,
+            } => serialize_adjacently_tagged_variant(params, variant, cattrs, tag, content),
+            attr::EnumTag::None => serialize_untagged_variant(params, variant, cattrs),
+        });
 
         quote! {
             #case => #body
@@ -441,28 +419,24 @@ fn serialize_externally_tagged_variant(
                 )
             }
         }
-        Style::Tuple => {
-            serialize_tuple_variant(
-                TupleVariant::ExternallyTagged {
-                    type_name: type_name,
-                    variant_index: variant_index,
-                    variant_name: variant_name,
-                },
-                params,
-                &variant.fields,
-            )
-        }
-        Style::Struct => {
-            serialize_struct_variant(
-                StructVariant::ExternallyTagged {
-                    variant_index: variant_index,
-                    variant_name: variant_name,
-                },
-                params,
-                &variant.fields,
-                &type_name,
-            )
-        }
+        Style::Tuple => serialize_tuple_variant(
+            TupleVariant::ExternallyTagged {
+                type_name: type_name,
+                variant_index: variant_index,
+                variant_name: variant_name,
+            },
+            params,
+            &variant.fields,
+        ),
+        Style::Struct => serialize_struct_variant(
+            StructVariant::ExternallyTagged {
+                variant_index: variant_index,
+                variant_name: variant_name,
+            },
+            params,
+            &variant.fields,
+            &type_name,
+        ),
     }
 }
 
@@ -520,17 +494,15 @@ fn serialize_internally_tagged_variant(
                 )
             }
         }
-        Style::Struct => {
-            serialize_struct_variant(
-                StructVariant::InternallyTagged {
-                    tag: tag,
-                    variant_name: variant_name,
-                },
-                params,
-                &variant.fields,
-                &type_name,
-            )
-        }
+        Style::Struct => serialize_struct_variant(
+            StructVariant::InternallyTagged {
+                tag: tag,
+                variant_name: variant_name,
+            },
+            params,
+            &variant.fields,
+            &type_name,
+        ),
         Style::Tuple => unreachable!("checked in serde_derive_internals"),
     }
 }
@@ -546,48 +518,44 @@ fn serialize_adjacently_tagged_variant(
     let type_name = cattrs.name().serialize_name();
     let variant_name = variant.attrs.name().serialize_name();
 
-    let inner = Stmts(
-        if let Some(path) = variant.attrs.serialize_with() {
-            let ser = wrap_serialize_variant_with(params, path, &variant);
-            quote_expr! {
-                _serde::Serialize::serialize(#ser, __serializer)
+    let inner = Stmts(if let Some(path) = variant.attrs.serialize_with() {
+        let ser = wrap_serialize_variant_with(params, path, &variant);
+        quote_expr! {
+            _serde::Serialize::serialize(#ser, __serializer)
+        }
+    } else {
+        match variant.style {
+            Style::Unit => {
+                return quote_block! {
+                    let mut __struct = try!(_serde::Serializer::serialize_struct(
+                        __serializer, #type_name, 1));
+                    try!(_serde::ser::SerializeStruct::serialize_field(
+                        &mut __struct, #tag, #variant_name));
+                    _serde::ser::SerializeStruct::end(__struct)
+                };
             }
-        } else {
-            match variant.style {
-                Style::Unit => {
-                    return quote_block! {
-                        let mut __struct = try!(_serde::Serializer::serialize_struct(
-                            __serializer, #type_name, 1));
-                        try!(_serde::ser::SerializeStruct::serialize_field(
-                            &mut __struct, #tag, #variant_name));
-                        _serde::ser::SerializeStruct::end(__struct)
-                    };
+            Style::Newtype => {
+                let field = &variant.fields[0];
+                let mut field_expr = quote!(__field0);
+                if let Some(path) = field.attrs.serialize_with() {
+                    field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
                 }
-                Style::Newtype => {
-                    let field = &variant.fields[0];
-                    let mut field_expr = quote!(__field0);
-                    if let Some(path) = field.attrs.serialize_with() {
-                        field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
-                    }
 
-                    quote_expr! {
-                        _serde::Serialize::serialize(#field_expr, __serializer)
-                    }
-                }
-                Style::Tuple => {
-                    serialize_tuple_variant(TupleVariant::Untagged, params, &variant.fields)
-                }
-                Style::Struct => {
-                    serialize_struct_variant(
-                        StructVariant::Untagged,
-                        params,
-                        &variant.fields,
-                        &variant_name,
-                    )
+                quote_expr! {
+                    _serde::Serialize::serialize(#field_expr, __serializer)
                 }
             }
-        },
-    );
+            Style::Tuple => {
+                serialize_tuple_variant(TupleVariant::Untagged, params, &variant.fields)
+            }
+            Style::Struct => serialize_struct_variant(
+                StructVariant::Untagged,
+                params,
+                &variant.fields,
+                &variant_name,
+            ),
+        }
+    });
 
     let fields_ty = variant.fields.iter().map(|f| &f.ty);
     let ref fields_ident: Vec<_> = match variant.style {
@@ -599,24 +567,14 @@ fn serialize_adjacently_tagged_variant(
             }
         }
         Style::Newtype => vec![Ident::new("__field0")],
-        Style::Tuple => {
-            (0..variant.fields.len())
-                .map(|i| Ident::new(format!("__field{}", i)))
-                .collect()
-        }
-        Style::Struct => {
-            variant
-                .fields
-                .iter()
-                .map(
-                    |f| {
-                        f.ident
-                            .clone()
-                            .expect("struct variant has unnamed fields")
-                    },
-                )
-                .collect()
-        }
+        Style::Tuple => (0..variant.fields.len())
+            .map(|i| Ident::new(format!("__field{}", i)))
+            .collect(),
+        Style::Struct => variant
+            .fields
+            .iter()
+            .map(|f| f.ident.clone().expect("struct variant has unnamed fields"))
+            .collect(),
     };
 
     let (_, ty_generics, where_clause) = params.generics.split_for_impl();
@@ -753,7 +711,10 @@ enum StructVariant<'a> {
         variant_index: u32,
         variant_name: String,
     },
-    InternallyTagged { tag: &'a str, variant_name: String },
+    InternallyTagged {
+        tag: &'a str,
+        variant_name: String,
+    },
     Untagged,
 }
 
@@ -764,19 +725,14 @@ fn serialize_struct_variant<'a>(
     name: &str,
 ) -> Fragment {
     let (method, skip_method) = match context {
-        StructVariant::ExternallyTagged { .. } => {
-            (
-                quote!(_serde::ser::SerializeStructVariant::serialize_field),
-                quote!(_serde::ser::SerializeStructVariant::skip_field),
-            )
-        }
-        StructVariant::InternallyTagged { .. } |
-        StructVariant::Untagged => {
-            (
-                quote!(_serde::ser::SerializeStruct::serialize_field),
-                quote!(_serde::ser::SerializeStruct::skip_field),
-            )
-        }
+        StructVariant::ExternallyTagged { .. } => (
+            quote!(_serde::ser::SerializeStructVariant::serialize_field),
+            quote!(_serde::ser::SerializeStructVariant::skip_field),
+        ),
+        StructVariant::InternallyTagged { .. } | StructVariant::Untagged => (
+            quote!(_serde::ser::SerializeStruct::serialize_field),
+            quote!(_serde::ser::SerializeStruct::skip_field),
+        ),
     };
 
     let serialize_fields = serialize_struct_visitor(fields, params, true, method, skip_method);
@@ -789,16 +745,14 @@ fn serialize_struct_variant<'a>(
     let let_mut = mut_if(serialized_fields.peek().is_some());
 
     let len = serialized_fields
-        .map(
-            |field| {
-                let ident = field.ident.clone().expect("struct has unnamed fields");
+        .map(|field| {
+            let ident = field.ident.clone().expect("struct has unnamed fields");
 
-                match field.attrs.skip_serializing_if() {
-                    Some(path) => quote!(if #path(#ident) { 0 } else { 1 }),
-                    None => quote!(1),
-                }
-            },
-        )
+            match field.attrs.skip_serializing_if() {
+                Some(path) => quote!(if #path(#ident) { 0 } else { 1 }),
+                None => quote!(1),
+            }
+        })
         .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
 
     match context {
@@ -857,34 +811,32 @@ fn serialize_tuple_struct_visitor(
     fields
         .iter()
         .enumerate()
-        .map(
-            |(i, field)| {
-                let mut field_expr = if is_enum {
-                    let id = Ident::new(format!("__field{}", i));
-                    quote!(#id)
-                } else {
-                    get_field(params, field, i)
-                };
+        .map(|(i, field)| {
+            let mut field_expr = if is_enum {
+                let id = Ident::new(format!("__field{}", i));
+                quote!(#id)
+            } else {
+                get_field(params, field, i)
+            };
 
-                let skip = field
-                    .attrs
-                    .skip_serializing_if()
-                    .map(|path| quote!(#path(#field_expr)));
+            let skip = field
+                .attrs
+                .skip_serializing_if()
+                .map(|path| quote!(#path(#field_expr)));
 
-                if let Some(path) = field.attrs.serialize_with() {
-                    field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
-                }
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
+            }
 
-                let ser = quote! {
-                    try!(#func(&mut __serde_state, #field_expr));
-                };
+            let ser = quote! {
+                try!(#func(&mut __serde_state, #field_expr));
+            };
 
-                match skip {
-                    None => ser,
-                    Some(skip) => quote!(if !#skip { #ser }),
-                }
-            },
-        )
+            match skip {
+                None => ser,
+                Some(skip) => quote!(if !#skip { #ser }),
+            }
+        })
         .collect()
 }
 
@@ -898,44 +850,42 @@ fn serialize_struct_visitor(
     fields
         .iter()
         .filter(|&field| !field.attrs.skip_serializing())
-        .map(
-            |field| {
-                let field_ident = field.ident.clone().expect("struct has unnamed field");
-                let mut field_expr = if is_enum {
-                    quote!(#field_ident)
-                } else {
-                    get_field(params, field, field_ident)
-                };
+        .map(|field| {
+            let field_ident = field.ident.clone().expect("struct has unnamed field");
+            let mut field_expr = if is_enum {
+                quote!(#field_ident)
+            } else {
+                get_field(params, field, field_ident)
+            };
 
-                let key_expr = field.attrs.name().serialize_name();
+            let key_expr = field.attrs.name().serialize_name();
 
-                let skip = field
-                    .attrs
-                    .skip_serializing_if()
-                    .map(|path| quote!(#path(#field_expr)));
+            let skip = field
+                .attrs
+                .skip_serializing_if()
+                .map(|path| quote!(#path(#field_expr)));
 
-                if let Some(path) = field.attrs.serialize_with() {
-                    field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
-                }
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_field_with(params, field.ty, path, field_expr);
+            }
 
-                let ser = quote! {
-                    try!(#func(&mut __serde_state, #key_expr, #field_expr));
-                };
+            let ser = quote! {
+                try!(#func(&mut __serde_state, #key_expr, #field_expr));
+            };
 
-                match skip {
-                    None => ser,
-                    Some(skip) => {
-                        quote! {
-                            if !#skip {
-                                #ser
-                            } else {
-                                try!(#skip_func(&mut __serde_state, #key_expr));
-                            }
+            match skip {
+                None => ser,
+                Some(skip) => {
+                    quote! {
+                        if !#skip {
+                            #ser
+                        } else {
+                            try!(#skip_func(&mut __serde_state, #key_expr));
                         }
                     }
                 }
-            },
-        )
+            }
+        })
         .collect()
 }
 
@@ -945,10 +895,7 @@ fn wrap_serialize_field_with(
     serialize_with: &syn::Path,
     field_expr: Tokens,
 ) -> Tokens {
-    wrap_serialize_with(params,
-                        serialize_with,
-                        &[field_ty],
-                        &[quote!(#field_expr)])
+    wrap_serialize_with(params, serialize_with, &[field_ty], &[quote!(#field_expr)])
 }
 
 fn wrap_serialize_variant_with(
@@ -957,15 +904,24 @@ fn wrap_serialize_variant_with(
     variant: &Variant,
 ) -> Tokens {
     let field_tys: Vec<_> = variant.fields.iter().map(|field| field.ty).collect();
-    let field_exprs: Vec<_> = variant.fields.iter()
+    let field_exprs: Vec<_> = variant
+        .fields
+        .iter()
         .enumerate()
         .map(|(i, field)| {
-            let id = field.ident.as_ref().map_or_else(|| Ident::new(format!("__field{}", i)),
-                                                      |id| id.clone());
+            let id = field
+                .ident
+                .as_ref()
+                .map_or_else(|| Ident::new(format!("__field{}", i)), |id| id.clone());
             quote!(#id)
         })
         .collect();
-    wrap_serialize_with(params, serialize_with, field_tys.as_slice(), field_exprs.as_slice())
+    wrap_serialize_with(
+        params,
+        serialize_with,
+        field_tys.as_slice(),
+        field_exprs.as_slice(),
+    )
 }
 
 fn wrap_serialize_with(
@@ -1014,7 +970,11 @@ fn wrap_serialize_with(
 //
 // where we want to omit the `mut` to avoid a warning.
 fn mut_if(is_mut: bool) -> Option<Tokens> {
-    if is_mut { Some(quote!(mut)) } else { None }
+    if is_mut {
+        Some(quote!(mut))
+    } else {
+        None
+    }
 }
 
 fn get_field<I>(params: &Parameters, field: &Field, ident: I) -> Tokens
diff --git a/third_party/rust/serde_derive_internals/.cargo-checksum.json b/third_party/rust/serde_derive_internals/.cargo-checksum.json
index c261651da2f5..2c7dc1de68f1 100644
--- a/third_party/rust/serde_derive_internals/.cargo-checksum.json
+++ b/third_party/rust/serde_derive_internals/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0435204d95404e25ee07fa3169ddf5eef26bde3fce03f4e63e9e55774d620199","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/ast.rs":"bc9936766227f78bf34cf003d271ffd70ad056e1272caafc1b185bdd32cc46bb","src/attr.rs":"51c92750f7b490a2c46950a68b5491d83181815d98e0fe3db102369b1ca9fe6e","src/case.rs":"be3288491dae43ca53643cb8409431e5e65ccf39c69c8047676e89c997827b0c","src/check.rs":"e976c9bac0daa334b2c82c6a91ac472235c7a1d91c5fe0deb2a83fe71b7c0663","src/ctxt.rs":"98eab1acd3de8617b516d1de7d5d870bb1d2a1c1aca258a4cca2bde3f8df88e4","src/lib.rs":"f242433bcb42c2360b8887d6e9f1b286a332080f1f0a081de06b0c061b563348"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"714507185f11d1717d52710ca58df5c6427a808590543bb3b33e9b05bb8bbf92","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/ast.rs":"803beccc3b527f926596acfe555fcc0069beebb23ffe1fb8cc0d2faac44fa8f7","src/attr.rs":"af9afd1a768db4d272ff13ff06412eae8d5edc57be0a29b396de8895499436c1","src/case.rs":"8d50d3db3c74c569c75bcf4b285d21bf176940a2efae0656bef769334d62793c","src/check.rs":"dd9d9723bd4d21787cdcff00d6b672f16276088ff0373d20e3fb3eca61580518","src/ctxt.rs":"e842cc73bfd648f14f3bad73e3db321d6cd0f94d255d59e81ed768486fe5deda","src/lib.rs":"5546043bf2cc6d81c1f323df0bd391ad53125f759f217e46e18d035df422b981"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/serde_derive_internals/Cargo.toml b/third_party/rust/serde_derive_internals/Cargo.toml
index 6148cda6b8df..f47fdacb96e5 100644
--- a/third_party/rust/serde_derive_internals/Cargo.toml
+++ b/third_party/rust/serde_derive_internals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_derive_internals"
-version = "0.17.0" # remember to update html_root_url
+version = "0.19.0" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "AST representation used by Serde derive macros. Unstable."
diff --git a/third_party/rust/serde_derive_internals/src/ast.rs b/third_party/rust/serde_derive_internals/src/ast.rs
index 497fcb87ffcf..a11de37de3d3 100644
--- a/third_party/rust/serde_derive_internals/src/ast.rs
+++ b/third_party/rust/serde_derive_internals/src/ast.rs
@@ -55,29 +55,26 @@ impl<'a> Container<'a> {
         let attrs = attr::Container::from_ast(cx, item);
 
         let mut body = match item.body {
-            syn::Body::Enum(ref variants) => enum_from_ast(cx, item, variants),
+            syn::Body::Enum(ref variants) => {
+                let (repr, variants) = enum_from_ast(cx, item, variants, &attrs.default());
+                Body::Enum(repr, variants)
+            }
             syn::Body::Struct(ref variant_data) => {
-                let (style, fields) = struct_from_ast(cx, variant_data, None);
+                let (style, fields) = struct_from_ast(cx, variant_data, None, &attrs.default());
                 Body::Struct(style, fields)
             }
         };
 
         match body {
-            Body::Enum(_, ref mut variants) => {
-                for ref mut variant in variants {
-                    variant.attrs.rename_by_rule(attrs.rename_all());
-                    for ref mut field in &mut variant.fields {
-                        field.attrs.rename_by_rule(variant.attrs.rename_all());
-                    }
+            Body::Enum(_, ref mut variants) => for ref mut variant in variants {
+                variant.attrs.rename_by_rule(attrs.rename_all());
+                for ref mut field in &mut variant.fields {
+                    field.attrs.rename_by_rule(variant.attrs.rename_all());
                 }
-
-                
-            }
-            Body::Struct(_, ref mut fields) => {
-                for field in fields {
-                    field.attrs.rename_by_rule(attrs.rename_all());
-                }
-            }
+            },
+            Body::Struct(_, ref mut fields) => for field in fields {
+                field.attrs.rename_by_rule(attrs.rename_all());
+            },
         }
 
         let item = Container {
@@ -126,13 +123,19 @@ impl Repr {
     }
 }
 
-fn enum_from_ast<'a>(cx: &Ctxt, item: &'a syn::DeriveInput, variants: &'a [syn::Variant]) -> Body<'a> {
+fn enum_from_ast<'a>(
+    cx: &Ctxt, 
+    item: &'a syn::DeriveInput, 
+    variants: &'a [syn::Variant], 
+    container_default: &attr::Default
+) -> (Repr, Vec<Variant<'a>>) {
     let variants = variants
         .iter()
         .map(
             |variant| {
                 let attrs = attr::Variant::from_ast(cx, variant);
-                let (style, fields) = struct_from_ast(cx, &variant.data, Some(&attrs));
+                let (style, fields) = 
+                    struct_from_ast(cx, &variant.data, Some(&attrs), container_default);
                 Variant {
                     ident: variant.ident.clone(),
                     attrs: attrs,
@@ -162,11 +165,11 @@ fn enum_from_ast<'a>(cx: &Ctxt, item: &'a syn::DeriveInput, variants: &'a [syn::
                         if repr == "C" {
                             c_repr = true;
                         } else if let Some(int_type) = INT_TYPES.iter().cloned().find(|int_type| repr == int_type) {
-                            if int_repr.is_some() { 
+                            if int_repr.is_some() {
                                 // This shouldn't happen, but we shouldn't crash if we see it.
                                 // So just treat the enum as having a mysterious other repr,
                                 // which makes us discard any attempt to optimize based on layout.
-                                other_repr = true; 
+                                other_repr = true;
                             }
                             int_repr = Some(int_type);
                         } else {
@@ -182,32 +185,45 @@ fn enum_from_ast<'a>(cx: &Ctxt, item: &'a syn::DeriveInput, variants: &'a [syn::
 
     let repr = Repr { int_repr, c_repr, other_repr };
 
-    Body::Enum(repr, variants)
+    (repr, variants)
 }
 
-fn struct_from_ast<'a>(cx: &Ctxt, data: &'a syn::VariantData, attrs: Option<&attr::Variant>) -> (Style, Vec<Field<'a>>) {
+fn struct_from_ast<'a>(
+    cx: &Ctxt,
+    data: &'a syn::VariantData,
+    attrs: Option<&attr::Variant>,
+    container_default: &attr::Default,
+) -> (Style, Vec<Field<'a>>) {
     match *data {
-        syn::VariantData::Struct(ref fields) => (Style::Struct, fields_from_ast(cx, fields, attrs)),
-        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
-            (Style::Newtype, fields_from_ast(cx, fields, attrs))
-        }
-        syn::VariantData::Tuple(ref fields) => (Style::Tuple, fields_from_ast(cx, fields, attrs)),
+        syn::VariantData::Struct(ref fields) => (
+            Style::Struct,
+            fields_from_ast(cx, fields, attrs, container_default),
+        ),
+        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => (
+            Style::Newtype,
+            fields_from_ast(cx, fields, attrs, container_default),
+        ),
+        syn::VariantData::Tuple(ref fields) => (
+            Style::Tuple,
+            fields_from_ast(cx, fields, attrs, container_default),
+        ),
         syn::VariantData::Unit => (Style::Unit, Vec::new()),
     }
 }
 
-fn fields_from_ast<'a>(cx: &Ctxt, fields: &'a [syn::Field], attrs: Option<&attr::Variant>) -> Vec<Field<'a>> {
+fn fields_from_ast<'a>(
+    cx: &Ctxt,
+    fields: &'a [syn::Field],
+    attrs: Option<&attr::Variant>,
+    container_default: &attr::Default,
+) -> Vec<Field<'a>> {
     fields
         .iter()
         .enumerate()
-        .map(
-            |(i, field)| {
-                Field {
-                    ident: field.ident.clone(),
-                    attrs: attr::Field::from_ast(cx, i, field, attrs),
-                    ty: &field.ty,
-                }
-            },
-        )
+        .map(|(i, field)| Field {
+            ident: field.ident.clone(),
+            attrs: attr::Field::from_ast(cx, i, field, attrs, container_default),
+            ty: &field.ty,
+        })
         .collect()
 }
diff --git a/third_party/rust/serde_derive_internals/src/attr.rs b/third_party/rust/serde_derive_internals/src/attr.rs
index 7baeb59bb31b..ce0ed0267c1f 100644
--- a/third_party/rust/serde_derive_internals/src/attr.rs
+++ b/third_party/rust/serde_derive_internals/src/attr.rs
@@ -164,6 +164,15 @@ pub enum Identifier {
     Variant,
 }
 
+impl Identifier {
+    pub fn is_some(self) -> bool {
+        match self {
+            Identifier::No => false,
+            Identifier::Field | Identifier::Variant => true,
+        }
+    }
+}
+
 impl Container {
     /// Extract out the `#[serde(...)]` attributes from an item.
     pub fn from_ast(cx: &Ctxt, item: &syn::DeriveInput) -> Self {
@@ -207,11 +216,11 @@ impl Container {
                         if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
                             match RenameRule::from_str(&s) {
                                 Ok(rename_rule) => rename_all.set(rename_rule),
-                                Err(()) => {
-                                    cx.error(format!("unknown rename rule for #[serde(rename_all \
-                                                      = {:?})]",
-                                                     s))
-                                }
+                                Err(()) => cx.error(format!(
+                                    "unknown rename rule for #[serde(rename_all \
+                                     = {:?})]",
+                                    s
+                                )),
                             }
                         }
                     }
@@ -222,19 +231,15 @@ impl Container {
                     }
 
                     // Parse `#[serde(default)]`
-                    MetaItem(Word(ref name)) if name == "default" => {
-                        match item.body {
-                            syn::Body::Struct(syn::VariantData::Struct(_)) => {
-                                default.set(Default::Default);
-                            }
-                            _ => {
-                                cx.error(
-                                    "#[serde(default)] can only be used on structs \
-                                          with named fields",
-                                )
-                            }
+                    MetaItem(Word(ref name)) if name == "default" => match item.body {
+                        syn::Body::Struct(syn::VariantData::Struct(_)) => {
+                            default.set(Default::Default);
                         }
-                    }
+                        _ => cx.error(
+                            "#[serde(default)] can only be used on structs \
+                             with named fields",
+                        ),
+                    },
 
                     // Parse `#[serde(default = "...")]`
                     MetaItem(NameValue(ref name, ref lit)) if name == "default" => {
@@ -243,12 +248,10 @@ impl Container {
                                 syn::Body::Struct(syn::VariantData::Struct(_)) => {
                                     default.set(Default::Path(path));
                                 }
-                                _ => {
-                                    cx.error(
-                                        "#[serde(default = \"...\")] can only be used \
-                                              on structs with named fields",
-                                    )
-                                }
+                                _ => cx.error(
+                                    "#[serde(default = \"...\")] can only be used \
+                                     on structs with named fields",
+                                ),
                             }
                         }
                     }
@@ -256,7 +259,8 @@ impl Container {
                     // Parse `#[serde(bound = "D: Serialize")]`
                     MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
                         if let Ok(where_predicates) =
-                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit)
+                        {
                             ser_bound.set(where_predicates.clone());
                             de_bound.set(where_predicates);
                         }
@@ -271,16 +275,14 @@ impl Container {
                     }
 
                     // Parse `#[serde(untagged)]`
-                    MetaItem(Word(ref name)) if name == "untagged" => {
-                        match item.body {
-                            syn::Body::Enum(_) => {
-                                untagged.set_true();
-                            }
-                            syn::Body::Struct(_) => {
-                                cx.error("#[serde(untagged)] can only be used on enums")
-                            }
+                    MetaItem(Word(ref name)) if name == "untagged" => match item.body {
+                        syn::Body::Enum(_) => {
+                            untagged.set_true();
                         }
-                    }
+                        syn::Body::Struct(_) => {
+                            cx.error("#[serde(untagged)] can only be used on enums")
+                        }
+                    },
 
                     // Parse `#[serde(tag = "type")]`
                     MetaItem(NameValue(ref name, ref lit)) if name == "tag" => {
@@ -303,12 +305,10 @@ impl Container {
                                 syn::Body::Enum(_) => {
                                     content.set(s);
                                 }
-                                syn::Body::Struct(_) => {
-                                    cx.error(
-                                        "#[serde(content = \"...\")] can only be used on \
-                                              enums",
-                                    )
-                                }
+                                syn::Body::Struct(_) => cx.error(
+                                    "#[serde(content = \"...\")] can only be used on \
+                                     enums",
+                                ),
                             }
                         }
                     }
@@ -345,8 +345,10 @@ impl Container {
                     }
 
                     MetaItem(ref meta_item) => {
-                        cx.error(format!("unknown serde container attribute `{}`",
-                                         meta_item.name()));
+                        cx.error(format!(
+                            "unknown serde container attribute `{}`",
+                            meta_item.name()
+                        ));
                     }
 
                     Literal(_) => {
@@ -434,13 +436,12 @@ fn decide_tag(
             if let syn::Body::Enum(ref variants) = item.body {
                 for variant in variants {
                     match variant.data {
-                        syn::VariantData::Struct(_) |
-                        syn::VariantData::Unit => {}
+                        syn::VariantData::Struct(_) | syn::VariantData::Unit => {}
                         syn::VariantData::Tuple(ref fields) => {
                             if fields.len() != 1 {
                                 cx.error(
                                     "#[serde(tag = \"...\")] cannot be used with tuple \
-                                        variants",
+                                     variants",
                                 );
                                 break;
                             }
@@ -455,21 +456,19 @@ fn decide_tag(
             EnumTag::External // doesn't matter, will error
         }
         (false, None, Some(_)) => {
-            cx.error("#[serde(tag = \"...\", content = \"...\")] must be used together",);
+            cx.error("#[serde(tag = \"...\", content = \"...\")] must be used together");
             EnumTag::External
         }
         (true, None, Some(_)) => {
             cx.error("untagged enum cannot have #[serde(content = \"...\")]");
             EnumTag::External
         }
-        (false, Some(tag), Some(content)) => {
-            EnumTag::Adjacent {
-                tag: tag,
-                content: content,
-            }
-        }
+        (false, Some(tag), Some(content)) => EnumTag::Adjacent {
+            tag: tag,
+            content: content,
+        },
         (true, Some(_), Some(_)) => {
-            cx.error("untagged enum cannot have #[serde(tag = \"...\", content = \"...\")]",);
+            cx.error("untagged enum cannot have #[serde(tag = \"...\", content = \"...\")]");
             EnumTag::External
         }
     }
@@ -484,7 +483,7 @@ fn decide_identifier(
     match (&item.body, field_identifier.get(), variant_identifier.get()) {
         (_, false, false) => Identifier::No,
         (_, true, true) => {
-            cx.error("`field_identifier` and `variant_identifier` cannot both be set",);
+            cx.error("`field_identifier` and `variant_identifier` cannot both be set");
             Identifier::No
         }
         (&syn::Body::Struct(_), true, false) => {
@@ -551,11 +550,11 @@ impl Variant {
                         if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
                             match RenameRule::from_str(&s) {
                                 Ok(rename_rule) => rename_all.set(rename_rule),
-                                Err(()) => {
-                                    cx.error(format!("unknown rename rule for #[serde(rename_all \
-                                                      = {:?})]",
-                                                     s))
-                                }
+                                Err(()) => cx.error(format!(
+                                    "unknown rename rule for #[serde(rename_all \
+                                     = {:?})]",
+                                    s
+                                )),
                             }
                         }
                     }
@@ -602,19 +601,20 @@ impl Variant {
                     }
 
                     // Defer `#[serde(borrow)]` and `#[serde(borrow = "'a + 'b")]`
-                    MetaItem(ref mi) if mi.name() == "borrow" => {
-                        match variant.data {
-                            syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
-                                borrow.set(mi.clone());
-                            }
-                            _ => {
-                                cx.error("#[serde(borrow)] may only be used on newtype variants");
-                            }
+                    MetaItem(ref mi) if mi.name() == "borrow" => match variant.data {
+                        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
+                            borrow.set(mi.clone());
                         }
-                    }
+                        _ => {
+                            cx.error("#[serde(borrow)] may only be used on newtype variants");
+                        }
+                    },
 
                     MetaItem(ref meta_item) => {
-                        cx.error(format!("unknown serde variant attribute `{}`", meta_item.name()));
+                        cx.error(format!(
+                            "unknown serde variant attribute `{}`",
+                            meta_item.name()
+                        ));
                     }
 
                     Literal(_) => {
@@ -714,7 +714,13 @@ pub enum Default {
 
 impl Field {
     /// Extract out the `#[serde(...)]` attributes from a struct field.
-    pub fn from_ast(cx: &Ctxt, index: usize, field: &syn::Field, attrs: Option<&Variant>) -> Self {
+    pub fn from_ast(
+        cx: &Ctxt,
+        index: usize,
+        field: &syn::Field,
+        attrs: Option<&Variant>,
+        container_default: &Default,
+    ) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
         let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
@@ -739,7 +745,12 @@ impl Field {
             .as_ref()
             .map(|borrow| vec![MetaItem(borrow.clone())]);
 
-        for meta_items in field.attrs.iter().filter_map(get_serde_meta_items).chain(variant_borrow) {
+        for meta_items in field
+            .attrs
+            .iter()
+            .filter_map(get_serde_meta_items)
+            .chain(variant_borrow)
+        {
             for meta_item in meta_items {
                 match meta_item {
                     // Parse `#[serde(rename = "foo")]`
@@ -784,7 +795,7 @@ impl Field {
                     MetaItem(Word(ref name)) if name == "skip" => {
                         skip_serializing.set_true();
                         skip_deserializing.set_true();
-                    },
+                    }
 
                     // Parse `#[serde(skip_serializing_if = "...")]`
                     MetaItem(NameValue(ref name, ref lit)) if name == "skip_serializing_if" => {
@@ -822,7 +833,8 @@ impl Field {
                     // Parse `#[serde(bound = "D: Serialize")]`
                     MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
                         if let Ok(where_predicates) =
-                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit)
+                        {
                             ser_bound.set(where_predicates.clone());
                             de_bound.set(where_predicates);
                         }
@@ -849,13 +861,10 @@ impl Field {
                             if let Ok(borrowable) = borrowable_lifetimes(cx, &ident, &field.ty) {
                                 for lifetime in &lifetimes {
                                     if !borrowable.contains(lifetime) {
-                                        cx.error(
-                                            format!(
-                                                "field `{}` does not have lifetime {}",
-                                                ident,
-                                                lifetime.ident
-                                            ),
-                                        );
+                                        cx.error(format!(
+                                            "field `{}` does not have lifetime {}",
+                                            ident, lifetime.ident
+                                        ));
                                     }
                                 }
                                 borrowed_lifetimes.set(lifetimes);
@@ -871,7 +880,10 @@ impl Field {
                     }
 
                     MetaItem(ref meta_item) => {
-                        cx.error(format!("unknown serde field attribute `{}`", meta_item.name()),);
+                        cx.error(format!(
+                            "unknown serde field attribute `{}`",
+                            meta_item.name()
+                        ));
                     }
 
                     Literal(_) => {
@@ -881,9 +893,10 @@ impl Field {
             }
         }
 
-        // Is skip_deserializing, initialize the field to Default::default()
-        // unless a different default is specified by `#[serde(default = "...")]`
-        if skip_deserializing.0.value.is_some() {
+        // Is skip_deserializing, initialize the field to Default::default() unless a different
+        // default is specified by `#[serde(default = "...")]` on ourselves or our container (e.g.
+        // the struct we are in).
+        if container_default == &Default::None && skip_deserializing.0.value.is_some() {
             default.set_if_none(Default::Default);
         }
 
@@ -1018,13 +1031,11 @@ where
             }
 
             _ => {
-                cx.error(
-                    format!(
-                        "malformed {0} attribute, expected `{0}(serialize = ..., \
-                                  deserialize = ...)`",
-                        attr_name
-                    ),
-                );
+                cx.error(format!(
+                    "malformed {0} attribute, expected `{0}(serialize = ..., \
+                     deserialize = ...)`",
+                    attr_name
+                ));
                 return Err(());
             }
         }
@@ -1060,13 +1071,10 @@ fn get_string_from_lit(
     if let syn::Lit::Str(ref s, _) = *lit {
         Ok(s.clone())
     } else {
-        cx.error(
-            format!(
-                "expected serde {} attribute to be a string: `{} = \"...\"`",
-                attr_name,
-                meta_item_name
-            ),
-        );
+        cx.error(format!(
+            "expected serde {} attribute to be a string: `{} = \"...\"`",
+            attr_name, meta_item_name
+        ));
         Err(())
     }
 }
@@ -1097,11 +1105,12 @@ fn parse_lit_into_where(
 fn parse_lit_into_ty(cx: &Ctxt, attr_name: &str, lit: &syn::Lit) -> Result<syn::Ty, ()> {
     let string = try!(get_string_from_lit(cx, attr_name, attr_name, lit));
 
-    syn::parse_type(&string).map_err(
-        |_| {
-            cx.error(format!("failed to parse type: {} = {:?}", attr_name, string),)
-        },
-    )
+    syn::parse_type(&string).map_err(|_| {
+        cx.error(format!(
+            "failed to parse type: {} = {:?}",
+            attr_name, string
+        ))
+    })
 }
 
 // Parses a string literal like "'a + 'b + 'c" containing a nonempty list of
@@ -1132,7 +1141,7 @@ fn parse_lit_into_lifetimes(
             return Ok(set);
         }
     }
-    Err(cx.error(format!("failed to parse borrowed lifetimes: {:?}", string)),)
+    Err(cx.error(format!("failed to parse borrowed lifetimes: {:?}", string)))
 }
 
 // Whether the type looks like it might be `std::borrow::Cow<T>` where elem="T".
@@ -1176,8 +1185,8 @@ fn is_cow(ty: &syn::Ty, elem: &str) -> bool {
             return false;
         }
     };
-    seg.ident == "Cow" && params.lifetimes.len() == 1 &&
-    params.types == vec![syn::parse_type(elem).unwrap()] && params.bindings.is_empty()
+    seg.ident == "Cow" && params.lifetimes.len() == 1
+        && params.types == vec![syn::parse_type(elem).unwrap()] && params.bindings.is_empty()
 }
 
 // Whether the type looks like it might be `&T` where elem="T". This can have
@@ -1203,8 +1212,8 @@ fn is_cow(ty: &syn::Ty, elem: &str) -> bool {
 fn is_rptr(ty: &syn::Ty, elem: &str) -> bool {
     match *ty {
         syn::Ty::Rptr(Some(_), ref mut_ty) => {
-            mut_ty.mutability == syn::Mutability::Immutable &&
-            mut_ty.ty == syn::parse_type(elem).unwrap()
+            mut_ty.mutability == syn::Mutability::Immutable
+                && mut_ty.ty == syn::parse_type(elem).unwrap()
         }
         _ => false,
     }
@@ -1225,7 +1234,7 @@ fn borrowable_lifetimes(
     let mut lifetimes = BTreeSet::new();
     collect_lifetimes(ty, &mut lifetimes);
     if lifetimes.is_empty() {
-        Err(cx.error(format!("field `{}` has no lifetimes to borrow", name)),)
+        Err(cx.error(format!("field `{}` has no lifetimes to borrow", name)))
     } else {
         Ok(lifetimes)
     }
@@ -1233,9 +1242,7 @@ fn borrowable_lifetimes(
 
 fn collect_lifetimes(ty: &syn::Ty, out: &mut BTreeSet<syn::Lifetime>) {
     match *ty {
-        syn::Ty::Slice(ref elem) |
-        syn::Ty::Array(ref elem, _) |
-        syn::Ty::Paren(ref elem) => {
+        syn::Ty::Slice(ref elem) | syn::Ty::Array(ref elem, _) | syn::Ty::Paren(ref elem) => {
             collect_lifetimes(elem, out);
         }
         syn::Ty::Ptr(ref elem) => {
@@ -1245,11 +1252,9 @@ fn collect_lifetimes(ty: &syn::Ty, out: &mut BTreeSet<syn::Lifetime>) {
             out.extend(lifetime.iter().cloned());
             collect_lifetimes(&elem.ty, out);
         }
-        syn::Ty::Tup(ref elems) => {
-            for elem in elems {
-                collect_lifetimes(elem, out);
-            }
-        }
+        syn::Ty::Tup(ref elems) => for elem in elems {
+            collect_lifetimes(elem, out);
+        },
         syn::Ty::Path(ref qself, ref path) => {
             if let Some(ref qself) = *qself {
                 collect_lifetimes(&qself.ty, out);
@@ -1266,11 +1271,11 @@ fn collect_lifetimes(ty: &syn::Ty, out: &mut BTreeSet<syn::Lifetime>) {
                 }
             }
         }
-        syn::Ty::BareFn(_) |
-        syn::Ty::Never |
-        syn::Ty::TraitObject(_) |
-        syn::Ty::ImplTrait(_) |
-        syn::Ty::Infer |
-        syn::Ty::Mac(_) => {}
+        syn::Ty::BareFn(_)
+        | syn::Ty::Never
+        | syn::Ty::TraitObject(_)
+        | syn::Ty::ImplTrait(_)
+        | syn::Ty::Infer
+        | syn::Ty::Mac(_) => {}
     }
 }
diff --git a/third_party/rust/serde_derive_internals/src/case.rs b/third_party/rust/serde_derive_internals/src/case.rs
index 75c38e48ac8f..3357debb877e 100644
--- a/third_party/rust/serde_derive_internals/src/case.rs
+++ b/third_party/rust/serde_derive_internals/src/case.rs
@@ -20,6 +20,8 @@ pub enum RenameRule {
     None,
     /// Rename direct children to "lowercase" style.
     LowerCase,
+    /// Rename direct children to "UPPERCASE" style.
+    UPPERCASE,
     /// Rename direct children to "PascalCase" style, as typically used for enum variants.
     PascalCase,
     /// Rename direct children to "camelCase" style.
@@ -31,7 +33,7 @@ pub enum RenameRule {
     /// Rename direct children to "kebab-case" style.
     KebabCase,
     /// Rename direct children to "SCREAMING-KEBAB-CASE" style.
-    ScreamingKebabCase
+    ScreamingKebabCase,
 }
 
 impl RenameRule {
@@ -39,6 +41,7 @@ impl RenameRule {
         match *self {
             None | PascalCase => variant.to_owned(),
             LowerCase => variant.to_ascii_lowercase(),
+            UPPERCASE => variant.to_ascii_uppercase(),
             CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
             SnakeCase => {
                 let mut snake = String::new();
@@ -52,13 +55,16 @@ impl RenameRule {
             }
             ScreamingSnakeCase => SnakeCase.apply_to_variant(variant).to_ascii_uppercase(),
             KebabCase => SnakeCase.apply_to_variant(variant).replace('_', "-"),
-            ScreamingKebabCase => ScreamingSnakeCase.apply_to_variant(variant).replace('_', "-")
+            ScreamingKebabCase => ScreamingSnakeCase
+                .apply_to_variant(variant)
+                .replace('_', "-"),
         }
     }
 
     pub fn apply_to_field(&self, field: &str) -> String {
         match *self {
             None | LowerCase | SnakeCase => field.to_owned(),
+            UPPERCASE => field.to_ascii_uppercase(),
             PascalCase => {
                 let mut pascal = String::new();
                 let mut capitalize = true;
@@ -80,7 +86,7 @@ impl RenameRule {
             }
             ScreamingSnakeCase => field.to_ascii_uppercase(),
             KebabCase => field.replace('_', "-"),
-            ScreamingKebabCase => ScreamingSnakeCase.apply_to_field(field).replace('_', "-")
+            ScreamingKebabCase => ScreamingSnakeCase.apply_to_field(field).replace('_', "-"),
         }
     }
 }
@@ -91,6 +97,7 @@ impl FromStr for RenameRule {
     fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
         match rename_all_str {
             "lowercase" => Ok(LowerCase),
+            "UPPERCASE" => Ok(UPPERCASE),
             "PascalCase" => Ok(PascalCase),
             "camelCase" => Ok(CamelCase),
             "snake_case" => Ok(SnakeCase),
@@ -104,34 +111,71 @@ impl FromStr for RenameRule {
 
 #[test]
 fn rename_variants() {
-    for &(original, lower, camel, snake, screaming, kebab, screaming_kebab) in
-        &[
-            ("Outcome", "outcome", "outcome", "outcome", "OUTCOME", "outcome", "OUTCOME"),
-            ("VeryTasty", "verytasty", "veryTasty", "very_tasty", "VERY_TASTY", "very-tasty", "VERY-TASTY"),
-            ("A", "a", "a", "a", "A", "a", "A"),
-            ("Z42", "z42", "z42", "z42", "Z42", "z42", "Z42"),
-        ] {
+    for &(original, lower, upper, camel, snake, screaming, kebab, screaming_kebab) in &[
+        (
+            "Outcome",
+            "outcome",
+            "OUTCOME",
+            "outcome",
+            "outcome",
+            "OUTCOME",
+            "outcome",
+            "OUTCOME",
+        ),
+        (
+            "VeryTasty",
+            "verytasty",
+            "VERYTASTY",
+            "veryTasty",
+            "very_tasty",
+            "VERY_TASTY",
+            "very-tasty",
+            "VERY-TASTY",
+        ),
+        ("A", "a", "A", "a", "a", "A", "a", "A"),
+        ("Z42", "z42", "Z42", "z42", "z42", "Z42", "z42", "Z42"),
+    ] {
         assert_eq!(None.apply_to_variant(original), original);
         assert_eq!(LowerCase.apply_to_variant(original), lower);
+        assert_eq!(UPPERCASE.apply_to_variant(original), upper);
         assert_eq!(PascalCase.apply_to_variant(original), original);
         assert_eq!(CamelCase.apply_to_variant(original), camel);
         assert_eq!(SnakeCase.apply_to_variant(original), snake);
         assert_eq!(ScreamingSnakeCase.apply_to_variant(original), screaming);
         assert_eq!(KebabCase.apply_to_variant(original), kebab);
-        assert_eq!(ScreamingKebabCase.apply_to_variant(original), screaming_kebab);
+        assert_eq!(
+            ScreamingKebabCase.apply_to_variant(original),
+            screaming_kebab
+        );
     }
 }
 
 #[test]
 fn rename_fields() {
-    for &(original, pascal, camel, screaming, kebab, screaming_kebab) in
-        &[
-            ("outcome", "Outcome", "outcome", "OUTCOME", "outcome", "OUTCOME"),
-            ("very_tasty", "VeryTasty", "veryTasty", "VERY_TASTY", "very-tasty", "VERY-TASTY"),
-            ("a", "A", "a", "A", "a", "A"),
-            ("z42", "Z42", "z42", "Z42", "z42", "Z42"),
-        ] {
+    for &(original, upper, pascal, camel, screaming, kebab, screaming_kebab) in &[
+        (
+            "outcome",
+            "OUTCOME",
+            "Outcome",
+            "outcome",
+            "OUTCOME",
+            "outcome",
+            "OUTCOME",
+        ),
+        (
+            "very_tasty",
+            "VERY_TASTY",
+            "VeryTasty",
+            "veryTasty",
+            "VERY_TASTY",
+            "very-tasty",
+            "VERY-TASTY",
+        ),
+        ("a", "A", "A", "a", "A", "a", "A"),
+        ("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42"),
+    ] {
         assert_eq!(None.apply_to_field(original), original);
+        assert_eq!(UPPERCASE.apply_to_field(original), upper);
         assert_eq!(PascalCase.apply_to_field(original), pascal);
         assert_eq!(CamelCase.apply_to_field(original), camel);
         assert_eq!(SnakeCase.apply_to_field(original), original);
diff --git a/third_party/rust/serde_derive_internals/src/check.rs b/third_party/rust/serde_derive_internals/src/check.rs
index eeb965b26e1b..d67029b98a2e 100644
--- a/third_party/rust/serde_derive_internals/src/check.rs
+++ b/third_party/rust/serde_derive_internals/src/check.rs
@@ -31,7 +31,7 @@ fn check_getter(cx: &Ctxt, cont: &Container) {
             if cont.body.has_getter() && cont.attrs.remote().is_none() {
                 cx.error(
                     "#[serde(getter = \"...\")] can only be used in structs \
-                          that have #[serde(remote = \"...\")]",
+                     that have #[serde(remote = \"...\")]",
                 );
             }
         }
@@ -53,10 +53,13 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
     };
 
     for (i, variant) in variants.iter().enumerate() {
-        match (variant.style, cont.attrs.identifier(), variant.attrs.other()) {
+        match (
+            variant.style,
+            cont.attrs.identifier(),
+            variant.attrs.other(),
+        ) {
             // The `other` attribute may only be used in a field_identifier.
-            (_, Identifier::Variant, true) |
-            (_, Identifier::No, true) => {
+            (_, Identifier::Variant, true) | (_, Identifier::No, true) => {
                 cx.error("#[serde(other)] may only be used inside a field_identifier");
             }
 
@@ -109,42 +112,58 @@ fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
     for variant in variants.iter() {
         if variant.attrs.serialize_with().is_some() {
             if variant.attrs.skip_serializing() {
-                cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
-                                  #[serde(skip_serializing)]", variant.ident));
+                cx.error(format!(
+                    "variant `{}` cannot have both #[serde(serialize_with)] and \
+                     #[serde(skip_serializing)]",
+                    variant.ident
+                ));
             }
 
             for (i, field) in variant.fields.iter().enumerate() {
-                let ident = field.ident.as_ref().map_or_else(|| format!("{}", i),
-                                                             |ident| format!("`{}`", ident));
+                let ident = field
+                    .ident
+                    .as_ref()
+                    .map_or_else(|| format!("{}", i), |ident| format!("`{}`", ident));
 
                 if field.attrs.skip_serializing() {
-                    cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
-                                      a field {} marked with #[serde(skip_serializing)]",
-                                     variant.ident, ident));
+                    cx.error(format!(
+                        "variant `{}` cannot have both #[serde(serialize_with)] and \
+                         a field {} marked with #[serde(skip_serializing)]",
+                        variant.ident, ident
+                    ));
                 }
 
                 if field.attrs.skip_serializing_if().is_some() {
-                    cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
-                                      a field {} marked with #[serde(skip_serializing_if)]",
-                                     variant.ident, ident));
+                    cx.error(format!(
+                        "variant `{}` cannot have both #[serde(serialize_with)] and \
+                         a field {} marked with #[serde(skip_serializing_if)]",
+                        variant.ident, ident
+                    ));
                 }
             }
         }
 
         if variant.attrs.deserialize_with().is_some() {
             if variant.attrs.skip_deserializing() {
-                cx.error(format!("variant `{}` cannot have both #[serde(deserialize_with)] and \
-                                  #[serde(skip_deserializing)]", variant.ident));
+                cx.error(format!(
+                    "variant `{}` cannot have both #[serde(deserialize_with)] and \
+                     #[serde(skip_deserializing)]",
+                    variant.ident
+                ));
             }
 
             for (i, field) in variant.fields.iter().enumerate() {
                 if field.attrs.skip_deserializing() {
-                    let ident = field.ident.as_ref().map_or_else(|| format!("{}", i),
-                                                                 |ident| format!("`{}`", ident));
+                    let ident = field
+                        .ident
+                        .as_ref()
+                        .map_or_else(|| format!("{}", i), |ident| format!("`{}`", ident));
 
-                    cx.error(format!("variant `{}` cannot have both #[serde(deserialize_with)] \
-                                      and a field {} marked with #[serde(skip_deserializing)]",
-                                     variant.ident, ident));
+                    cx.error(format!(
+                        "variant `{}` cannot have both #[serde(deserialize_with)] \
+                         and a field {} marked with #[serde(skip_deserializing)]",
+                        variant.ident, ident
+                    ));
                 }
             }
         }
diff --git a/third_party/rust/serde_derive_internals/src/ctxt.rs b/third_party/rust/serde_derive_internals/src/ctxt.rs
index fa8c57ad613f..0ce7916cd2bc 100644
--- a/third_party/rust/serde_derive_internals/src/ctxt.rs
+++ b/third_party/rust/serde_derive_internals/src/ctxt.rs
@@ -16,7 +16,9 @@ pub struct Ctxt {
 
 impl Ctxt {
     pub fn new() -> Self {
-        Ctxt { errors: RefCell::new(Some(Vec::new())) }
+        Ctxt {
+            errors: RefCell::new(Some(Vec::new())),
+        }
     }
 
     pub fn error<T: Display>(&self, msg: T) {
diff --git a/third_party/rust/serde_derive_internals/src/lib.rs b/third_party/rust/serde_derive_internals/src/lib.rs
index 0667936a12be..339341baf5ff 100644
--- a/third_party/rust/serde_derive_internals/src/lib.rs
+++ b/third_party/rust/serde_derive_internals/src/lib.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.17.0")]
+#![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.19.0")]
 
 extern crate syn;
 #[macro_use]
diff --git a/toolkit/components/extensions/ExtensionPageChild.jsm b/toolkit/components/extensions/ExtensionPageChild.jsm
index a3a03816cf2c..d80bb87a37f6 100644
--- a/toolkit/components/extensions/ExtensionPageChild.jsm
+++ b/toolkit/components/extensions/ExtensionPageChild.jsm
@@ -60,6 +60,40 @@ const {
 
 var ExtensionPageChild;
 
+const initializeBackgroundPage = (context) => {
+  // Override the `alert()` method inside background windows;
+  // we alias it to console.log().
+  // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1203394
+  let alertDisplayedWarning = false;
+  const innerWindowID = getInnerWindowID(context.contentWindow);
+
+  function logWarningMessage({text, filename, lineNumber, columnNumber}) {
+    let consoleMsg = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
+    consoleMsg.initWithWindowID(text, filename, null, lineNumber, columnNumber,
+                                Ci.nsIScriptError.warningFlag, "webextension",
+                                innerWindowID);
+    Services.console.logMessage(consoleMsg);
+  }
+
+  let alertOverwrite = text => {
+    const {filename, columnNumber, lineNumber} = Components.stack.caller;
+
+    if (!alertDisplayedWarning) {
+      context.childManager.callParentAsyncFunction("runtime.openBrowserConsole", []);
+
+      logWarningMessage({
+        text: "alert() is not supported in background windows; please use console.log instead.",
+        filename, lineNumber, columnNumber,
+      });
+
+      alertDisplayedWarning = true;
+    }
+
+    logWarningMessage({text, filename, lineNumber, columnNumber});
+  };
+  Cu.exportFunction(alertOverwrite, context.contentWindow, {defineAs: "alert"});
+};
+
 function getFrameData(global) {
   return processScript.getFrameData(global, true);
 }
@@ -253,7 +287,7 @@ defineLazyGetter(ExtensionPageContextChild.prototype, "childManager", function()
   this.callOnClose(childManager);
 
   if (this.viewType == "background") {
-    apiManager.global.initializeBackgroundPage(this.contentWindow);
+    initializeBackgroundPage(this);
   }
 
   return childManager;
diff --git a/toolkit/components/extensions/ext-c-toolkit.js b/toolkit/components/extensions/ext-c-toolkit.js
index bc5d09c5606d..1b2e6a3b085f 100644
--- a/toolkit/components/extensions/ext-c-toolkit.js
+++ b/toolkit/components/extensions/ext-c-toolkit.js
@@ -4,8 +4,6 @@ Cu.import("resource://gre/modules/ExtensionCommon.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "DevToolsShim",
-                                  "chrome://devtools-shim/content/DevToolsShim.jsm");
 
 // These are defined on "global" which is used for the same scopes as the other
 // ext-c-*.js files.
@@ -14,24 +12,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "DevToolsShim",
 
 global.EventManager = ExtensionCommon.EventManager;
 
-global.initializeBackgroundPage = (contentWindow) => {
-  // Override the `alert()` method inside background windows;
-  // we alias it to console.log().
-  // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1203394
-  let alertDisplayedWarning = false;
-  let alertOverwrite = text => {
-    if (!alertDisplayedWarning) {
-      DevToolsShim.openBrowserConsole();
-      contentWindow.console.warn("alert() is not supported in background windows; please use console.log instead.");
-
-      alertDisplayedWarning = true;
-    }
-
-    contentWindow.console.log(text);
-  };
-  Cu.exportFunction(alertOverwrite, contentWindow, {defineAs: "alert"});
-};
-
 extensions.registerModules({
   backgroundPage: {
     url: "chrome://extensions/content/ext-c-backgroundPage.js",
diff --git a/toolkit/components/extensions/ext-runtime.js b/toolkit/components/extensions/ext-runtime.js
index 2b3a6b357b9d..71096684f575 100644
--- a/toolkit/components/extensions/ext-runtime.js
+++ b/toolkit/components/extensions/ext-runtime.js
@@ -11,6 +11,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "ExtensionParent",
                                   "resource://gre/modules/ExtensionParent.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DevToolsShim",
+                                  "chrome://devtools-shim/content/DevToolsShim.jsm");
 
 this.runtime = class extends ExtensionAPI {
   getAPI(context) {
@@ -136,6 +138,15 @@ this.runtime = class extends ExtensionAPI {
           extension.uninstallURL = url;
           return Promise.resolve();
         },
+
+        // This function is not exposed to the extension js code and it is only
+        // used by the alert function redefined into the background pages to be
+        // able to open the BrowserConsole from the main process.
+        openBrowserConsole() {
+          if (AppConstants.platform !== "android") {
+            DevToolsShim.openBrowserConsole();
+          }
+        },
       },
     };
   }
diff --git a/toolkit/components/extensions/test/mochitest/chrome.ini b/toolkit/components/extensions/test/mochitest/chrome.ini
index 24bb6d936ad3..df5eee9dc3ab 100644
--- a/toolkit/components/extensions/test/mochitest/chrome.ini
+++ b/toolkit/components/extensions/test/mochitest/chrome.ini
@@ -11,34 +11,22 @@ support-files =
   webrequest_test.jsm
 tags = webextensions in-process-webextensions
 
-[test_chrome_ext_background_page.html]
-skip-if = (toolkit == 'android') # android doesn't have devtools
+# NO NEW TESTS.  mochitest-chrome does not run under e10s, avoid adding new
+# tests here unless absolutely necessary.
+
 [test_chrome_ext_contentscript_data_uri.html]
 [test_chrome_ext_contentscript_telemetry.html]
 [test_chrome_ext_contentscript_unrecognizedprop_warning.html]
 [test_chrome_ext_downloads_open.html]
 [test_chrome_ext_downloads_saveAs.html]
 [test_chrome_ext_downloads_uniquify.html]
-[test_chrome_ext_eventpage_warning.html]
-[test_chrome_ext_idle.html]
 [test_chrome_ext_permissions.html]
 skip-if = os == 'android' # Bug 1350559
-[test_chrome_ext_storage_cleanup.html]
 [test_chrome_ext_trackingprotection.html]
-[test_chrome_ext_trustworthy_origin.html]
 [test_chrome_ext_webnavigation_resolved_urls.html]
 [test_chrome_ext_webrequest_background_events.html]
-[test_chrome_ext_webrequest_errors.html]
 [test_chrome_ext_webrequest_host_permissions.html]
 [test_chrome_ext_webrequest_mozextension.html]
 skip-if = true # Bug 1404172
 [test_chrome_native_messaging_paths.html]
 skip-if = os != "mac" && os != "linux"
-[test_ext_cookies_expiry.html]
-[test_ext_cookies_permissions_bad.html]
-[test_ext_cookies_permissions_good.html]
-[test_ext_cookies_containers.html]
-[test_ext_jsversion.html]
-[test_ext_schema.html]
-[test_ext_protocolHandlers.html]
-skip-if = (toolkit == 'android') # bug 1342577
diff --git a/toolkit/components/extensions/test/mochitest/head.js b/toolkit/components/extensions/test/mochitest/head.js
index ed32d9abae33..89a93bd6264f 100644
--- a/toolkit/components/extensions/test/mochitest/head.js
+++ b/toolkit/components/extensions/test/mochitest/head.js
@@ -56,6 +56,34 @@ function waitForLoad(win) {
   });
 }
 
+/* exported loadChromeScript */
+function loadChromeScript(fn) {
+  let wrapper = `
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+(${fn.toString()})();`;
+
+  return SpecialPowers.loadChromeScript(new Function(wrapper));
+}
+
+/* exported consoleMonitor */
+let consoleMonitor = {
+  start(messages) {
+    this.chromeScript = SpecialPowers.loadChromeScript(
+      SimpleTest.getTestFileURL("mochitest_console.js"));
+    this.chromeScript.sendAsyncMessage("consoleStart", messages);
+  },
+
+  async finished() {
+    let done = this.chromeScript.promiseOneMessage("consoleDone").then(done => {
+      this.chromeScript.destroy();
+      return done;
+    });
+    this.chromeScript.sendAsyncMessage("waitForConsole");
+    let test = await done;
+    ok(test.ok, test.message);
+  },
+};
 /* exported waitForState */
 
 function waitForState(sw, state) {
diff --git a/toolkit/components/extensions/test/mochitest/head_cookies.js b/toolkit/components/extensions/test/mochitest/head_cookies.js
index dd687c6915bc..1b151126ad50 100644
--- a/toolkit/components/extensions/test/mochitest/head_cookies.js
+++ b/toolkit/components/extensions/test/mochitest/head_cookies.js
@@ -3,6 +3,7 @@
 "use strict";
 
 /* exported testCookies */
+/* import-globals-from head.js */
 
 async function testCookies(options) {
   // Changing the options object is a bit of a hack, but it allows us to easily
@@ -25,7 +26,6 @@ async function testCookies(options) {
     });
     browser.test.sendMessage("change-cookies");
 
-
     // Try to access some cookies in various ways.
     let {url, domain, secure} = backgroundOptions;
 
@@ -91,77 +91,104 @@ async function testCookies(options) {
     background: `(${background})(${JSON.stringify(options)})`,
   });
 
-
-  let cookieSvc = SpecialPowers.Services.cookies;
-
-  let domain = options.domain.replace(/^\.?/, ".");
-
-  // This will be evicted after we add a fourth cookie.
-  cookieSvc.add(domain, "/", "evicted", "bar", options.secure, false, false, options.expiry);
-  // This will be modified by the background script.
-  cookieSvc.add(domain, "/", "foo", "bar", options.secure, false, false, options.expiry);
-  // This will be deleted by the background script.
-  cookieSvc.add(domain, "/", "deleted", "bar", options.secure, false, false, options.expiry);
-
+  let stepOne = loadChromeScript(() => {
+    const {addMessageListener, sendAsyncMessage} = this;
+    addMessageListener("options", options => {
+      let domain = options.domain.replace(/^\.?/, ".");
+      // This will be evicted after we add a fourth cookie.
+      Services.cookies.add(domain, "/", "evicted", "bar", options.secure, false, false, options.expiry);
+      // This will be modified by the background script.
+      Services.cookies.add(domain, "/", "foo", "bar", options.secure, false, false, options.expiry);
+      // This will be deleted by the background script.
+      Services.cookies.add(domain, "/", "deleted", "bar", options.secure, false, false, options.expiry);
+      sendAsyncMessage("done");
+    });
+  });
+  stepOne.sendAsyncMessage("options", options);
+  await stepOne.promiseOneMessage("done");
+  stepOne.destroy();
 
   await extension.startup();
 
   await extension.awaitMessage("change-cookies");
-  cookieSvc.add(domain, "/", "x", "y", options.secure, false, false, options.expiry);
-  cookieSvc.add(domain, "/", "x", "z", options.secure, false, false, options.expiry);
-  cookieSvc.remove(domain, "x", "/", false, {});
+
+  let stepTwo = loadChromeScript(() => {
+    const {addMessageListener, sendAsyncMessage} = this;
+    addMessageListener("options", options => {
+      let domain = options.domain.replace(/^\.?/, ".");
+
+      Services.cookies.add(domain, "/", "x", "y", options.secure, false, false, options.expiry);
+      Services.cookies.add(domain, "/", "x", "z", options.secure, false, false, options.expiry);
+      Services.cookies.remove(domain, "x", "/", false, {});
+      sendAsyncMessage("done");
+    });
+  });
+  stepTwo.sendAsyncMessage("options", options);
+  await stepTwo.promiseOneMessage("done");
+  stepTwo.destroy();
+
   extension.sendMessage("cookies-changed");
 
   await extension.awaitFinish("cookie-permissions");
   await extension.unload();
 
 
-  function getCookies(host) {
-    let cookies = [];
-    let enum_ = cookieSvc.getCookiesFromHost(host, {});
-    while (enum_.hasMoreElements()) {
-      cookies.push(enum_.getNext().QueryInterface(SpecialPowers.Ci.nsICookie2));
+  let stepThree = loadChromeScript(() => {
+    const {addMessageListener, sendAsyncMessage, assert} = this;
+    let cookieSvc = Services.cookies;
+
+    function getCookies(host) {
+      let cookies = [];
+      let enum_ = cookieSvc.getCookiesFromHost(host, {});
+      while (enum_.hasMoreElements()) {
+        cookies.push(enum_.getNext().QueryInterface(Components.interfaces.nsICookie2));
+      }
+      return cookies.sort((a, b) => a.name.localeCompare(b.name));
     }
-    return cookies.sort((a, b) => a.name.localeCompare(b.name));
-  }
 
-  let cookies = getCookies(options.domain);
-  info(`Cookies: ${cookies.map(c => `${c.name}=${c.value}`)}`);
+    addMessageListener("options", options => {
+      let cookies = getCookies(options.domain);
 
-  if (options.shouldPass) {
-    is(cookies.length, 2, "expected two cookies for host");
+      if (options.shouldPass) {
+        assert.equal(cookies.length, 2, "expected two cookies for host");
 
-    is(cookies[0].name, "bar", "correct cookie name");
-    is(cookies[0].value, "quux", "correct cookie value");
+        assert.equal(cookies[0].name, "bar", "correct cookie name");
+        assert.equal(cookies[0].value, "quux", "correct cookie value");
 
-    is(cookies[1].name, "foo", "correct cookie name");
-    is(cookies[1].value, "baz", "correct cookie value");
-  } else if (options.shouldWrite) {
-    // Note: |shouldWrite| applies only when |shouldPass| is false.
-    // This is necessary because, unfortunately, websites (and therefore web
-    // extensions) are allowed to write some cookies which they're not allowed
-    // to read.
-    is(cookies.length, 3, "expected three cookies for host");
+        assert.equal(cookies[1].name, "foo", "correct cookie name");
+        assert.equal(cookies[1].value, "baz", "correct cookie value");
+      } else if (options.shouldWrite) {
+        // Note: |shouldWrite| applies only when |shouldPass| is false.
+        // This is necessary because, unfortunately, websites (and therefore web
+        // extensions) are allowed to write some cookies which they're not allowed
+        // to read.
+        assert.equal(cookies.length, 3, "expected three cookies for host");
 
-    is(cookies[0].name, "bar", "correct cookie name");
-    is(cookies[0].value, "quux", "correct cookie value");
+        assert.equal(cookies[0].name, "bar", "correct cookie name");
+        assert.equal(cookies[0].value, "quux", "correct cookie value");
 
-    is(cookies[1].name, "deleted", "correct cookie name");
+        assert.equal(cookies[1].name, "deleted", "correct cookie name");
 
-    is(cookies[2].name, "foo", "correct cookie name");
-    is(cookies[2].value, "baz", "correct cookie value");
-  } else {
-    is(cookies.length, 2, "expected two cookies for host");
+        assert.equal(cookies[2].name, "foo", "correct cookie name");
+        assert.equal(cookies[2].value, "baz", "correct cookie value");
+      } else {
+        assert.equal(cookies.length, 2, "expected two cookies for host");
 
-    is(cookies[0].name, "deleted", "correct second cookie name");
+        assert.equal(cookies[0].name, "deleted", "correct second cookie name");
 
-    is(cookies[1].name, "foo", "correct cookie name");
-    is(cookies[1].value, "bar", "correct cookie value");
-  }
+        assert.equal(cookies[1].name, "foo", "correct cookie name");
+        assert.equal(cookies[1].value, "bar", "correct cookie value");
+      }
 
-  for (let cookie of cookies) {
-    cookieSvc.remove(cookie.host, cookie.name, "/", false, {});
-  }
-  // Make sure we don't silently poison subsequent tests if something goes wrong.
-  is(getCookies(options.domain).length, 0, "cookies cleared");
+      for (let cookie of cookies) {
+        cookieSvc.remove(cookie.host, cookie.name, "/", false, {});
+      }
+      // Make sure we don't silently poison subsequent tests if something goes wrong.
+      assert.equal(getCookies(options.domain).length, 0, "cookies cleared");
+      sendAsyncMessage("done");
+    });
+  });
+  stepThree.sendAsyncMessage("options", options);
+  await stepThree.promiseOneMessage("done");
+  stepThree.destroy();
 }
diff --git a/toolkit/components/extensions/test/mochitest/mochitest-common.ini b/toolkit/components/extensions/test/mochitest/mochitest-common.ini
index 627575f44ce9..6ad08e392408 100644
--- a/toolkit/components/extensions/test/mochitest/mochitest-common.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest-common.ini
@@ -1,75 +1,81 @@
 [DEFAULT]
 support-files =
   chrome_cleanup_script.js
-  head.js
-  head_unlimitedStorage.js
-  head_webrequest.js
-  hsts.sjs
-  file_mixed.html
-  file_csp.html
-  file_csp.html^headers^
-  file_page_xhr.html
-  file_to_drawWindow.html
-  file_WebRequest_page3.html
-  file_WebRequest_permission_original.html
-  file_WebRequest_permission_redirected.html
-  file_WebRequest_permission_original.js
-  file_WebRequest_permission_redirected.js
-  file_webNavigation_clientRedirect.html
-  file_webNavigation_clientRedirect_httpHeaders.html
-  file_webNavigation_clientRedirect_httpHeaders.html^headers^
-  file_webrequestblocking_set_cookie.html
-  file_webrequestblocking_set_cookie.html^headers^
-  file_webNavigation_frameClientRedirect.html
-  file_webNavigation_frameRedirect.html
-  file_webNavigation_manualSubframe.html
-  file_webNavigation_manualSubframe_page1.html
-  file_webNavigation_manualSubframe_page2.html
   file_WebNavigation_page1.html
   file_WebNavigation_page2.html
   file_WebNavigation_page3.html
-  file_with_about_blank.html
+  file_WebRequest_page3.html
+  file_WebRequest_permission_original.html
+  file_WebRequest_permission_original.js
+  file_WebRequest_permission_redirected.html
+  file_WebRequest_permission_redirected.js
+  file_csp.html
+  file_csp.html^headers^
+  file_ext_test_api_injection.js
+  file_image_bad.png
   file_image_good.png
   file_image_great.png
-  file_image_bad.png
   file_image_redirect.png
-  file_style_good.css
-  file_style_bad.css
-  file_style_redirect.css
-  file_script_good.js
-  file_script_bad.js
-  file_script_redirect.js
-  file_script_xhr.js
+  file_mixed.html
+  file_page_xhr.html
+  file_permission_xhr.html
+  file_privilege_escalation.html
   file_remote_frame.html
   file_sample.html
+  file_script_bad.js
+  file_script_good.js
+  file_script_redirect.js
+  file_script_xhr.js
   file_simple_sandboxed_frame.html
   file_simple_sandboxed_subframe.html
   file_simple_xhr.html
   file_simple_xhr_frame.html
   file_simple_xhr_frame2.html
-  redirect_auto.sjs
-  redirection.sjs
-  file_privilege_escalation.html
-  file_ext_test_api_injection.js
-  file_permission_xhr.html
+  file_style_bad.css
+  file_style_good.css
+  file_style_redirect.css
   file_teardown_test.js
+  file_to_drawWindow.html
+  file_webNavigation_clientRedirect.html
+  file_webNavigation_clientRedirect_httpHeaders.html
+  file_webNavigation_clientRedirect_httpHeaders.html^headers^
+  file_webNavigation_frameClientRedirect.html
+  file_webNavigation_frameRedirect.html
+  file_webNavigation_manualSubframe.html
+  file_webNavigation_manualSubframe_page1.html
+  file_webNavigation_manualSubframe_page2.html
+  file_webrequestblocking_set_cookie.html
+  file_webrequestblocking_set_cookie.html^headers^
+  file_with_about_blank.html
+  head.js
+  head_cookies.js
+  head_unlimitedStorage.js
+  head_webrequest.js
+  hsts.sjs
   lorem.html.gz
   lorem.html.gz^headers^
+  mochitest_console.js
+  oauth.html
+  redirect_auto.sjs
+  redirection.sjs
   return_headers.sjs
   slow_response.sjs
   webrequest_worker.js
-  oauth.html
-  !/toolkit/components/passwordmgr/test/authenticate.sjs
   !/dom/tests/mochitest/geolocation/network_geolocation.sjs
+  !/toolkit/components/passwordmgr/test/authenticate.sjs
 
+[test_ext_background_api_injection.html]
+[test_ext_background_generated_url.html]
+[test_ext_background_canvas.html]
+[test_ext_background_page.html]
+skip-if = (toolkit == 'android') # android doesn't have devtools
+[test_ext_background_teardown.html]
 [test_ext_clipboard.html]
 [test_ext_clipboard_image.html]
 skip-if = headless # disabled test case with_permission_allow_copy, see inline comment. Headless: Bug 1405872
-[test_ext_inIncognitoContext_window.html]
-skip-if = os == 'android' # Android does not support multiple windows.
-[test_ext_geturl.html]
-[test_ext_background_canvas.html]
 [test_ext_content_security_policy.html]
+[test_ext_contentscript_about_blank.html]
+skip-if = os == 'android' # bug 1369440
 [test_ext_contentscript_api_injection.html]
 [test_ext_contentscript_async_loading.html]
 skip-if = os == 'android' && debug # The generated script takes too long to load on Android debug
@@ -78,27 +84,39 @@ skip-if = (os == 'linux' && debug) || (toolkit == 'android' && debug) # bug 1348
 [test_ext_contentscript_canvas.html]
 [test_ext_contentscript_context.html]
 [test_ext_contentscript_create_iframe.html]
+[test_ext_contentscript_css.html]
 [test_ext_contentscript_devtools_metadata.html]
 [test_ext_contentscript_exporthelpers.html]
 [test_ext_contentscript_incognito.html]
 skip-if = os == 'android' # Android does not support multiple windows.
-[test_ext_contentscript_css.html]
-[test_ext_contentscript_about_blank.html]
-skip-if = os == 'android' # bug 1369440
-[test_ext_webrequestblocking_set_cookie.html]
 [test_ext_contentscript_permission.html]
 [test_ext_contentscript_teardown.html]
+[test_ext_cookies.html]
+[test_ext_cookies_containers.html]
+[test_ext_cookies_expiry.html]
+[test_ext_cookies_first_party.html]
+[test_ext_cookies_permissions_bad.html]
+[test_ext_cookies_permissions_good.html]
+[test_ext_eventpage_warning.html]
 [test_ext_exclude_include_globs.html]
 [test_ext_external_messaging.html]
 [test_ext_generate.html]
 [test_ext_geolocation.html]
 skip-if = os == 'android' # Android support Bug 1336194
+[test_ext_geturl.html]
 [test_ext_identity.html]
 skip-if = os == 'android' # unsupported.
+[test_ext_idle.html]
+[test_ext_inIncognitoContext_window.html]
+skip-if = os == 'android' # Android does not support multiple windows.
+[test_ext_jsversion.html]
+[test_ext_listener_proxies.html]
 [test_ext_new_tab_processType.html]
 [test_ext_notifications.html]
 skip-if = os == "win" # Bug 1398518
 [test_ext_permission_xhr.html]
+[test_ext_protocolHandlers.html]
+skip-if = (toolkit == 'android') # bug 1342577
 [test_ext_redirect_jar.html]
 [test_ext_runtime_connect.html]
 [test_ext_runtime_connect_twoway.html]
@@ -106,6 +124,7 @@ skip-if = os == "win" # Bug 1398518
 [test_ext_runtime_disconnect.html]
 [test_ext_runtime_id.html]
 [test_ext_sandbox_var.html]
+[test_ext_schema.html]
 [test_ext_sendmessage_doublereply.html]
 [test_ext_sendmessage_frameId.html]
 [test_ext_sendmessage_no_receiver.html]
@@ -116,14 +135,10 @@ skip-if = true # Bug 1258897
 [test_ext_storage_tab.html]
 [test_ext_storage_manager_capabilities.html]
 scheme=https
-[test_ext_test.html]
-[test_ext_cookies.html]
-[test_ext_cookies_first_party.html]
-[test_ext_background_api_injection.html]
-[test_ext_background_generated_url.html]
-[test_ext_background_teardown.html]
+[test_ext_subframes_privileges.html]
 [test_ext_tab_teardown.html]
 skip-if = os == 'android' # Bug 1258975 on android.
+[test_ext_test.html]
 [test_ext_unlimitedStorage.html]
 [test_ext_unlimitedStorage_legacy_persistent_indexedDB.html]
 # IndexedDB persistent storage mode is not allowed on Fennec from a non-chrome privileged code
@@ -131,29 +146,29 @@ skip-if = os == 'android' # Bug 1258975 on android.
 skip-if = os == 'android'
 [test_ext_unload_frame.html]
 skip-if = webrender # bug 1424752
-[test_ext_listener_proxies.html]
 [test_ext_web_accessible_resources.html]
 skip-if = os == 'android' && debug # bug 1397615
+[test_ext_webnavigation.html]
+skip-if = os == 'android' && debug # bug 1397615
+[test_ext_webnavigation_filters.html]
+skip-if = os == 'android' && debug # bug 1397615
 [test_ext_webrequest_auth.html]
 skip-if = os == 'android'
 [test_ext_webrequest_background_events.html]
-[test_ext_webrequest_hsts.html]
+[test_ext_webrequestblocking_set_cookie.html]
 [test_ext_webrequest_basic.html]
 skip-if = os == 'android' && debug # bug 1397615
+[test_ext_webrequest_errors.html]
 [test_ext_webrequest_filter.html]
 [test_ext_webrequest_frameId.html]
+[test_ext_webrequest_hsts.html]
+[test_ext_webrequest_permission.html]
 [test_ext_webrequest_responseBody.html]
 skip-if = os == 'android' || os == 'linux' # linux, bug 1398120
 [test_ext_webrequest_suspend.html]
 [test_ext_webrequest_upgrade.html]
 [test_ext_webrequest_upload.html]
 skip-if = os == 'android' # Currently fails in emulator tests
-[test_ext_webrequest_permission.html]
 [test_ext_webrequest_websocket.html]
-[test_ext_webnavigation.html]
-skip-if = os == 'android' && debug # bug 1397615
-[test_ext_webnavigation_filters.html]
-skip-if = os == 'android' && debug # bug 1397615
 [test_ext_window_postMessage.html]
-[test_ext_subframes_privileges.html]
 [test_ext_xhr_capabilities.html]
diff --git a/toolkit/components/extensions/test/mochitest/mochitest.ini b/toolkit/components/extensions/test/mochitest/mochitest.ini
index 29a79a151ec2..b992001ff7ed 100644
--- a/toolkit/components/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest.ini
@@ -1,4 +1,7 @@
 [DEFAULT]
 tags = webextensions in-process-webextensions
 
+[test_ext_storage_cleanup.html]
+# Bug 1426514 storage_cleanup: clearing localStorage fails with oop
+
 [include:mochitest-common.ini]
diff --git a/toolkit/components/extensions/test/mochitest/mochitest_console.js b/toolkit/components/extensions/test/mochitest/mochitest_console.js
new file mode 100644
index 000000000000..07c29f871eab
--- /dev/null
+++ b/toolkit/components/extensions/test/mochitest/mochitest_console.js
@@ -0,0 +1,54 @@
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+const {addMessageListener, sendAsyncMessage} = this;
+
+// Much of the console monitoring code is copied from TestUtils but simplified
+// to our needs.
+function monitorConsole(msgs) {
+  function msgMatches(msg, pat) {
+    for (let k in pat) {
+      if (!(k in msg)) {
+        return false;
+      }
+      if (pat[k] instanceof RegExp && typeof(msg[k]) === "string") {
+        if (!pat[k].test(msg[k])) {
+          return false;
+        }
+      } else if (msg[k] !== pat[k]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  let counter = 0;
+  function listener(msg) {
+    if (msgMatches(msg, msgs[counter])) {
+      counter++;
+    }
+  }
+  addMessageListener("waitForConsole", () => {
+    sendAsyncMessage("consoleDone", {
+      ok: counter >= msgs.length,
+      message: `monitorConsole | messages left expected at least ${msgs.length} got ${counter}`,
+    });
+    Services.console.unregisterListener(listener);
+  });
+
+  Services.console.registerListener(listener);
+}
+
+addMessageListener("consoleStart", messages => {
+  for (let msg of messages) {
+    // Message might be a RegExp object from a different compartment, but
+    // instanceof RegExp will fail.  If we have an object, lets just make
+    // sure.
+    let message = msg.message;
+    if (typeof(message) == "object" && !(message instanceof RegExp)) {
+      msg.message = new RegExp(message);
+    }
+  }
+  monitorConsole(messages);
+});
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html
deleted file mode 100644
index e032c7cc19fc..000000000000
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>WebExtension test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
-  <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-
-<script type="text/javascript">
-"use strict";
-
-Cu.import("resource://testing-common/TestUtils.jsm");
-
-/* eslint-disable mozilla/balanced-listeners */
-
-add_task(async function testAlertNotShownInBackgroundWindow() {
-  ok(!Services.wm.getEnumerator("alert:alert").hasMoreElements(),
-     "Alerts should not be present at the start of the test.");
-
-  let consoleOpened = TestUtils.topicObserved("web-console-created");
-
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background: function() {
-      browser.test.log("background script executed");
-
-      alert("I am an alert in the background.");
-
-      browser.test.notifyPass("alertCalled");
-    },
-  });
-
-  await extension.startup();
-
-  info("startup complete loaded");
-
-  await extension.awaitFinish("alertCalled");
-
-
-  let alertWindows = Services.wm.getEnumerator("alert:alert");
-  ok(!alertWindows.hasMoreElements(), "Should not show alert");
-
-
-  // Make sure the message we output to the console is seen.
-  // This message is in ext-backgroundPage.js
-  let events = Cc["@mozilla.org/consoleAPI-storage;1"]
-    .getService(Ci.nsIConsoleAPIStorage).getEvents();
-
-  // This is the warning that is output after the first `alert()` call is made.
-  let alertWarningEvent = events[events.length - 2];
-  is(alertWarningEvent.arguments[0], "alert() is not supported in background windows; please use console.log instead.");
-
-  // This is the actual alert text that should be present in the console
-  // instead of as an `alert`.
-  let alertEvent = events[events.length - 1];
-  is(alertEvent.arguments[0], "I am an alert in the background.");
-
-
-  // Wait for the browser console window to open.
-  await consoleOpened;
-
-  let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
-  require("devtools/client/framework/devtools-browser");
-  let {HUDService} = require("devtools/client/webconsole/hudservice");
-
-  // And then double check that we have an actual browser console.
-  let haveConsole = !!HUDService.getBrowserConsole();
-  ok(haveConsole, "Expected browser console to be open");
-
-  if (haveConsole) {
-    await HUDService.toggleBrowserConsole();
-  }
-
-  await extension.unload();
-});
-</script>
-
-</body>
-</html>
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html
deleted file mode 100644
index 9d9ab7431453..000000000000
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for WebExtension EventPage Warning</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
-  <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-
-<script type="text/javascript">
-"use strict";
-
-function createEventPageExtension(eventPage) {
-  function eventPageScript() {
-    browser.test.log("running event page as background script");
-    browser.test.sendMessage("running", 1);
-  }
-
-  return ExtensionTestUtils.loadExtension({
-    manifest: {
-      "background": eventPage,
-    },
-    files: {
-      "event-page-script.js": eventPageScript,
-      "event-page.html": `<html><head>
-        <meta charset="utf-8">
-        <script src="event-page-script.js"><\/script>
-      </head></html>`,
-    },
-  });
-}
-
-add_task(async function test_eventpages() {
-  // Used in other tests to prevent the monitorConsole to grip.
-  SimpleTest.waitForExplicitFinish();
-
-  let testCases = [
-    {
-      message: "testing event page running as a background page",
-      eventPage: {
-        "page": "event-page.html",
-        "persistent": false,
-      },
-    },
-    {
-      message: "testing event page scripts running as a background page",
-      eventPage: {
-        "scripts": ["event-page-script.js"],
-        "persistent": false,
-      },
-    },
-  ];
-
-  for (let {message, eventPage} of testCases) {
-    info(message);
-
-    // Wait for the expected logged warnings from the manifest validation.
-    let waitForConsole = new Promise(resolve => {
-      SimpleTest.monitorConsole(resolve, [{message: /Event pages are not currently supported./}]);
-    });
-
-    let extension = createEventPageExtension(eventPage);
-
-    info("load complete");
-    let [, x] = await Promise.all([extension.startup(), extension.awaitMessage("running")]);
-    is(x, 1, "got correct value from extension");
-    info("test complete");
-    await extension.unload();
-    info("extension unloaded successfully");
-
-    SimpleTest.endMonitorConsole();
-    await waitForConsole;
-
-    waitForConsole = new Promise(resolve => {
-      SimpleTest.monitorConsole(resolve, [{
-        message: /Reading manifest: Error processing background.nonExistentProp: An unexpected property was found/,
-      }]);
-    });
-
-    info("testing additional unrecognized properties on background page");
-
-    extension = createEventPageExtension({
-      "scripts": ["event-page-script.js"],
-      "nonExistentProp": true,
-    });
-
-    info("load complete");
-    [, x] = await Promise.all([extension.startup(), extension.awaitMessage("running")]);
-    is(x, 1, "got correct value from extension");
-    info("test complete");
-    await extension.unload();
-    info("extension unloaded successfully");
-
-    SimpleTest.endMonitorConsole();
-    await waitForConsole;
-  }
-});
-
-</script>
-
-</body>
-</html>
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html
deleted file mode 100644
index 6d8efebf3903..000000000000
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>WebExtension test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
-  <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-
-<script type="text/javascript">
-"use strict";
-
-/* import-globals-from chrome_head.js */
-
-/**
- * This test is asserting that moz-extension: URLs are recognized as trustworthy local origins
- */
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gContentSecurityManager",
-                                   "@mozilla.org/contentsecuritymanager;1",
-                                   "nsIContentSecurityManager");
-
-add_task(async function() {
-  function background() {
-    browser.test.sendMessage("ready", browser.runtime.getURL("/test.html"));
-  }
-
-  let extensionData = {
-    background,
-    files: {
-      "test.html": `<html><head></head><body></body></html>`,
-    },
-  };
-
-  let extension = ExtensionTestUtils.loadExtension(extensionData);
-  await extension.startup();
-
-  let url = await extension.awaitMessage("ready");
-
-  let uri = NetUtil.newURI(url);
-  let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
-  is(gContentSecurityManager.isOriginPotentiallyTrustworthy(principal), true);
-
-  await extension.unload();
-});
-</script>
-
-</body>
-</html>
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_mozextension.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_mozextension.html
index 79ddc202842b..793b0e4e69c4 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_mozextension.html
+++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_mozextension.html
@@ -101,6 +101,7 @@ add_task(async function test_webRequest_mozextension_fetch() {
     manifest: {
       permissions: [
         "webRequest",
+        "webRequestBlocking",
         "tabs",
         "<all_urls>",
       ],
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_page.html b/toolkit/components/extensions/test/mochitest/test_ext_background_page.html
new file mode 100644
index 000000000000..07f38e70b5cf
--- /dev/null
+++ b/toolkit/components/extensions/test/mochitest/test_ext_background_page.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>WebExtension test</title>
+  <meta charset="utf-8">
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script type="text/javascript" src="head.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+/* eslint-disable mozilla/balanced-listeners */
+
+add_task(async function testAlertNotShownInBackgroundWindow() {
+  let extension = ExtensionTestUtils.loadExtension({
+    background: function() {
+      browser.test.log("background script executed");
+
+      alert("I am an alert in the background.");
+
+      browser.test.notifyPass("alertCalled");
+    },
+  });
+
+  let consoleOpened = loadChromeScript(() => {
+    const {sendAsyncMessage, assert} = this;
+    assert.ok(!Services.wm.getEnumerator("alert:alert").hasMoreElements(),
+              "Alerts should not be present at the start of the test.");
+
+    Services.obs.addObserver(function observer() {
+      sendAsyncMessage("web-console-created");
+      Services.obs.removeObserver(observer, "web-console-created");
+    }, "web-console-created");
+  });
+  let opened = consoleOpened.promiseOneMessage("web-console-created");
+
+  consoleMonitor.start([{message: /alert\(\) is not supported in background windows/},
+                        {message: /I am an alert in the background/}]);
+
+  await extension.startup();
+  await extension.awaitFinish("alertCalled");
+
+  let chromeScript = loadChromeScript(async () => {
+    const {assert} = this;
+    assert.ok(!Services.wm.getEnumerator("alert:alert").hasMoreElements(),
+              "Alerts should not be present after calling alert().");
+  });
+  chromeScript.destroy();
+
+  await consoleMonitor.finished();
+
+  await opened;
+  consoleOpened.destroy();
+
+  chromeScript = loadChromeScript(async () => {
+    const {sendAsyncMessage} = this;
+    let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+    require("devtools/client/framework/devtools-browser");
+    let {HUDService} = require("devtools/client/webconsole/hudservice");
+
+    // And then double check that we have an actual browser console.
+    let haveConsole = !!HUDService.getBrowserConsole();
+
+    if (haveConsole) {
+      await HUDService.toggleBrowserConsole();
+    }
+    sendAsyncMessage("done", haveConsole);
+  });
+
+  let consoleShown = await chromeScript.promiseOneMessage("done");
+  ok(consoleShown, "console was shown");
+  chromeScript.destroy();
+
+  await extension.unload();
+});
+</script>
+
+</body>
+</html>
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html
index f9b0934e4c54..b6ade236003d 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html
@@ -2,12 +2,12 @@
 <html>
 <head>
   <title>WebExtension test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <meta charset="utf-8">
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
@@ -16,13 +16,16 @@
 
 add_task(async function setup() {
   // make sure userContext is enabled.
-  return SpecialPowers.pushPrefEnv({"set": [
+  await SpecialPowers.pushPrefEnv({"set": [
     ["privacy.userContext.enabled", true],
   ]});
 });
 
 add_task(async function test_cookie_containers() {
   async function background() {
+    // Sometimes there is a cookie without name/value when running tests.
+    let cookiesAtStart = await browser.cookies.getAll({storeId: "firefox-default"});
+
     function assertExpected(expected, cookie) {
       for (let key of Object.keys(cookie)) {
         browser.test.assertTrue(key in expected, `found property ${key}`);
@@ -61,7 +64,7 @@ add_task(async function test_cookie_containers() {
     assertExpected(expected, cookie);
 
     let cookies = await browser.cookies.getAll({storeId: "firefox-default"});
-    browser.test.assertEq(0, cookies.length, "getAll() with default storeId returns an empty array");
+    browser.test.assertEq(0, cookiesAtStart.length - cookies.length, "getAll() with default storeId hasn't added cookies");
 
     cookies = await browser.cookies.getAll({storeId: "firefox-container-1"});
     browser.test.assertEq(1, cookies.length, "one cookie found for matching domain");
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html
index 2698b7fc1045..eb7d29092b7a 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>WebExtension test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <title>WebExtension cookies test</title>
+  <meta charset="utf-8">
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
@@ -37,7 +37,6 @@ add_task(async function test_cookies_expiry() {
     }, 1000);
   }
 
-  let domain = ".example.com";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "permissions": ["http://example.com/", "cookies"],
@@ -45,22 +44,24 @@ add_task(async function test_cookies_expiry() {
     background,
   });
 
-  let cookieSvc = SpecialPowers.Services.cookies;
-
-  let cookie = {
-    host: domain,
-    name: "first",
-    path: "/",
-  };
-
-  do {
-    cookieSvc.add(cookie.host, cookie.path, cookie.name, "one", false, false, false, Date.now() / 1000 + 1);
-  } while (!cookieSvc.cookieExists(cookie));
+  let chromeScript = loadChromeScript(() => {
+    const {sendAsyncMessage} = this;
+    Services.cookies.add(".example.com", "/", "first", "one", false, false, false, Date.now() / 1000 + 1);
+    sendAsyncMessage("done");
+  });
+  await chromeScript.promiseOneMessage("done");
+  chromeScript.destroy();
 
   await extension.startup();
   await extension.awaitMessage("change-cookies");
 
-  cookieSvc.add(cookie.host, cookie.path, cookie.name, "one-again", false, false, false, Date.now() / 1000 + 10);
+  chromeScript = loadChromeScript(() => {
+    const {sendAsyncMessage} = this;
+    Services.cookies.add(".example.com", "/", "first", "one-again", false, false, false, Date.now() / 1000 + 10);
+    sendAsyncMessage("done");
+  });
+  await chromeScript.promiseOneMessage("done");
+  chromeScript.destroy();
 
   await extension.awaitFinish("cookie-expiry");
   await extension.unload();
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html
index 2f4530a8b4e5..d4da132ad395 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html
@@ -2,13 +2,12 @@
 <html>
 <head>
   <title>WebExtension test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
   <script type="text/javascript" src="head_cookies.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html
index 86d74a40b85a..ee8bdea12bb3 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html
@@ -2,13 +2,12 @@
 <html>
 <head>
   <title>WebExtension test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
   <script type="text/javascript" src="head_cookies.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_eventpage_warning.html b/toolkit/components/extensions/test/mochitest/test_ext_eventpage_warning.html
new file mode 100644
index 000000000000..860a421b1ca5
--- /dev/null
+++ b/toolkit/components/extensions/test/mochitest/test_ext_eventpage_warning.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for WebExtension EventPage Warning</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script type="text/javascript" src="head.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+function createEventPageExtension(eventPage) {
+  function eventPageScript() {
+    browser.test.log("running event page as background script");
+    browser.test.sendMessage("running", 1);
+  }
+
+  return ExtensionTestUtils.loadExtension({
+    manifest: {
+      "background": eventPage,
+    },
+    files: {
+      "event-page-script.js": eventPageScript,
+      "event-page.html": `<html><head>
+        <meta charset="utf-8">
+        <script src="event-page-script.js"><\/script>
+      </head></html>`,
+    },
+  });
+}
+
+add_task(async function test_eventpages() {
+  let testCases = [
+    {
+      message: "testing event page running as a background page",
+      eventPage: {
+        "page": "event-page.html",
+        "persistent": false,
+      },
+    },
+    {
+      message: "testing event page scripts running as a background page",
+      eventPage: {
+        "scripts": ["event-page-script.js"],
+        "persistent": false,
+      },
+    },
+    {
+      message: "testing additional unrecognized properties on background page",
+      eventPage: {
+        "scripts": ["event-page-script.js"],
+        "nonExistentProp": true,
+      },
+    },
+  ];
+
+  // Wait for the expected logged warnings from the manifest validation.
+  consoleMonitor.start([{message: /Event pages are not currently supported./},
+                        {message: /Event pages are not currently supported./},
+                        {message: /Reading manifest: Error processing background.nonExistentProp: An unexpected property was found/}]);
+  for (let test of testCases) {
+    info(test.message);
+
+    let extension = createEventPageExtension(test.eventPage);
+    let [, x] = await Promise.all([extension.startup(), extension.awaitMessage("running")]);
+    is(x, 1, "got correct value from extension");
+    await extension.unload();
+  }
+  await consoleMonitor.finished();
+});
+
+</script>
+
+</body>
+</html>
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html b/toolkit/components/extensions/test/mochitest/test_ext_idle.html
similarity index 51%
rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html
rename to toolkit/components/extensions/test/mochitest/test_ext_idle.html
index 7ea4265aa287..f8ebefefca58 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_idle.html
@@ -2,28 +2,24 @@
 <html>
 <head>
   <title>WebExtension test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
 <script type="text/javascript">
 "use strict";
 
-const idleService = Cc["@mozilla.org/widget/idleservice;1"].getService(Ci.nsIIdleService);
-
 add_task(async function testWithRealIdleService() {
   function background() {
-    browser.test.onMessage.addListener((msg, ...args) => {
+    browser.test.onMessage.addListener(async (msg, ...args) => {
       let detectionInterval = args[0];
       if (msg == "addListener") {
-        browser.idle.queryState(detectionInterval).then(status => {
-          browser.test.assertEq("active", status, "Idle status is active");
-        });
+        let status = await browser.idle.queryState(detectionInterval);
+        browser.test.assertEq("active", status, "Idle status is active");
         browser.idle.setDetectionInterval(detectionInterval);
         browser.idle.onStateChanged.addListener(newState => {
           browser.test.assertEq("idle", newState, "listener fired with the expected state");
@@ -31,10 +27,9 @@ add_task(async function testWithRealIdleService() {
         });
         browser.test.sendMessage("listenerAdded");
       } else if (msg == "checkState") {
-        browser.idle.queryState(detectionInterval).then(status => {
-          browser.test.assertEq("idle", status, "Idle status is idle");
-          browser.test.notifyPass("idle");
-        });
+        let status = await browser.idle.queryState(detectionInterval);
+        browser.test.assertEq("idle", status, "Idle status is idle");
+        browser.test.notifyPass("idle");
       }
     });
   }
@@ -47,12 +42,20 @@ add_task(async function testWithRealIdleService() {
   });
 
   await extension.startup();
-  let idleTime = idleService.idleTime;
-  let detectionInterval = Math.max(Math.ceil(idleTime / 1000) + 10, 15);
-  info(`idleTime: ${idleTime}, detectionInterval: ${detectionInterval}`);
+
+  let chromeScript = loadChromeScript(() => {
+    const {sendAsyncMessage} = this;
+    const idleService = Cc["@mozilla.org/widget/idleservice;1"].getService(Ci.nsIIdleService);
+    let idleTime = idleService.idleTime;
+    sendAsyncMessage("detectionInterval", Math.max(Math.ceil(idleTime / 1000) + 10, 15));
+  });
+  let detectionInterval = await chromeScript.promiseOneMessage("detectionInterval");
+  chromeScript.destroy();
+
+  info(`Setting interval to ${detectionInterval}`);
   extension.sendMessage("addListener", detectionInterval);
   await extension.awaitMessage("listenerAdded");
-  info(`Listener added. idleTime: ${idleService.idleTime}`);
+  info("Listener added");
   await extension.awaitMessage("listenerFired");
   info("Listener fired");
   extension.sendMessage("checkState", detectionInterval);
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html b/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html
index 583370041911..18f7252e96e5 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html
@@ -3,12 +3,11 @@
 <head>
   <title>Test for simple WebExtension</title>
   <meta charset="utf-8">
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
@@ -56,28 +55,14 @@ add_task(async function test_versioned_js() {
     },
   });
 
-  let messages = [/Versioned JavaScript.*not supported in WebExtension.*developer\.mozilla\.org/,
-                  /Versioned JavaScript.*not supported in WebExtension.*developer\.mozilla\.org/];
-
-  let waitForConsole = new Promise(resolve => {
-    SimpleTest.monitorConsole(resolve, messages);
-  });
-
-  info("loading extension");
+  consoleMonitor.start([{message: /Versioned JavaScript.*not supported in WebExtension.*developer\.mozilla\.org/},
+                        {message: /Versioned JavaScript.*not supported in WebExtension.*developer\.mozilla\.org/}]);
 
   await Promise.all([extension.startup(),
                      extension.awaitMessage("finished")]);
 
-  info("waiting for console");
-
-  SimpleTest.endMonitorConsole();
-  await waitForConsole;
-
-  info("unloading extension");
-
+  await consoleMonitor.finished();
   await extension.unload();
-
-  info("test complete");
 });
 
 </script>
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_protocolHandlers.html b/toolkit/components/extensions/test/mochitest/test_ext_protocolHandlers.html
index a20736e32412..b10b3a286ae2 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_protocolHandlers.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_protocolHandlers.html
@@ -2,12 +2,11 @@
 <html>
 <head>
   <title>Test for protocol handlers</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
@@ -172,15 +171,12 @@ add_task(async function test_protocolHandler_restricted_protocol() {
     },
   };
 
-  let waitForConsole = new Promise(resolve => {
-    SimpleTest.monitorConsole(resolve, [{message: /processing protocol_handlers\.0\.protocol/}]);
-  });
+  consoleMonitor.start([{message: /processing protocol_handlers\.0\.protocol/}]);
 
   let extension = ExtensionTestUtils.loadExtension(extensionData);
   await Assert.rejects(extension.startup(), "unable to register restricted handler protocol");
 
-  SimpleTest.endMonitorConsole();
-  await waitForConsole;
+  await consoleMonitor.finished();
 });
 
 add_task(async function test_protocolHandler_restricted_uriTemplate() {
@@ -196,15 +192,12 @@ add_task(async function test_protocolHandler_restricted_uriTemplate() {
     },
   };
 
-  let waitForConsole = new Promise(resolve => {
-    SimpleTest.monitorConsole(resolve, [{message: /processing protocol_handlers\.0\.uriTemplate/}]);
-  });
+  consoleMonitor.start([{message: /processing protocol_handlers\.0\.uriTemplate/}]);
 
   let extension = ExtensionTestUtils.loadExtension(extensionData);
   await Assert.rejects(extension.startup(), "unable to register restricted handler uriTemplate");
 
-  SimpleTest.endMonitorConsole();
-  await waitForConsole;
+  await consoleMonitor.finished();
 });
 
 add_task(async function test_protocolHandler_duplicate() {
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_schema.html b/toolkit/components/extensions/test/mochitest/test_ext_schema.html
index 1a0529f443b8..ceb6254b460e 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_schema.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_schema.html
@@ -2,12 +2,11 @@
 <html>
 <head>
   <title>Test for schema API creation</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/SimpleTest/test.css"/>
 </head>
 <body>
 
@@ -49,23 +48,16 @@ add_task(async function testUnknownProperties() {
     background,
   });
 
-  let messages = [
+  consoleMonitor.start([
     {message: /processing permissions\.0: Value "unknownPermission"/},
     {message: /processing unknown_property: An unexpected property was found in the WebExtension manifest/},
-  ];
-
-  let waitForConsole = new Promise(resolve => {
-    SimpleTest.monitorConsole(resolve, messages);
-  });
+  ]);
 
   await extension.startup();
-
   await extension.awaitFinish("loaded");
 
+  await consoleMonitor.finished();
   await extension.unload();
-
-  SimpleTest.endMonitorConsole();
-  await waitForConsole;
 });
 </script>
 
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html b/toolkit/components/extensions/test/mochitest/test_ext_storage_cleanup.html
similarity index 92%
rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html
rename to toolkit/components/extensions/test/mochitest/test_ext_storage_cleanup.html
index c726db1797b0..52de11568cf0 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_storage_cleanup.html
@@ -2,11 +2,11 @@
 <html>
 <head>
   <title>WebExtension test</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_errors.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_errors.html
similarity index 76%
rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_errors.html
rename to toolkit/components/extensions/test/mochitest/test_ext_webrequest_errors.html
index 772a728620c2..001da6362ef8 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_errors.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_errors.html
@@ -2,12 +2,11 @@
 <html>
 <head>
   <title>Test for WebRequest errors</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
-  <script type="text/javascript" src="chrome_head.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
   <script type="text/javascript" src="head.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <script type="text/javascript">
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_trustworthy_origin.js b/toolkit/components/extensions/test/xpcshell/test_ext_trustworthy_origin.js
new file mode 100644
index 000000000000..3b370b8a9b67
--- /dev/null
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_trustworthy_origin.js
@@ -0,0 +1,13 @@
+"use strict";
+
+/**
+ * This test is asserting that moz-extension: URLs are recognized as trustworthy local origins
+ */
+
+add_task(function test_isOriginPotentiallyTrustworthnsIContentSecurityManagery() {
+  let contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
+                          .getService(Ci.nsIContentSecurityManager);
+  let uri = NetUtil.newURI("moz-extension://foobar/something.html");
+  let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
+  Assert.equal(contentSecManager.isOriginPotentiallyTrustworthy(principal), true, "it is potentially trustworthy");
+});
diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
index 7fa17443c801..b7a7b046d4be 100644
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
@@ -74,6 +74,7 @@ skip-if = os == "android"
 skip-if = os == "android"
 [test_ext_storage_telemetry.js]
 skip-if = os == "android" # checking for telemetry needs to be updated: 1384923
+[test_ext_trustworthy_origin.js]
 [test_ext_topSites.js]
 skip-if = os == "android"
 [test_native_manifests.js]
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.js b/toolkit/components/mozprotocol/mozProtocolHandler.js
index 01c08a192784..9668b0ce9590 100644
--- a/toolkit/components/mozprotocol/mozProtocolHandler.js
+++ b/toolkit/components/mozprotocol/mozProtocolHandler.js
@@ -20,13 +20,14 @@ mozProtocolHandler.prototype = {
   protocolFlags: Ci.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD,
 
   newURI(spec, charset, base) {
-    let uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);
+    let mutator = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+                    .createInstance(Ci.nsIURIMutator);
     if (base) {
-      uri.spec = base.resolve(spec);
+      mutator.setSpec(base.resolve(spec));
     } else {
-      uri.spec = spec;
+      mutator.setSpec(spec);
     }
-    return uri;
+    return mutator.finalize();
   },
 
   newChannel2(uri, loadInfo) {
diff --git a/toolkit/components/places/PageIconProtocolHandler.js b/toolkit/components/places/PageIconProtocolHandler.js
index a7309f685cf8..779ddc2b20fa 100644
--- a/toolkit/components/places/PageIconProtocolHandler.js
+++ b/toolkit/components/places/PageIconProtocolHandler.js
@@ -73,9 +73,10 @@ PageIconProtocolHandler.prototype = {
   },
 
   newURI(spec, originCharset, baseURI) {
-    let uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);
-    uri.spec = spec;
-    return uri;
+    return Cc["@mozilla.org/network/simple-uri-mutator;1"]
+             .createInstance(Ci.nsIURIMutator)
+             .setSpec(spec)
+             .finalize();
   },
 
   newChannel2(uri, loadInfo) {
diff --git a/toolkit/components/places/nsAnnoProtocolHandler.cpp b/toolkit/components/places/nsAnnoProtocolHandler.cpp
index 89481735fd39..373d1dfeaeb8 100644
--- a/toolkit/components/places/nsAnnoProtocolHandler.cpp
+++ b/toolkit/components/places/nsAnnoProtocolHandler.cpp
@@ -23,6 +23,7 @@
 #include "nsIInputStream.h"
 #include "nsISupportsUtils.h"
 #include "nsIURI.h"
+#include "nsIURIMutator.h"
 #include "nsNetUtil.h"
 #include "nsIOutputStream.h"
 #include "nsInputStreamPump.h"
@@ -225,15 +226,10 @@ nsAnnoProtocolHandler::NewURI(const nsACString& aSpec,
                               const char *aOriginCharset,
                               nsIURI *aBaseURI, nsIURI **_retval)
 {
-  nsCOMPtr <nsIURI> uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID);
-  if (!uri)
-    return NS_ERROR_OUT_OF_MEMORY;
-  nsresult rv = uri->SetSpec(aSpec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   *_retval = nullptr;
-  uri.swap(*_retval);
-  return NS_OK;
+  return NS_MutateURI(NS_SIMPLEURIMUTATOR_CONTRACTID)
+           .SetSpec(aSpec)
+           .Finalize(_retval);
 }
 
 
diff --git a/toolkit/components/reputationservice/LoginReputation.cpp b/toolkit/components/reputationservice/LoginReputation.cpp
index b109c11c7c35..af380f73e894 100644
--- a/toolkit/components/reputationservice/LoginReputation.cpp
+++ b/toolkit/components/reputationservice/LoginReputation.cpp
@@ -5,6 +5,9 @@
 
 #include "LoginReputation.h"
 #include "nsIDOMHTMLInputElement.h"
+#include "nsThreadUtils.h"
+#include "mozilla/ErrorNames.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/ipc/URIUtils.h"
@@ -12,7 +15,9 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-#define PREF_PP_ENABLED    "browser.safebrowsing.passwords.enabled"
+#define PREF_PP_ENABLED               "browser.safebrowsing.passwords.enabled"
+#define PREF_PASSWORD_ALLOW_TABLE     "urlclassifier.passwordAllowTable"
+
 static bool sPasswordProtectionEnabled = false;
 
 // MOZ_LOG=LoginReputation:5
@@ -20,6 +25,12 @@ LazyLogModule gLoginReputationLogModule("LoginReputation");
 #define LR_LOG(args) MOZ_LOG(gLoginReputationLogModule, mozilla::LogLevel::Debug, args)
 #define LR_LOG_ENABLED() MOZ_LOG_TEST(gLoginReputationLogModule, mozilla::LogLevel::Debug)
 
+static Atomic<bool> gShuttingDown(false);
+
+static const char* kObservedPrefs[] = {
+  PREF_PASSWORD_ALLOW_TABLE,
+};
+
 // -------------------------------------------------------------------------
 // ReputationQueryParam
 //
@@ -51,15 +62,146 @@ ReputationQueryParam::GetFormURI(nsIURI** aURI)
   return NS_OK;
 }
 
+// -------------------------------------------------------------------------
+// LoginWhitelist
+//
+// This class is a wrapper that encapsulate asynchronous callback API provided
+// by DBService into a MozPromise callback.
+//
+class LoginWhitelist final : public nsIURIClassifierCallback
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIURICLASSIFIERCALLBACK
+
+  RefPtr<ReputationPromise> QueryLoginWhitelist(nsILoginReputationQuery* aParam);
+
+  LoginWhitelist() = default;
+
+  nsresult Init();
+  nsresult Uninit();
+
+  void UpdateWhitelistTables();
+
+private:
+  ~LoginWhitelist() = default;
+
+  nsCString mTables;
+
+  // Queries that are waiting for callback from ::AsyncClassifyLocalWithTables.
+  nsTArray<UniquePtr<MozPromiseHolder<ReputationPromise>>> mQueryPromises;
+};
+
+NS_IMPL_ISUPPORTS(LoginWhitelist, nsIURIClassifierCallback)
+
+nsresult
+LoginWhitelist::Init()
+{
+  UpdateWhitelistTables();
+
+  return NS_OK;
+}
+
+nsresult
+LoginWhitelist::Uninit()
+{
+  // Reject all query promise before releasing.
+  for (uint8_t i = 0; i < mQueryPromises.Length(); i++) {
+    mQueryPromises[i]->Reject(NS_ERROR_ABORT, __func__);
+  }
+  mQueryPromises.Clear();
+
+  return NS_OK;
+}
+
+RefPtr<ReputationPromise>
+LoginWhitelist::QueryLoginWhitelist(nsILoginReputationQuery* aParam)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsresult rv;
+  UniquePtr<MozPromiseHolder<ReputationPromise>> holder =
+    MakeUnique<MozPromiseHolder<ReputationPromise>>();
+  RefPtr<ReputationPromise> p = holder->Ensure(__func__);
+
+  // Return rejected promise while there is an error.
+  auto fail = MakeScopeExit([&] () {
+    holder->Reject(rv, __func__);
+  });
+
+  nsCOMPtr<nsIURI> uri;
+  rv = aParam->GetFormURI(getter_AddRefs(uri));
+  if (NS_WARN_IF(NS_FAILED(rv) || !uri)) {
+    return p;
+  }
+
+  nsCOMPtr<nsIURIClassifier> uriClassifier =
+    do_GetService(NS_URLCLASSIFIERDBSERVICE_CONTRACTID, &rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return p;
+  }
+
+  // AsyncClassifyLocalWithTables API won't trigger a gethash request on
+  // a full-length match, so this API call should only include local operation.
+  rv = uriClassifier->AsyncClassifyLocalWithTables(uri, mTables, this);
+  if (NS_FAILED(rv)) {
+    return p;
+  }
+
+  fail.release();
+  mQueryPromises.AppendElement(Move(holder));
+  return p;
+}
+
+nsresult
+LoginWhitelist::OnClassifyComplete(nsresult aErrorCode,
+                                   const nsACString& aLists,
+                                   const nsACString& aProvider,
+                                   const nsACString& aFullHash)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (gShuttingDown) {
+    return NS_OK;
+  }
+
+  LR_LOG(("OnClassifyComplete : list = %s", aLists.BeginReading()));
+
+  UniquePtr<MozPromiseHolder<ReputationPromise>> holder =
+    Move(mQueryPromises.ElementAt(0));
+  mQueryPromises.RemoveElementAt(0);
+
+  if (NS_FAILED(aErrorCode)) {
+    // This should not happen
+    MOZ_ASSERT_UNREACHABLE("unexpected error received in OnClassifyComplete");
+    holder->Reject(aErrorCode, __func__);
+  } else if (aLists.IsEmpty()) {
+    // Reject if we can not find url in white list.
+    holder->Reject(NS_OK, __func__);
+  } else {
+    holder->Resolve(nsILoginReputationVerdictType::SAFE, __func__);
+  }
+
+  return NS_OK;
+}
+
+void
+LoginWhitelist::UpdateWhitelistTables()
+{
+  Preferences::GetCString(PREF_PASSWORD_ALLOW_TABLE, mTables);
+}
+
 // -------------------------------------------------------------------------
 // LoginReputationService
 //
 NS_IMPL_ISUPPORTS(LoginReputationService,
-                  nsILoginReputationService)
+                  nsILoginReputationService,
+                  nsIObserver)
 
 LoginReputationService*
   LoginReputationService::gLoginReputationService = nullptr;
 
+// static
 already_AddRefed<LoginReputationService>
 LoginReputationService::GetSingleton()
 {
@@ -77,6 +219,10 @@ LoginReputationService::LoginReputationService()
 LoginReputationService::~LoginReputationService()
 {
   LR_LOG(("Login reputation service shutting down"));
+
+  MOZ_ASSERT(gLoginReputationService == this);
+
+  gLoginReputationService = nullptr;
 }
 
 NS_IMETHODIMP
@@ -84,19 +230,90 @@ LoginReputationService::Init()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  Preferences::AddBoolVarCache(&sPasswordProtectionEnabled, PREF_PP_ENABLED, true);
+
   switch (XRE_GetProcessType()) {
   case GeckoProcessType_Default:
     LR_LOG(("Init login reputation service in parent"));
     break;
   case GeckoProcessType_Content:
     LR_LOG(("Init login reputation service in child"));
-    break;
+    // Login reputation service in child process will only forward request to
+    // parent, return here to skip unnecessary initialization.
+    return NS_OK;
   default:
     // No other process type is supported!
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  Preferences::AddBoolVarCache(&sPasswordProtectionEnabled, PREF_PP_ENABLED, true);
+  // The initialization below only happens in parent process.
+  Preferences::AddStrongObserver(this, PREF_PP_ENABLED);
+
+  // Init should only be called once.
+  MOZ_ASSERT(!mLoginWhitelist);
+
+  mLoginWhitelist = new LoginWhitelist();
+
+  if (sPasswordProtectionEnabled) {
+    Enable();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+LoginReputationService::Enable()
+{
+  MOZ_ASSERT(XRE_IsParentProcess());
+  MOZ_ASSERT(sPasswordProtectionEnabled);
+
+  LR_LOG(("Enable login reputation service"));
+
+  nsresult rv = mLoginWhitelist->Init();
+  Unused << NS_WARN_IF(NS_FAILED(rv));
+
+  for (const char* pref : kObservedPrefs) {
+    Preferences::AddStrongObserver(this, pref);
+  }
+
+  return NS_OK;
+}
+
+nsresult
+LoginReputationService::Disable()
+{
+  MOZ_ASSERT(XRE_IsParentProcess());
+
+  LR_LOG(("Disable login reputation service"));
+
+  nsresult rv = mLoginWhitelist->Uninit();
+  Unused << NS_WARN_IF(NS_FAILED(rv));
+
+  mQueryRequests.Clear();
+
+  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
+  if (prefs) {
+    for (const char* pref : kObservedPrefs) {
+      prefs->RemoveObserver(pref, this);
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult
+LoginReputationService::Shutdown()
+{
+  MOZ_ASSERT(XRE_IsParentProcess());
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(gShuttingDown);
+
+  // Disable will wait until worker threads are shutdown.
+  Disable();
+
+  // Disable will only destroy worker thread, it won't null out these classes.
+  // So we will null these classes in shutdown.
+  mLoginWhitelist = nullptr;
 
   return NS_OK;
 }
@@ -156,18 +373,154 @@ NS_IMETHODIMP
 LoginReputationService::QueryReputation(nsILoginReputationQuery* aQuery,
                                         nsILoginReputationQueryCallback* aCallback)
 {
+  MOZ_ASSERT(NS_IsMainThread());
+
   NS_ENSURE_ARG_POINTER(aQuery);
+  NS_ENSURE_ARG_POINTER(aCallback);
 
   LR_LOG(("QueryReputation() [this=%p]", this));
 
-  if (!sPasswordProtectionEnabled) {
-    return NS_ERROR_FAILURE;
+  if (gShuttingDown || !sPasswordProtectionEnabled) {
+    LR_LOG(("QueryReputation() abort [this=%p]", this));
+    aCallback->OnComplete(NS_ERROR_ABORT, nsILoginReputationVerdictType::UNSPECIFIED);
+    return NS_OK;
   }
 
-  // Return SAFE until we add support for the remote service (bug 1413732).
-  if (aCallback) {
-    aCallback->OnQueryComplete(nsILoginReputationResult::SAFE);
+  // mQueryRequests is an array used to maintain the ownership of |QueryRequest|.
+  // We ensure that |QueryRequest| is always valid until Finish() is
+  // called or LoginReputationService is shutdown.
+  auto* request =
+    mQueryRequests.AppendElement(MakeUnique<QueryRequest>(aQuery, aCallback));
+
+  return QueryLoginWhitelist(request->get());
+}
+
+nsresult
+LoginReputationService::QueryLoginWhitelist(QueryRequest* aRequest)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  NS_ENSURE_ARG_POINTER(aRequest);
+
+  if (gShuttingDown) {
+    return NS_ERROR_ABORT;
+  }
+
+  RefPtr<LoginReputationService> self = this;
+
+  mLoginWhitelist->QueryLoginWhitelist(aRequest->mParam)->Then(
+    GetCurrentThreadSerialEventTarget(), __func__,
+    [self, aRequest](VerdictType aResolveValue) -> void {
+      // Promise is resolved if url is found in google-provided whitelist.
+      MOZ_ASSERT(NS_IsMainThread());
+      MOZ_ASSERT(aResolveValue == nsILoginReputationVerdictType::SAFE);
+
+      LR_LOG(("Query login whitelist [request = %p, result = SAFE]",
+              aRequest));
+
+      self->Finish(aRequest, NS_OK, nsILoginReputationVerdictType::SAFE);
+    },
+    [self, aRequest](nsresult rv) -> void {
+      // Promise is rejected if url cannot be found in google-provided whitelist.
+      // or there is an error.
+      if (LR_LOG_ENABLED()) {
+        if (NS_FAILED(rv)) {
+          nsAutoCString errorName;
+          mozilla::GetErrorName(rv, errorName);
+          LR_LOG(("Error in QueryLoginWhitelist() [request = %p, rv = %s]",
+                  aRequest, errorName.get()));
+        } else {
+          LR_LOG(("Query login whitelist cannot find the URL [request = %p]",
+                  aRequest));
+        }
+      }
+
+      // Check trust-based whitelisting if we can't find the url in login whitelist
+      self->Finish(aRequest, rv, nsILoginReputationVerdictType::UNSPECIFIED);
+    });
+
+  return NS_OK;
+}
+
+nsresult
+LoginReputationService::Finish(const QueryRequest* aRequest,
+                               nsresult aStatus,
+                               VerdictType aVerdict)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  NS_ENSURE_ARG_POINTER(aRequest);
+
+  LR_LOG(("Query login reputation end [request = %p, result = %s]",
+          aRequest, VerdictTypeToString(aVerdict).get()));
+
+  // Since we are shutting down, don't bother call back to child process.
+  if (gShuttingDown) {
+    return NS_OK;
+  }
+
+  aRequest->mCallback->OnComplete(aStatus, aVerdict);
+
+  // QueryRequest may not follow the same order when we queued it in ::QueryReputation
+  // because one query request may be finished earlier than the other.
+  uint32_t idx = 0;
+  for (; idx < mQueryRequests.Length(); idx++) {
+    if (mQueryRequests[idx].get() == aRequest) {
+      break;
+    }
+  }
+
+  if (NS_WARN_IF(idx >= mQueryRequests.Length())) {
+    return NS_ERROR_FAILURE;
+  }
+  mQueryRequests.RemoveElementAt(idx);
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+LoginReputationService::Observe(nsISupports *aSubject,
+                                const char *aTopic,
+                                const char16_t *aData)
+{
+  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
+    nsDependentString data(aData);
+
+    if (data.EqualsLiteral(PREF_PP_ENABLED)) {
+      nsresult rv = sPasswordProtectionEnabled ? Enable() : Disable();
+      Unused << NS_WARN_IF(NS_FAILED(rv));
+    } else if (data.EqualsLiteral(PREF_PASSWORD_ALLOW_TABLE)) {
+      mLoginWhitelist->UpdateWhitelistTables();
+    }
+  } else if (!strcmp(aTopic, "quit-application")) {
+    // Prepare to shutdown, won't allow any query request after 'gShuttingDown'
+    // is set.
+    gShuttingDown = true;
+  } else if (!strcmp(aTopic, "profile-before-change")) {
+    gShuttingDown = true;
+    Shutdown();
+  } else {
+    return NS_ERROR_UNEXPECTED;
   }
 
   return NS_OK;
 }
+
+// static
+nsCString
+LoginReputationService::VerdictTypeToString(VerdictType aVerdict)
+{
+  switch(aVerdict) {
+    case nsILoginReputationVerdictType::UNSPECIFIED:
+      return nsCString("Unspecified");
+    case nsILoginReputationVerdictType::LOW_REPUTATION:
+      return nsCString("Low Reputation");
+    case nsILoginReputationVerdictType::SAFE:
+      return nsCString("Safe");
+    case nsILoginReputationVerdictType::PHISHING:
+      return nsCString("Phishing");
+    default:
+      return nsCString("Invalid");
+  }
+}
diff --git a/toolkit/components/reputationservice/LoginReputation.h b/toolkit/components/reputationservice/LoginReputation.h
index 0d0c69c425ee..3c4119b8027d 100644
--- a/toolkit/components/reputationservice/LoginReputation.h
+++ b/toolkit/components/reputationservice/LoginReputation.h
@@ -7,13 +7,25 @@
 #define LoginReputation_h__
 
 #include "nsILoginReputation.h"
+#include "nsIURIClassifier.h"
+#include "nsIObserver.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MozPromise.h"
 
-class LoginReputationService final : public nsILoginReputationService
+class LoginWhitelist;
+
+namespace mozilla {
+
+typedef uint32_t VerdictType;
+typedef MozPromise<VerdictType, nsresult, false> ReputationPromise;
+
+class LoginReputationService final : public nsILoginReputationService,
+                                     public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSILOGINREPUTATIONSERVICE
+  NS_DECL_NSIOBSERVER
 
 public:
   static
@@ -22,7 +34,23 @@ public:
   static
   already_AddRefed<nsILoginReputationQuery> ConstructQueryParam(nsIURI* aURI);
 
+  static
+  nsCString VerdictTypeToString(VerdictType aVerdict);
+
 private:
+
+  struct QueryRequest {
+    QueryRequest(nsILoginReputationQuery* aParam,
+                 nsILoginReputationQueryCallback* aCallback) :
+      mParam(aParam),
+      mCallback(aCallback)
+    {
+    }
+
+    nsCOMPtr<nsILoginReputationQuery> mParam;
+    nsCOMPtr<nsILoginReputationQueryCallback> mCallback;
+  };
+
   /**
    * Global singleton object for holding this factory service.
    */
@@ -30,6 +58,28 @@ private:
 
   LoginReputationService();
   ~LoginReputationService();
+
+  nsresult Enable();
+
+  nsresult Disable();
+
+  nsresult QueryLoginWhitelist(QueryRequest* aRequest);
+
+  // Called when a query request is finished.
+  nsresult Finish(const QueryRequest* aRequest,
+                  nsresult aStatus,
+                  VerdictType aVerdict);
+
+  // Clear data and join the worker threads.
+  nsresult Shutdown();
+
+  RefPtr<LoginWhitelist> mLoginWhitelist;
+
+  // Array that holds ongoing query requests which are added when
+  // ::QueryReputation is called.
+  nsTArray<UniquePtr<QueryRequest>> mQueryRequests;
 };
 
+}  // namespace mozilla
+
 #endif  // LoginReputation_h__
diff --git a/toolkit/components/reputationservice/LoginReputationIPC.cpp b/toolkit/components/reputationservice/LoginReputationIPC.cpp
index 89e87d74e4db..9f35f44798d7 100644
--- a/toolkit/components/reputationservice/LoginReputationIPC.cpp
+++ b/toolkit/components/reputationservice/LoginReputationIPC.cpp
@@ -40,9 +40,11 @@ LoginReputationParent::QueryReputation(nsIURI* aURI)
 }
 
 NS_IMETHODIMP
-LoginReputationParent::OnQueryComplete(uint16_t aResult)
+LoginReputationParent::OnComplete(nsresult aResult,
+                                  VerdictType aVerdict)
 {
-  LR_LOG(("OnQueryComplete() [result=%d]", aResult));
+  LR_LOG(("OnComplete() [verdict=%s]",
+    LoginReputationService::VerdictTypeToString(aVerdict).get()));
 
   if (mIPCOpen) {
     Unused << Send__delete__(this);
diff --git a/toolkit/components/reputationservice/nsILoginReputation.idl b/toolkit/components/reputationservice/nsILoginReputation.idl
index 956baa12b0fe..87f2fa75ef8b 100644
--- a/toolkit/components/reputationservice/nsILoginReputation.idl
+++ b/toolkit/components/reputationservice/nsILoginReputation.idl
@@ -10,14 +10,12 @@ interface nsIDOMHTMLInputElement;
 interface nsIURI;
 
 [scriptable, uuid(6219f9da-297e-446d-8d47-ccdd8e72a1d5)]
-interface nsILoginReputationResult : nsISupports {
+interface nsILoginReputationVerdictType : nsISupports {
 
-  // These should sync with 'VerdictType' defined in
-  // LoginReputationClientResponse in csd.proto.
-  const uint16_t UNSPECIFIED      = 0;
-  const uint16_t SAFE             = 1;
-  const uint16_t LOW_REPUTATION   = 2;
-  const uint16_t PHISHING         = 3;
+  const unsigned long UNSPECIFIED      = 0;
+  const unsigned long SAFE             = 1;
+  const unsigned long LOW_REPUTATION   = 2;
+  const unsigned long PHISHING         = 3;
 };
 
 [scriptable, uuid(c21ffe59-595f-46c8-9052-fefb639e196e)]
@@ -27,9 +25,10 @@ interface nsILoginReputationQuery : nsISupports {
 
 [scriptable, uuid(b527be1e-8fbb-41d9-bee4-267a71236368)]
 interface nsILoginReputationQueryCallback : nsISupports {
-  // aResult should be one of the const value defined in nsILoginReputationResult
+  // aVerdict should be one of the const value defined in nsILoginReputationResult
   // interface.
-  void onQueryComplete(in uint16_t aResult);
+  void onComplete(in nsresult aStatus,
+                  in unsigned long aVerdict);
 };
 
 [scriptable, uuid(1b3f1dfe-ce3a-486b-953e-ce5ac863eff9)]
diff --git a/toolkit/components/reputationservice/test/unit/test_login_rep.js b/toolkit/components/reputationservice/test/unit/test_login_rep.js
new file mode 100644
index 000000000000..ade78b1f4e7e
--- /dev/null
+++ b/toolkit/components/reputationservice/test/unit/test_login_rep.js
@@ -0,0 +1,159 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* 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/. */
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// LoginReputationService
+const gLoginRep = Cc["@mozilla.org/reputationservice/login-reputation-service;1"].
+                  getService(Ci.nsILoginReputationService);
+
+let gListManager = Cc["@mozilla.org/url-classifier/listmanager;1"]
+                     .getService(Ci.nsIUrlListManager);
+
+var gHttpServ = null;
+
+const whitelistedURI = "http://foo:bar@whitelisted.com/index.htm#junk";
+const exampleURI = "http://user:password@example.com/i.html?foo=bar";
+
+const LOCAL_WHITELIST_DATA = {
+  tableName: "test-passwordwhite-proto",
+  providerName: "test",
+  updateUrl: "http://localhost:5555/safebrowsing/update?",
+  gethashUrl: "",
+};
+
+add_task(async function test_setup() {
+
+  // Enable login reputation service
+  Services.prefs.setBoolPref("browser.safebrowsing.passwords.enabled", true);
+  gLoginRep.init();
+
+  // Setup local whitelist table.
+  Services.prefs.setCharPref("urlclassifier.passwordAllowTable", "test-passwordwhite-proto");
+  gListManager.registerTable(LOCAL_WHITELIST_DATA.tableName,
+                             LOCAL_WHITELIST_DATA.providerName,
+                             LOCAL_WHITELIST_DATA.updateUrl,
+                             LOCAL_WHITELIST_DATA.gethashUrl);
+
+  registerCleanupFunction(function() {
+    gListManager.unregisterTable(LOCAL_WHITELIST_DATA.tableName);
+
+    Services.prefs.clearUserPref("browser.safebrowsing.passwords.enabled");
+    Services.prefs.clearUserPref("urlclassifier.passwordAllowTable");
+  });
+});
+
+add_test(function test_setup_local_whitelist() {
+  // Setup the http server for SafeBrowsing update, so we can save SAFE entries
+  // to SafeBrowsing database while update.
+  gHttpServ = new HttpServer();
+  gHttpServ.registerDirectory("/", do_get_cwd());
+  gHttpServ.registerPathHandler("/safebrowsing/update", function(request, response) {
+    response.setHeader("Content-Type",
+                       "application/vnd.google.safebrowsing-update", false);
+
+    response.setStatusLine(request.httpVersion, 200, "OK");
+
+    // The protobuf binary represention of response:
+    //
+    // [
+    //   {
+    //     'threat_type': 8, // CSD_WHITELIST
+    //     'response_type': 2, // FULL_UPDATE
+    //     'new_client_state': 'sta\x00te', // NEW_CLIENT_STATE
+    //     'checksum': { "sha256": CHECKSUM }, // CHECKSUM
+    //     'additions': { 'compression_type': RAW,
+    //                    'prefix_size': 32,
+    //                    'raw_hashes': "whitelisted.com/index.htm"}
+    //   }
+    // ]
+    //
+    let content = "\x0A\x36\x08\x08\x20\x02\x2A\x28\x08\x01\x12\x24\x08" +
+                  "\x20\x12\x20\x0F\xE4\x66\xBB\xDD\x34\xAB\x1E\xF7\x8F" +
+                  "\xDD\x9D\x8C\xF8\x9F\x4E\x42\x97\x92\x86\x02\x03\xE0" +
+                  "\xE9\x60\xBD\xD6\x3A\x85\xCD\x08\xD0\x3A\x06\x73\x74" +
+                  "\x61\x00\x74\x65\x12\x04\x08\x0C\x10\x0A";
+
+    response.bodyOutputStream.write(content, content.length);
+  });
+
+  gHttpServ.start(5555);
+
+  // Trigger the update once http server is ready.
+  Services.obs.addObserver(function(aSubject, aTopic, aData) {
+    if (aData.startsWith("success")) {
+      run_next_test();
+    } else {
+      do_throw("update fail");
+    }
+  }, "safebrowsing-update-finished");
+  gListManager.forceUpdates(LOCAL_WHITELIST_DATA.tableName);
+
+  registerCleanupFunction(function() {
+    return (async function() {
+      await new Promise(resolve => {
+        gHttpServ.stop(resolve);
+      });
+    })();
+  });
+});
+
+add_test(function test_disable() {
+  Services.prefs.setBoolPref("browser.safebrowsing.passwords.enabled", false);
+
+  gLoginRep.queryReputation({
+    formURI: NetUtil.newURI("http://example.com"),
+  }, {
+    onComplete(aStatus, aVerdict) {
+      Assert.equal(aStatus, Cr.NS_ERROR_ABORT);
+      Assert.equal(aVerdict, Ci.nsILoginReputationVerdictType.UNSPECIFIED);
+
+      Services.prefs.setBoolPref("browser.safebrowsing.passwords.enabled", true);
+
+      run_next_test();
+    }
+  });
+});
+
+add_test(function test_nullQuery() {
+  try {
+    gLoginRep.queryReputation(null, {
+      onComplete(aStatus, aVerdict) {}
+    });
+    do_throw("Query parameter cannot be null");
+  } catch (ex) {
+    Assert.equal(ex.result, Cr.NS_ERROR_INVALID_POINTER);
+
+    run_next_test();
+  }
+});
+
+add_test(function test_local_whitelist() {
+  gLoginRep.queryReputation({
+    formURI: NetUtil.newURI(whitelistedURI),
+  }, {
+    onComplete(aStatus, aVerdict) {
+      Assert.equal(aStatus, Cr.NS_OK);
+      Assert.equal(aVerdict, Ci.nsILoginReputationVerdictType.SAFE);
+
+      run_next_test();
+    }
+  });
+});
+
+add_test(function test_notin_local_whitelist() {
+  gLoginRep.queryReputation({
+    formURI: NetUtil.newURI(exampleURI),
+  }, {
+    onComplete(aStatus, aVerdict) {
+      Assert.equal(aStatus, Cr.NS_OK);
+      Assert.equal(aVerdict, Ci.nsILoginReputationVerdictType.UNSPECIFIED);
+
+      run_next_test();
+    }
+  });
+});
diff --git a/toolkit/components/reputationservice/test/unit/xpcshell.ini b/toolkit/components/reputationservice/test/unit/xpcshell.ini
index 00fbf62141cc..fcbacbe7316a 100644
--- a/toolkit/components/reputationservice/test/unit/xpcshell.ini
+++ b/toolkit/components/reputationservice/test/unit/xpcshell.ini
@@ -11,3 +11,4 @@ support-files =
 skip-if = os != "win"
 [test_app_rep_maclinux.js]
 skip-if = os == "win"
+[test_login_rep.js]
diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp
index 37fb5247e0e6..de886ec1956f 100644
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -901,16 +901,6 @@ nsFormFillController::StopSearch()
 nsresult
 nsFormFillController::StartQueryLoginReputation(nsIDOMHTMLInputElement *aInput)
 {
-  if (!mLoginReputationService) {
-    mLoginReputationService =
-      do_GetService(NS_LOGIN_REPUTATION_SERVICE_CONTRACTID);
-    if (NS_WARN_IF(!mLoginReputationService)) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  mLoginReputationService->QueryReputationAsync(aInput, nullptr);
-
   return NS_OK;
 }
 
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index c9bb9824abf1..7bbd0ebc6992 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3942,7 +3942,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": [],
     "bug_numbers": [1361855],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 100,
@@ -5305,7 +5305,7 @@
   },
   "FENNEC_ORBOT_INSTALLED": {
     "record_in_processes": ["main", "content"],
-    "expires_in_version": "60",
+    "expires_in_version": "70",
     "kind": "flag",
     "cpp_guard": "ANDROID",
     "description": "Whether or not users have Orbot installed",
@@ -6004,7 +6004,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com"],
     "bug_numbers": [1340842],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -6014,7 +6014,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com"],
     "bug_numbers": [1340842],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -6024,7 +6024,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com"],
     "bug_numbers": [1340842],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -6082,7 +6082,7 @@
   "FX_TAB_SWITCH_TOTAL_E10S_MS": {
     "record_in_processes": ["main"],
     "alert_emails": ["mconley@mozilla.com"],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 20,
@@ -6574,7 +6574,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
-    "expires_in_version": "60",
+    "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other"],
@@ -6584,7 +6584,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
-    "expires_in_version": "60",
+    "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other"],
@@ -6594,7 +6594,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
-    "expires_in_version": "60",
+    "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other"],
@@ -6604,7 +6604,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
-    "expires_in_version": "60",
+    "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other"],
@@ -6614,7 +6614,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
-    "expires_in_version": "60",
+    "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other"],
@@ -8024,7 +8024,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["fqueze@mozilla.com"],
     "bug_numbers": [1203168],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "enumerated",
     "n_values": 5,
     "releaseChannelCollection": "opt-out",
@@ -13076,7 +13076,7 @@
     "record_in_processes": ["content"],
     "alert_emails": ["mconley@mozilla.com"],
     "bug_numbers": [1313686],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50,
@@ -13158,7 +13158,7 @@
   "BUSY_TAB_ABANDONED": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["hkirschner@mozilla.com"],
-    "expires_in_version": "60",
+    "expires_in_version": "65",
     "kind": "categorical",
     "bug_numbers": [1307689],
     "description": "Records a value each time a tab that is showing the loading throbber is interrupted. Desktop only.",
@@ -13597,7 +13597,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1353172],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 60000,
@@ -13608,7 +13608,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1297167],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
@@ -13619,7 +13619,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1297167],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "categorical",
     "labels": ["popupShown", "clearAfterHover", "clearAfterMousedown"],
     "releaseChannelCollection": "opt-out",
@@ -13629,7 +13629,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1356323],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
@@ -13640,7 +13640,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1353171],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
@@ -13651,7 +13651,7 @@
     "record_in_processes": ["main"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1297167],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
@@ -13662,7 +13662,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1371398],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
@@ -13673,7 +13673,7 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["addons-dev-internal@mozilla.com"],
     "bug_numbers": [1371398],
-    "expires_in_version": "60",
+    "expires_in_version": "63",
     "kind": "exponential",
     "releaseChannelCollection": "opt-out",
     "high": 50000,
diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml
index 3ba287d1afc4..f4135e4ec23c 100644
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -269,7 +269,7 @@ browser.usage:
       - 1331915
     description: >
       The number of times a graphite2 font has been loaded.
-    expires: "60"
+    expires: "65"
     kind: uint
     notification_emails:
       - tom@mozilla.com
diff --git a/toolkit/components/thumbnails/PageThumbsProtocol.cpp b/toolkit/components/thumbnails/PageThumbsProtocol.cpp
index 660dad886a35..778e274111d5 100644
--- a/toolkit/components/thumbnails/PageThumbsProtocol.cpp
+++ b/toolkit/components/thumbnails/PageThumbsProtocol.cpp
@@ -59,12 +59,9 @@ PageThumbsProtocol::NewURI(const nsACString& aSpec,
                            const char *aOriginCharset,
                            nsIURI *aBaseURI, nsIURI **_retval)
 {
-  nsCOMPtr <nsIURI> uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID);
-  nsresult rv = uri->SetSpec(aSpec);
-  if (NS_WARN_IF(NS_FAILED(rv))) return rv;
-
-  uri.forget(_retval);
-  return rv;
+  return NS_MutateURI(NS_SIMPLEURIMUTATOR_CONTRACTID)
+           .SetSpec(aSpec)
+           .Finalize(_retval);
 }
 
 // PageThumbsProtocol::NewChannel
diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
index 008f31a6d116..8d1c2c1f36d9 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
@@ -267,6 +267,7 @@ static const struct {
   // For testing purpose.
   { "test-phish-proto",    SOCIAL_ENGINEERING_PUBLIC}, // 2
   { "test-unwanted-proto", UNWANTED_SOFTWARE},         // 3
+  { "test-passwordwhite-proto", CSD_WHITELIST},        // 8
 };
 
 NS_IMETHODIMP
diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock
index 2ddc343e09da..94a279c4942a 100644
--- a/toolkit/library/gtest/rust/Cargo.lock
+++ b/toolkit/library/gtest/rust/Cargo.lock
@@ -17,7 +17,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -56,8 +56,8 @@ dependencies = [
  "memmap 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
 ]
 
 [[package]]
@@ -100,7 +100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -109,7 +109,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -393,8 +393,8 @@ dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -450,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1146,26 +1146,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.23"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
-dependencies = [
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
-]
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.23"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
+version = "1.0.27"
+source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"
 dependencies = [
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.17.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.17.0"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
+version = "0.19.0"
+source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"
 dependencies = [
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "synom 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1494,8 +1491,8 @@ dependencies = [
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1660,9 +1657,9 @@ dependencies = [
 "checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918"
 "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
-"checksum serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
-"checksum serde_derive_internals 0.17.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
+"checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
+"checksum serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>"
+"checksum serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>"
 "checksum simd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"
 "checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml
index b213e06a68cd..d5f2c2b2d295 100644
--- a/toolkit/library/gtest/rust/Cargo.toml
+++ b/toolkit/library/gtest/rust/Cargo.toml
@@ -47,5 +47,4 @@ panic = "abort"
 
 [patch.crates-io]
 libudev-sys = { path = "../../../../dom/webauthn/libudev-sys" }
-serde = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3" }
-serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3", feature = "deserialize_from" }
+serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }
diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index e04ea77ee236..43b68cfb8fcf 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -17,7 +17,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -56,8 +56,8 @@ dependencies = [
  "memmap 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
 ]
 
 [[package]]
@@ -100,7 +100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -109,7 +109,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -393,8 +393,8 @@ dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -450,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1134,26 +1134,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.23"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
-dependencies = [
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
-]
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.23"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
+version = "1.0.27"
+source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"
 dependencies = [
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.17.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.17.0"
-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums3#fc6117367ef974fb2d3b2017c21c375d34823415"
+version = "0.19.0"
+source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"
 dependencies = [
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "synom 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1506,8 +1503,8 @@ dependencies = [
  "core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
- "serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)",
+ "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)",
  "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1672,9 +1669,9 @@ dependencies = [
 "checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918"
 "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
-"checksum serde_derive 1.0.23 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
-"checksum serde_derive_internals 0.17.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums3)" = "<none>"
+"checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
+"checksum serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>"
+"checksum serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>"
 "checksum simd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"
 "checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
index e9b4f48faa42..5b48dd98a911 100644
--- a/toolkit/library/rust/Cargo.toml
+++ b/toolkit/library/rust/Cargo.toml
@@ -48,5 +48,4 @@ panic = "abort"
 
 [patch.crates-io]
 libudev-sys = { path = "../../../dom/webauthn/libudev-sys" }
-serde = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3" }
-serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3", feature = "deserialize_from" }
+serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index f557939f574c..592937ebc4f1 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -192,7 +192,7 @@ ifdef NIGHTLY_BUILD
 	fi
 endif
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
-	-$(MOZILLA_DIR)/mach compare-locales --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
+	-$(MOZILLA_DIR)/mach compare-locales $(COMPARE_LOCALES_DEFINES) --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
 
 langpack-%: IS_LANGUAGE_REPACK=1
 langpack-%: IS_LANGPACK=1
diff --git a/uriloader/exthandler/nsExternalProtocolHandler.cpp b/uriloader/exthandler/nsExternalProtocolHandler.cpp
index 3f7797de4feb..5c77b33c6767 100644
--- a/uriloader/exthandler/nsExternalProtocolHandler.cpp
+++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp
@@ -19,6 +19,7 @@
 #include "nsIStringBundle.h"
 #include "nsIPrefService.h"
 #include "nsIPrompt.h"
+#include "nsIURIMutator.h"
 #include "nsNetUtil.h"
 #include "nsContentSecurityManager.h"
 #include "nsExternalHelperAppService.h"
@@ -541,15 +542,9 @@ NS_IMETHODIMP nsExternalProtocolHandler::NewURI(const nsACString &aSpec,
                                                 nsIURI *aBaseURI,
                                                 nsIURI **_retval)
 {
-  nsresult rv;
-  nsCOMPtr<nsIURI> uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  rv = uri->SetSpec(aSpec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  NS_ADDREF(*_retval = uri);
-  return NS_OK;
+  return NS_MutateURI(NS_SIMPLEURIMUTATOR_CONTRACTID)
+           .SetSpec(aSpec)
+           .Finalize(_retval);
 }
 
 NS_IMETHODIMP
diff --git a/widget/tests/unit/test_taskbar_jumplistitems.js b/widget/tests/unit/test_taskbar_jumplistitems.js
index 5e3407ba9574..dccbc34a3c72 100644
--- a/widget/tests/unit/test_taskbar_jumplistitems.js
+++ b/widget/tests/unit/test_taskbar_jumplistitems.js
@@ -58,44 +58,51 @@ function test_hashes()
 {
   var link = Cc["@mozilla.org/windows-jumplistlink;1"]
              .createInstance(Ci.nsIJumpListLink);
-  var uri1 = Cc["@mozilla.org/network/simple-uri;1"]
-            .createInstance(Ci.nsIURI);
-  var uri2 = Cc["@mozilla.org/network/simple-uri;1"]
-            .createInstance(Ci.nsIURI);
-
-  uri1.spec = "http://www.123.com/";
-  uri2.spec = "http://www.123.com/";
+  var uri1 = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec("http://www.123.com/")
+               .finalize();
+  var uri2 = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec("http://www.123.com/")
+               .finalize();
 
   link.uri = uri1;
 
   Assert.ok(link.compareHash(uri2))
-  uri2.spec = "http://www.456.com/";
+  uri2 = uri2.mutate().setSpec("http://www.456.com/").finalize();
   Assert.ok(!link.compareHash(uri2))
-  uri2.spec = "http://www.123.com/";
+  uri2 = uri2.mutate().setSpec("http://www.123.com/").finalize();
   Assert.ok(link.compareHash(uri2))
-  uri2.spec = "https://www.123.com/";
+  uri2 = uri2.mutate().setSpec("https://www.123.com/").finalize();
   Assert.ok(!link.compareHash(uri2))
-  uri2.spec = "http://www.123.com/test/";
+  uri2 = uri2.mutate().setSpec("http://www.123.com/test/").finalize();
   Assert.ok(!link.compareHash(uri2))
-  uri1.spec = "http://www.123.com/test/";
-  uri2.spec = "http://www.123.com/test/";
+  uri1 = uri1.mutate().setSpec("http://www.123.com/test/").finalize();
+  link.uri = uri1;
+  uri2 = uri2.mutate().setSpec("http://www.123.com/test/").finalize();
   Assert.ok(link.compareHash(uri2))
-  uri1.spec = "https://www.123.com/test/";
-  uri2.spec = "https://www.123.com/test/";
+  uri1 = uri1.mutate().setSpec("https://www.123.com/test/").finalize();
+  link.uri = uri1;
+  uri2 = uri2.mutate().setSpec("https://www.123.com/test/").finalize();
   Assert.ok(link.compareHash(uri2))
-  uri2.spec = "ftp://www.123.com/test/";
+  uri2 = uri2.mutate().setSpec("ftp://www.123.com/test/").finalize();
   Assert.ok(!link.compareHash(uri2))
-  uri2.spec = "http://123.com/test/";
+  uri2 = uri2.mutate().setSpec("http://123.com/test/").finalize();
   Assert.ok(!link.compareHash(uri2))
-  uri1.spec = "https://www.123.com/test/";
-  uri2.spec = "https://www.123.com/Test/";
+  uri1 = uri1.mutate().setSpec("https://www.123.com/test/").finalize();
+  link.uri = uri1;
+  uri2 = uri2.mutate().setSpec("https://www.123.com/Test/").finalize();
   Assert.ok(!link.compareHash(uri2))
 
-  uri1.spec = "http://www.123.com/";
+  uri1 = uri1.mutate().setSpec("http://www.123.com/").finalize();
+  link.uri = uri1;
   Assert.equal(link.uriHash, "QGLmWuwuTozr3tOfXSf5mg==");
-  uri1.spec = "http://www.123.com/test/";
+  uri1 = uri1.mutate().setSpec("http://www.123.com/test/").finalize();
+  link.uri = uri1;
   Assert.equal(link.uriHash, "AG87Ls+GmaUYSUJFETRr3Q==");
-  uri1.spec = "https://www.123.com/";
+  uri1 = uri1.mutate().setSpec("https://www.123.com/").finalize();
+  link.uri = uri1;
   Assert.equal(link.uriHash, "iSx6UH1a9enVPzUA9JZ42g==");
 
   var uri3 = Cc["@mozilla.org/network/simple-uri;1"]
@@ -112,13 +119,14 @@ function test_links()
   var link2 = Cc["@mozilla.org/windows-jumplistlink;1"]
               .createInstance(Ci.nsIJumpListLink);
 
-  var uri1 = Cc["@mozilla.org/network/simple-uri;1"]
-            .createInstance(Ci.nsIURI);
-  var uri2 = Cc["@mozilla.org/network/simple-uri;1"]
-            .createInstance(Ci.nsIURI);
-
-  uri1.spec = "http://www.test.com/";
-  uri2.spec = "http://www.test.com/";
+  var uri1 = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec("http://www.test.com/")
+               .finalize();
+  var uri2 = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+               .createInstance(Ci.nsIURIMutator)
+               .setSpec("http://www.test.com/")
+               .finalize();
 
   link1.uri = uri1;
   link1.uriTitle = "Test";
@@ -132,7 +140,8 @@ function test_links()
   Assert.ok(!link1.equals(link2));
 
   link2.uriTitle = "Test";
-  uri2.spec = "http://www.testing.com/";
+  uri2 = uri2.mutate().setSpec("http://www.testing.com/").finalize();
+  link2.uri = uri2;
 
   Assert.ok(!link1.equals(link2));
 }
@@ -153,9 +162,10 @@ function test_shortcuts()
   sc.iconIndex = 1;
   Assert.equal(sc.iconIndex, 1);
 
-  var faviconPageUri = Cc["@mozilla.org/network/simple-uri;1"]
-                    .createInstance(Ci.nsIURI);
-  faviconPageUri.spec = "http://www.123.com/";
+  var faviconPageUri = Cc["@mozilla.org/network/simple-uri-mutator;1"]
+                         .createInstance(Ci.nsIURIMutator)
+                         .setSpec("http://www.123.com/")
+                         .finalize();
   sc.faviconPageUri = faviconPageUri;
   Assert.equal(sc.faviconPageUri, faviconPageUri);