--- a/browser/extensions/activity-stream/css/activity-stream-linux.css
+++ b/browser/extensions/activity-stream/css/activity-stream-linux.css
@@ -403,121 +403,65 @@ main {
         display: block;
         overflow: hidden;
         text-overflow: ellipsis;
         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;
-      border-radius: 12.5px;
-      box-shadow: 0 2px rgba(12, 12, 13, 0.1);
-      height: 25px;
-      position: absolute;
-      offset-inline-end: -12.5px;
-      opacity: 0;
-      overflow: hidden;
-      top: -12.5px;
-      transform: scale(0.25);
-      transition-property: transform, opacity;
-      transition-duration: 200ms;
-      z-index: 1000; }
-      .top-sites-list .top-site-outer .edit-menu:-moz-any(:active, :focus) {
-        transform: scale(1);
-        opacity: 1; }
-      .top-sites-list .top-site-outer .edit-menu button {
-        border: 0;
-        border-right: 1px solid #B1B1B3;
-        background-color: #FFF;
-        cursor: pointer;
-        height: 100%;
-        width: 25px; }
-        .top-sites-list .top-site-outer .edit-menu button:hover {
-          background-color: #EDEDF0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:last-child:dir(rtl) {
-          width: 30px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          width: 28px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr) {
-          border-right: 0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          border-right: 0; }
     .top-sites-list .top-site-outer.placeholder .tile {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
     .top-sites-list .top-site-outer.placeholder .screenshot {
       display: none; }
-    .top-sites-list .top-site-outer.placeholder .edit-menu:last-child button {
-      background-size: 13px;
-      width: 23px; }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .tile {
     box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 0 0 5px #D7D7DB;
     transition: box-shadow 150ms; }
-  .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
-    opacity: 1;
-    transform: scale(1); }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
     opacity: 1;
     transform: scale(1); }
 
-.edit-topsites-wrapper .edit-topsites-button {
+.edit-topsites-wrapper .add-topsites-button {
   border-right: 1px solid #D7D7DB;
   line-height: 13px;
   offset-inline-end: 24px;
   opacity: 0;
   padding: 0 10px;
   pointer-events: none;
   position: absolute;
   top: 2px;
   transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .edit-topsites-wrapper .edit-topsites-button:dir(rtl) {
+  .edit-topsites-wrapper .add-topsites-button:dir(rtl) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
+  .edit-topsites-wrapper .add-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
-  .edit-topsites-wrapper .edit-topsites-button button {
+  .edit-topsites-wrapper .add-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
-    .edit-topsites-wrapper .edit-topsites-button button:focus {
+    .edit-topsites-wrapper .add-topsites-button button:focus {
       background: #EDEDF0;
       border-bottom: dotted 1px #737373; }
 
 .edit-topsites-wrapper .modal {
   offset-inline-start: -31px;
   position: absolute;
   top: -29px;
   width: calc(100% + 62px);
   box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
 
 .edit-topsites-wrapper .edit-topsites-inner-wrapper {
   margin: 0;
   padding: 15px 30px; }
 
-.edit-topsites-wrapper .show-more,
-.edit-topsites-wrapper .show-less {
-  background-position: left 10px center;
-  background-repeat: no-repeat;
-  height: auto;
-  margin-inline-start: 10px;
-  padding-inline-end: 15px;
-  width: auto; }
-  .edit-topsites-wrapper .show-more:dir(rtl),
-  .edit-topsites-wrapper .show-less:dir(rtl) {
-    background-position: right 10px center; }
-  .edit-topsites-wrapper .show-more span,
-  .edit-topsites-wrapper .show-less span {
-    padding-inline-start: 3px; }
-
-.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .add-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {

--- a/browser/extensions/activity-stream/css/activity-stream-mac.css
+++ b/browser/extensions/activity-stream/css/activity-stream-mac.css
@@ -403,121 +403,65 @@ main {
         display: block;
         overflow: hidden;
         text-overflow: ellipsis;
         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;
-      border-radius: 12.5px;
-      box-shadow: 0 2px rgba(12, 12, 13, 0.1);
-      height: 25px;
-      position: absolute;
-      offset-inline-end: -12.5px;
-      opacity: 0;
-      overflow: hidden;
-      top: -12.5px;
-      transform: scale(0.25);
-      transition-property: transform, opacity;
-      transition-duration: 200ms;
-      z-index: 1000; }
-      .top-sites-list .top-site-outer .edit-menu:-moz-any(:active, :focus) {
-        transform: scale(1);
-        opacity: 1; }
-      .top-sites-list .top-site-outer .edit-menu button {
-        border: 0;
-        border-right: 1px solid #B1B1B3;
-        background-color: #FFF;
-        cursor: pointer;
-        height: 100%;
-        width: 25px; }
-        .top-sites-list .top-site-outer .edit-menu button:hover {
-          background-color: #EDEDF0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:last-child:dir(rtl) {
-          width: 30px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          width: 28px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr) {
-          border-right: 0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          border-right: 0; }
     .top-sites-list .top-site-outer.placeholder .tile {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
     .top-sites-list .top-site-outer.placeholder .screenshot {
       display: none; }
-    .top-sites-list .top-site-outer.placeholder .edit-menu:last-child button {
-      background-size: 13px;
-      width: 23px; }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .tile {
     box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 0 0 5px #D7D7DB;
     transition: box-shadow 150ms; }
-  .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
-    opacity: 1;
-    transform: scale(1); }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
     opacity: 1;
     transform: scale(1); }
 
-.edit-topsites-wrapper .edit-topsites-button {
+.edit-topsites-wrapper .add-topsites-button {
   border-right: 1px solid #D7D7DB;
   line-height: 13px;
   offset-inline-end: 24px;
   opacity: 0;
   padding: 0 10px;
   pointer-events: none;
   position: absolute;
   top: 2px;
   transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .edit-topsites-wrapper .edit-topsites-button:dir(rtl) {
+  .edit-topsites-wrapper .add-topsites-button:dir(rtl) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
+  .edit-topsites-wrapper .add-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
-  .edit-topsites-wrapper .edit-topsites-button button {
+  .edit-topsites-wrapper .add-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
-    .edit-topsites-wrapper .edit-topsites-button button:focus {
+    .edit-topsites-wrapper .add-topsites-button button:focus {
       background: #EDEDF0;
       border-bottom: dotted 1px #737373; }
 
 .edit-topsites-wrapper .modal {
   offset-inline-start: -31px;
   position: absolute;
   top: -29px;
   width: calc(100% + 62px);
   box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
 
 .edit-topsites-wrapper .edit-topsites-inner-wrapper {
   margin: 0;
   padding: 15px 30px; }
 
-.edit-topsites-wrapper .show-more,
-.edit-topsites-wrapper .show-less {
-  background-position: left 10px center;
-  background-repeat: no-repeat;
-  height: auto;
-  margin-inline-start: 10px;
-  padding-inline-end: 15px;
-  width: auto; }
-  .edit-topsites-wrapper .show-more:dir(rtl),
-  .edit-topsites-wrapper .show-less:dir(rtl) {
-    background-position: right 10px center; }
-  .edit-topsites-wrapper .show-more span,
-  .edit-topsites-wrapper .show-less span {
-    padding-inline-start: 3px; }
-
-.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .add-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {

--- a/browser/extensions/activity-stream/css/activity-stream-windows.css
+++ b/browser/extensions/activity-stream/css/activity-stream-windows.css
@@ -403,121 +403,65 @@ main {
         display: block;
         overflow: hidden;
         text-overflow: ellipsis;
         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;
-      border-radius: 12.5px;
-      box-shadow: 0 2px rgba(12, 12, 13, 0.1);
-      height: 25px;
-      position: absolute;
-      offset-inline-end: -12.5px;
-      opacity: 0;
-      overflow: hidden;
-      top: -12.5px;
-      transform: scale(0.25);
-      transition-property: transform, opacity;
-      transition-duration: 200ms;
-      z-index: 1000; }
-      .top-sites-list .top-site-outer .edit-menu:-moz-any(:active, :focus) {
-        transform: scale(1);
-        opacity: 1; }
-      .top-sites-list .top-site-outer .edit-menu button {
-        border: 0;
-        border-right: 1px solid #B1B1B3;
-        background-color: #FFF;
-        cursor: pointer;
-        height: 100%;
-        width: 25px; }
-        .top-sites-list .top-site-outer .edit-menu button:hover {
-          background-color: #EDEDF0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:last-child:dir(rtl) {
-          width: 30px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr), .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          width: 28px; }
-        .top-sites-list .top-site-outer .edit-menu button:last-child:dir(ltr) {
-          border-right: 0; }
-        .top-sites-list .top-site-outer .edit-menu button:first-child:dir(rtl) {
-          border-right: 0; }
     .top-sites-list .top-site-outer.placeholder .tile {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
     .top-sites-list .top-site-outer.placeholder .screenshot {
       display: none; }
-    .top-sites-list .top-site-outer.placeholder .edit-menu:last-child button {
-      background-size: 13px;
-      width: 23px; }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .tile {
     box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 0 0 5px #D7D7DB;
     transition: box-shadow 150ms; }
-  .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
-    opacity: 1;
-    transform: scale(1); }
   .top-sites-list:not(.dnd-active) .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
     opacity: 1;
     transform: scale(1); }
 
-.edit-topsites-wrapper .edit-topsites-button {
+.edit-topsites-wrapper .add-topsites-button {
   border-right: 1px solid #D7D7DB;
   line-height: 13px;
   offset-inline-end: 24px;
   opacity: 0;
   padding: 0 10px;
   pointer-events: none;
   position: absolute;
   top: 2px;
   transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .edit-topsites-wrapper .edit-topsites-button:dir(rtl) {
+  .edit-topsites-wrapper .add-topsites-button:dir(rtl) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
+  .edit-topsites-wrapper .add-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
-  .edit-topsites-wrapper .edit-topsites-button button {
+  .edit-topsites-wrapper .add-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
-    .edit-topsites-wrapper .edit-topsites-button button:focus {
+    .edit-topsites-wrapper .add-topsites-button button:focus {
       background: #EDEDF0;
       border-bottom: dotted 1px #737373; }
 
 .edit-topsites-wrapper .modal {
   offset-inline-start: -31px;
   position: absolute;
   top: -29px;
   width: calc(100% + 62px);
   box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
 
 .edit-topsites-wrapper .edit-topsites-inner-wrapper {
   margin: 0;
   padding: 15px 30px; }
 
-.edit-topsites-wrapper .show-more,
-.edit-topsites-wrapper .show-less {
-  background-position: left 10px center;
-  background-repeat: no-repeat;
-  height: auto;
-  margin-inline-start: 10px;
-  padding-inline-end: 15px;
-  width: auto; }
-  .edit-topsites-wrapper .show-more:dir(rtl),
-  .edit-topsites-wrapper .show-less:dir(rtl) {
-    background-position: right 10px center; }
-  .edit-topsites-wrapper .show-more span,
-  .edit-topsites-wrapper .show-less span {
-    padding-inline-start: 3px; }
-
-.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .add-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {

--- a/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
+++ b/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
@@ -750,35 +750,40 @@ var external__React__default = /*#__PURE
 // CONCATENATED MODULE: ./system-addon/content-src/components/ContextMenu/ContextMenu.jsx
 
 
 class ContextMenu_ContextMenu extends external__React__default.a.PureComponent {
   constructor(props) {
     super(props);
     this.hideContext = this.hideContext.bind(this);
   }
+
   hideContext() {
     this.props.onUpdate(false);
   }
+
   componentWillMount() {
     this.hideContext();
   }
+
   componentDidUpdate(prevProps) {
     if (this.props.visible && !prevProps.visible) {
       setTimeout(() => {
         window.addEventListener("click", this.hideContext);
       }, 0);
     }
     if (!this.props.visible && prevProps.visible) {
       window.removeEventListener("click", this.hideContext);
     }
   }
+
   componentWillUnmount() {
     window.removeEventListener("click", this.hideContext);
   }
+
   render() {
     return external__React__default.a.createElement(
       "span",
       { hidden: !this.props.visible, className: "context-menu" },
       external__React__default.a.createElement(
         "ul",
         { role: "menu", className: "context-menu-list" },
         this.props.options.map((option, i) => option.type === "separator" ? external__React__default.a.createElement("li", { key: i, className: "separator" }) : external__React__default.a.createElement(ContextMenu_ContextMenuItem, { key: i, option: option, hideContext: this.hideContext }))
@@ -788,20 +793,22 @@ class ContextMenu_ContextMenu extends ex
 }
 
 class ContextMenu_ContextMenuItem extends external__React__default.a.PureComponent {
   constructor(props) {
     super(props);
     this.onClick = this.onClick.bind(this);
     this.onKeyDown = this.onKeyDown.bind(this);
   }
+
   onClick() {
     this.props.hideContext();
     this.props.option.onClick();
   }
+
   onKeyDown(event) {
     const { option } = this.props;
     switch (event.key) {
       case "Tab":
         // tab goes down in context menu, shift + tab goes up in context menu
         // if we're on the last item, one more tab will close the context menu
         // similarly, if we're on the first item, one more shift + tab will close it
         if (event.shiftKey && option.first || !event.shiftKey && option.last) {
@@ -809,16 +816,17 @@ class ContextMenu_ContextMenuItem extend
         }
         break;
       case "Enter":
         this.props.hideContext();
         option.onClick();
         break;
     }
   }
+
   render() {
     const { option } = this.props;
     return external__React__default.a.createElement(
       "li",
       { role: "menuitem", className: "context-menu-item" },
       external__React__default.a.createElement(
         "a",
         { onClick: this.onClick, onKeyDown: this.onKeyDown, tabIndex: "0" },
@@ -956,17 +964,17 @@ const LinkMenuOptions = {
 
 
 
 
 const DEFAULT_SITE_MENU_OPTIONS = ["CheckPinTopSite", "EditTopSite", "Separator", "OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl"];
 
 class LinkMenu__LinkMenu extends external__React__default.a.PureComponent {
   getOptions() {
-    const props = this.props;
+    const { props } = this;
     const { site, index, source } = props;
 
     // Handle special case of default site
     const propOptions = !site.isDefault ? props.options : DEFAULT_SITE_MENU_OPTIONS;
 
     const options = propOptions.map(o => LinkMenuOptions[o](site, index, source)).map(option => {
       const { action, impression, id, type, userEvent } = option;
       if (!type && id) {
@@ -990,16 +998,17 @@ class LinkMenu__LinkMenu extends externa
 
     // This is for accessibility to support making each item tabbable.
     // We want to know which item is the first and which item
     // is the last, so we can close the context menu accordingly.
     options[0].first = true;
     options[options.length - 1].last = true;
     return options;
   }
+
   render() {
     return external__React__default.a.createElement(ContextMenu_ContextMenu, {
       visible: this.props.visible,
       onUpdate: this.props.onUpdate,
       options: this.getOptions() });
   }
 }
 /* unused harmony export _LinkMenu */
@@ -1052,30 +1061,34 @@ class Info extends __WEBPACK_IMPORTED_MO
    * Take a truthy value to conditionally change the infoActive state.
    */
   _setInfoState(nextActive) {
     const infoActive = !!nextActive;
     if (infoActive !== this.state.infoActive) {
       this.setState({ infoActive });
     }
   }
+
   onInfoEnter() {
     // We're getting focus or hover, so info state should be true if not yet.
     this._setInfoState(true);
   }
+
   onInfoLeave(event) {
     // We currently have an active (true) info state, so keep it true only if we
     // have a related event target that is contained "within" the current target
     // (section-info-option) as itself or a descendant. Set to false otherwise.
     this._setInfoState(event && event.relatedTarget && (event.relatedTarget === event.currentTarget || event.relatedTarget.compareDocumentPosition(event.currentTarget) & Node.DOCUMENT_POSITION_CONTAINS));
   }
+
   onManageClick() {
     this.props.dispatch({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].SETTINGS_OPEN });
     this.props.dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].UserEvent({ event: "OPEN_NEWTAB_PREFS" }));
   }
+
   render() {
     const { infoOption, intl } = this.props;
     const infoOptionIconA11yAttrs = {
       "aria-haspopup": "true",
       "aria-controls": "info-option",
       "aria-expanded": this.state.infoActive ? "true" : "false",
       "role": "note",
       "tabIndex": 0
@@ -1136,17 +1149,17 @@ class Disclaimer extends __WEBPACK_IMPOR
   }
 
   onAcknowledge() {
     this.props.dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].SetPref(this.props.disclaimerPref, false));
     this.props.dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].UserEvent({ event: "SECTION_DISCLAIMER_ACKNOWLEDGED", source: this.props.eventSource }));
   }
 
   render() {
-    const disclaimer = this.props.disclaimer;
+    const { disclaimer } = this.props;
     return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(
       "div",
       { className: "section-disclaimer" },
       __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(
         "div",
         { className: "section-disclaimer-text" },
         getFormattedMessage(disclaimer.text),
         disclaimer.link && __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(
@@ -1180,77 +1193,88 @@ class _CollapsibleSection extends __WEBP
     this.onTransitionEnd = this.onTransitionEnd.bind(this);
     this.enableOrDisableAnimation = this.enableOrDisableAnimation.bind(this);
     this.state = { enableAnimation: true, isAnimating: false, infoActive: false };
   }
 
   componentWillMount() {
     this.props.document.addEventListener(VISIBILITY_CHANGE_EVENT, this.enableOrDisableAnimation);
   }
+
   componentWillUpdate(nextProps) {
     // Check if we're about to go from expanded to collapsed
     if (!getCollapsed(this.props) && getCollapsed(nextProps)) {
       // This next line forces a layout flush of the section body, which has a
       // max-height style set, so that the upcoming collapse animation can
       // animate from that height to the collapsed height. Without this, the
       // update is coalesced and there's no animation from no-max-height to 0.
       this.sectionBody.scrollHeight; // eslint-disable-line no-unused-expressions
     }
   }
+
   componentWillUnmount() {
     this.props.document.removeEventListener(VISIBILITY_CHANGE_EVENT, this.enableOrDisableAnimation);
   }
+
   enableOrDisableAnimation() {
     // Only animate the collapse/expand for visible tabs.
     const visible = this.props.document.visibilityState === VISIBLE;
     if (this.state.enableAnimation !== visible) {
       this.setState({ enableAnimation: visible });
     }
   }
+
   _setInfoState(nextActive) {
     // Take a truthy value to conditionally change the infoActive state.
     const infoActive = !!nextActive;
     if (infoActive !== this.state.infoActive) {
       this.setState({ infoActive });
     }
   }
+
   onBodyMount(node) {
     this.sectionBody = node;
   }
+
   onInfoEnter() {
     // We're getting focus or hover, so info state should be true if not yet.
     this._setInfoState(true);
   }
+
   onInfoLeave(event) {
     // We currently have an active (true) info state, so keep it true only if we
     // have a related event target that is contained "within" the current target
     // (section-info-option) as itself or a descendant. Set to false otherwise.
     this._setInfoState(event && event.relatedTarget && (event.relatedTarget === event.currentTarget || event.relatedTarget.compareDocumentPosition(event.currentTarget) & Node.DOCUMENT_POSITION_CONTAINS));
   }
+
   onHeaderClick() {
     // Get the current height of the body so max-height transitions can work
     this.setState({
       isAnimating: true,
       maxHeight: `${this.sectionBody.scrollHeight}px`
     });
     this.props.dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].SetPref(this.props.prefName, !getCollapsed(this.props)));
   }
+
   onTransitionEnd(event) {
     // Only update the animating state for our own transition (not a child's)
     if (event.target === event.currentTarget) {
       this.setState({ isAnimating: false });
     }
   }
+
   renderIcon() {
-    const icon = this.props.icon;
+    const { icon } = this.props;
     if (icon && icon.startsWith("moz-extension://")) {
       return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement("span", { className: "icon icon-small-spacer", style: { backgroundImage: `url('${icon}')` } });
     }
     return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement("span", { className: `icon icon-small-spacer icon-${icon || "webextension"}` });
   }
+
   render() {
     const isCollapsible = this.props.prefName in this.props.Prefs.values;
     const isCollapsed = getCollapsed(this.props);
     const { enableAnimation, isAnimating, maxHeight } = this.state;
     const { id, infoOption, eventSource, disclaimer } = this.props;
     const disclaimerPref = `section.${id}.showDisclaimer`;
     const needsDisclaimer = disclaimer && this.props.Prefs.values[disclaimerPref];
 
@@ -1723,17 +1747,17 @@ class SnippetsMap extends Map {
    * @param  {str|int} id   The id of the snippet
    * @return {Promise}      Resolves when the id has been written to indexedDB,
    *                        or immediately if the snippetMap is not connected
    */
   async blockSnippetById(id) {
     if (!id) {
       return;
     }
-    let blockList = this.blockList;
+    const { blockList } = this;
     if (!blockList.includes(id)) {
       blockList.push(id);
       this._dispatch(__WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].SendToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].SNIPPETS_BLOCKLIST_UPDATED, data: blockList }));
       await this.set("blockList", blockList);
     }
   }
 
   disableOnboarding() {
@@ -2174,16 +2198,17 @@ const ConfirmDialog = Object(external__R
  * 4.  User clicks "Cancel" on the import wizard (currently not implemented).
  */
 class ManualMigration__ManualMigration extends external__React__default.a.PureComponent {
   constructor(props) {
     super(props);
     this.onLaunchTour = this.onLaunchTour.bind(this);
     this.onCancelTour = this.onCancelTour.bind(this);
   }
+
   onLaunchTour() {
     this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({ type: Actions["b" /* actionTypes */].MIGRATION_START }));
     this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({ event: Actions["b" /* actionTypes */].MIGRATION_START }));
   }
 
   onCancelTour() {
     this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({ type: Actions["b" /* actionTypes */].MIGRATION_CANCEL }));
     this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({ event: Actions["b" /* actionTypes */].MIGRATION_CANCEL }));
@@ -2259,64 +2284,69 @@ class PreferencesPane__PreferencesPane e
   constructor(props) {
     super(props);
     this.handleClickOutside = this.handleClickOutside.bind(this);
     this.handlePrefChange = this.handlePrefChange.bind(this);
     this.handleSectionChange = this.handleSectionChange.bind(this);
     this.togglePane = this.togglePane.bind(this);
     this.onWrapperMount = this.onWrapperMount.bind(this);
   }
+
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.PreferencesPane.visible !== this.props.PreferencesPane.visible) {
       // While the sidebar is open, listen for all document clicks.
       if (this.isSidebarOpen()) {
         document.addEventListener("click", this.handleClickOutside);
       } else {
         document.removeEventListener("click", this.handleClickOutside);
       }
     }
   }
+
   isSidebarOpen() {
     return this.props.PreferencesPane.visible;
   }
+
   handleClickOutside(event) {
     // if we are showing the sidebar and there is a click outside, close it.
     if (this.isSidebarOpen() && !this.wrapper.contains(event.target)) {
       this.togglePane();
     }
   }
-  handlePrefChange(event) {
-    const target = event.target;
-    const { name, checked } = target;
+
+  handlePrefChange({ target: { name, checked } }) {
     let value = checked;
     if (name === "topSitesCount") {
       value = checked ? Reducers["b" /* TOP_SITES_SHOWMORE_LENGTH */] : Reducers["a" /* TOP_SITES_DEFAULT_LENGTH */];
     }
     this.props.dispatch(Actions["a" /* actionCreators */].SetPref(name, value));
   }
-  handleSectionChange(event) {
-    const target = event.target;
+
+  handleSectionChange({ target }) {
     const id = target.name;
     const type = target.checked ? Actions["b" /* actionTypes */].SECTION_ENABLE : Actions["b" /* actionTypes */].SECTION_DISABLE;
     this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({ type, data: id }));
   }
+
   togglePane() {
     if (this.isSidebarOpen()) {
       this.props.dispatch({ type: Actions["b" /* actionTypes */].SETTINGS_CLOSE });
       this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({ event: "CLOSE_NEWTAB_PREFS" }));
     } else {
       this.props.dispatch({ type: Actions["b" /* actionTypes */].SETTINGS_OPEN });
       this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({ event: "OPEN_NEWTAB_PREFS" }));
     }
   }
+
   onWrapperMount(wrapper) {
     this.wrapper = wrapper;
   }
+
   render() {
-    const props = this.props;
+    const { props } = this;
     const prefs = props.Prefs.values;
     const sections = props.Sections;
     const isVisible = this.isSidebarOpen();
     return external__React__default.a.createElement(
       "div",
       { className: "prefs-pane-wrapper", ref: this.onWrapperMount },
       external__React__default.a.createElement(
         "div",
@@ -2521,22 +2551,25 @@ class Search__Search extends external__R
   }
 
   handleEvent(event) {
     // Also track search events with our own telemetry
     if (event.detail.type === "Search") {
       this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({ event: "SEARCH" }));
     }
   }
+
   onClick(event) {
     window.gContentSearchController.search(event);
   }
+
   componentWillUnmount() {
     delete window.gContentSearchController;
   }
+
   onInputMount(input) {
     if (input) {
       // The "healthReportKey" and needs to be "newtab" or "abouthome" so that
       // BrowserUsageTelemetry.jsm knows to handle events with this name, and
       // can add the appropriate telemetry probes for search. Without the correct
       // name, certain tests like browser_UsageTelemetry_content.js will fail
       // (See github ticket #2348 for more details)
       const healthReportKey = constants["a" /* IS_NEWTAB */] ? "newtab" : "abouthome";
@@ -2613,16 +2646,200 @@ const MIN_RICH_FAVICON_SIZE = 96;
 // minimum size necessary to show any icon in the top left corner with a screenshot
 const MIN_CORNER_FAVICON_SIZE = 16;
 // EXTERNAL MODULE: ./system-addon/content-src/components/CollapsibleSection/CollapsibleSection.jsx
 var CollapsibleSection = __webpack_require__(7);
 
 // EXTERNAL MODULE: ./system-addon/content-src/components/ComponentPerfTimer/ComponentPerfTimer.jsx
 var ComponentPerfTimer = __webpack_require__(8);
 
+// CONCATENATED MODULE: ./system-addon/content-src/components/TopSites/TopSiteForm.jsx
+
+
+
+
+
+class TopSiteForm_TopSiteForm extends external__React__default.a.PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      label: props.label || "",
+      url: props.url || "",
+      validationError: false
+    };
+    this.onLabelChange = this.onLabelChange.bind(this);
+    this.onUrlChange = this.onUrlChange.bind(this);
+    this.onCancelButtonClick = this.onCancelButtonClick.bind(this);
+    this.onAddButtonClick = this.onAddButtonClick.bind(this);
+    this.onSaveButtonClick = this.onSaveButtonClick.bind(this);
+    this.onUrlInputMount = this.onUrlInputMount.bind(this);
+  }
+
+  onLabelChange(event) {
+    this.resetValidation();
+    this.setState({ "label": event.target.value });
+  }
+
+  onUrlChange(event) {
+    this.resetValidation();
+    this.setState({ "url": event.target.value });
+  }
+
+  onCancelButtonClick(ev) {
+    ev.preventDefault();
+    this.props.onClose();
+  }
+
+  onAddButtonClick(ev) {
+    ev.preventDefault();
+    if (this.validateForm()) {
+      let site = { url: this.cleanUrl() };
+      if (this.state.label !== "") {
+        site.label = this.state.label;
+      }
+      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
+        type: Actions["b" /* actionTypes */].TOP_SITES_INSERT,
+        data: { site }
+      }));
+      this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
+        source: TOP_SITES_SOURCE,
+        event: "TOP_SITES_ADD"
+      }));
+      this.props.onClose();
+    }
+  }
+
+  onSaveButtonClick(ev) {
+    ev.preventDefault();
+    if (this.validateForm()) {
+      let site = { url: this.cleanUrl() };
+      if (this.state.label !== "") {
+        site.label = this.state.label;
+      }
+      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
+        type: Actions["b" /* actionTypes */].TOP_SITES_PIN,
+        data: { site, index: this.props.index }
+      }));
+      this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
+        source: TOP_SITES_SOURCE,
+        event: "TOP_SITES_EDIT",
+        action_position: this.props.index
+      }));
+      this.props.onClose();
+    }
+  }
+
+  cleanUrl() {
+    let { url } = this.state;
+    // If we are missing a protocol, prepend http://
+    if (!url.startsWith("http:") && !url.startsWith("https:")) {
+      url = `http://${url}`;
+    }
+    return url;
+  }
+
+  resetValidation() {
+    if (this.state.validationError) {
+      this.setState({ validationError: false });
+    }
+  }
+
+  validateUrl() {
+    try {
+      return !!new URL(this.cleanUrl());
+    } catch (e) {
+      return false;
+    }
+  }
+
+  validateForm() {
+    this.resetValidation();
+    // Only the URL is required and must be valid.
+    if (!this.state.url || !this.validateUrl()) {
+      this.setState({ validationError: true });
+      this.inputUrl.focus();
+      return false;
+    }
+    return true;
+  }
+
+  onUrlInputMount(input) {
+    this.inputUrl = input;
+  }
+
+  render() {
+    return external__React__default.a.createElement(
+      "form",
+      { className: "topsite-form" },
+      external__React__default.a.createElement(
+        "section",
+        { className: "edit-topsites-inner-wrapper" },
+        external__React__default.a.createElement(
+          "div",
+          { className: "form-wrapper" },
+          external__React__default.a.createElement(
+            "h3",
+            { className: "section-title" },
+            external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: this.props.editMode ? "topsites_form_edit_header" : "topsites_form_add_header" })
+          ),
+          external__React__default.a.createElement(
+            "div",
+            { className: "field title" },
+            external__React__default.a.createElement("input", {
+              type: "text",
+              value: this.state.label,
+              onChange: this.onLabelChange,
+              placeholder: this.props.intl.formatMessage({ id: "topsites_form_title_placeholder" }) })
+          ),
+          external__React__default.a.createElement(
+            "div",
+            { className: `field url${this.state.validationError ? " invalid" : ""}` },
+            external__React__default.a.createElement("input", {
+              type: "text",
+              ref: this.onUrlInputMount,
+              value: this.state.url,
+              onChange: this.onUrlChange,
+              placeholder: this.props.intl.formatMessage({ id: "topsites_form_url_placeholder" }) }),
+            this.state.validationError && external__React__default.a.createElement(
+              "aside",
+              { className: "error-tooltip" },
+              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_url_validation" })
+            )
+          )
+        )
+      ),
+      external__React__default.a.createElement(
+        "section",
+        { className: "actions" },
+        external__React__default.a.createElement(
+          "button",
+          { className: "cancel", type: "button", onClick: this.onCancelButtonClick },
+          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_cancel_button" })
+        ),
+        this.props.editMode && external__React__default.a.createElement(
+          "button",
+          { className: "done save", type: "submit", onClick: this.onSaveButtonClick },
+          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_save_button" })
+        ),
+        !this.props.editMode && external__React__default.a.createElement(
+          "button",
+          { className: "done add", type: "submit", onClick: this.onAddButtonClick },
+          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_add_button" })
+        )
+      )
+    );
+  }
+}
+
+TopSiteForm_TopSiteForm.defaultProps = {
+  label: "",
+  url: "",
+  index: 0,
+  editMode: false // by default we are in "Add New Top Site" mode
+};
 // EXTERNAL MODULE: ./system-addon/content-src/components/LinkMenu/LinkMenu.jsx + 2 modules
 var LinkMenu = __webpack_require__(6);
 
 // CONCATENATED MODULE: ./system-addon/content-src/components/TopSites/TopSite.jsx
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 
 
@@ -2671,21 +2888,22 @@ class TopSite_TopSiteLink extends extern
         }
         break;
       case "mousedown":
         // Reset at the first mouse event of a potential drag
         this.dragged = false;
         break;
     }
   }
+
   render() {
     const { children, className, isDraggable, link, onClick, title } = this.props;
     const topSiteOuterClassName = `top-site-outer${className ? ` ${className}` : ""}`;
     const { tippyTopIcon, faviconSize } = link;
-    const letterFallback = title[0];
+    const [letterFallback] = title;
     let imageClassName;
     let imageStyle;
     let showSmallFavicon = false;
     let smallFaviconStyle;
     let smallFaviconFallback;
     if (tippyTopIcon || faviconSize >= MIN_RICH_FAVICON_SIZE) {
       // styles and class names for top sites with rich icons
       imageClassName = "top-site-icon rich-icon";
@@ -2760,120 +2978,68 @@ TopSite_TopSiteLink.defaultProps = {
 
 class TopSite_TopSite extends external__React__default.a.PureComponent {
   constructor(props) {
     super(props);
     this.state = { showContextMenu: false };
     this.onLinkClick = this.onLinkClick.bind(this);
     this.onMenuButtonClick = this.onMenuButtonClick.bind(this);
     this.onMenuUpdate = this.onMenuUpdate.bind(this);
-    this.onDismissButtonClick = this.onDismissButtonClick.bind(this);
-    this.onPinButtonClick = this.onPinButtonClick.bind(this);
-    this.onEditButtonClick = this.onEditButtonClick.bind(this);
   }
+
   userEvent(event) {
     this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
       event,
       source: TOP_SITES_SOURCE,
       action_position: this.props.index
     }));
   }
+
   onLinkClick(ev) {
-    if (this.props.onEdit) {
-      // Ignore clicks if we are in the edit modal.
-      ev.preventDefault();
-      return;
-    }
     this.userEvent("CLICK");
   }
+
   onMenuButtonClick(event) {
     event.preventDefault();
     this.props.onActivate(this.props.index);
     this.setState({ showContextMenu: true });
   }
+
   onMenuUpdate(showContextMenu) {
     this.setState({ showContextMenu });
   }
-  onDismissButtonClick() {
-    const { link } = this.props;
-    if (link.isPinned) {
-      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-        type: Actions["b" /* actionTypes */].TOP_SITES_UNPIN,
-        data: { site: { url: link.url } }
-      }));
-    }
-    this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-      type: Actions["b" /* actionTypes */].BLOCK_URL,
-      data: link.url
-    }));
-    this.userEvent("BLOCK");
-  }
-  onPinButtonClick() {
-    const { link, index } = this.props;
-    if (link.isPinned) {
-      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-        type: Actions["b" /* actionTypes */].TOP_SITES_UNPIN,
-        data: { site: { url: link.url } }
-      }));
-      this.userEvent("UNPIN");
-    } else {
-      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-        type: Actions["b" /* actionTypes */].TOP_SITES_PIN,
-        data: { site: { url: link.url }, index }
-      }));
-      this.userEvent("PIN");
-    }
-  }
-  onEditButtonClick() {
-    this.props.onEdit(this.props.index);
-  }
+
   render() {
     const { props } = this;
     const { link } = props;
     const isContextMenuOpen = this.state.showContextMenu && props.activeIndex === props.index;
     const title = link.label || link.hostname;
     return external__React__default.a.createElement(
       TopSite_TopSiteLink,
       _extends({}, props, { onClick: this.onLinkClick, onDragEvent: this.props.onDragEvent, className: isContextMenuOpen ? "active" : "", title: title }),
-      !props.onEdit && external__React__default.a.createElement(
+      external__React__default.a.createElement(
         "div",
         null,
         external__React__default.a.createElement(
           "button",
           { className: "context-menu-button icon", onClick: this.onMenuButtonClick },
           external__React__default.a.createElement(
             "span",
             { className: "sr-only" },
-            `Open context menu for ${title}`
+            external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "context_menu_button_sr", values: { title } })
           )
         ),
         external__React__default.a.createElement(LinkMenu["a" /* LinkMenu */], {
           dispatch: props.dispatch,
           index: props.index,
           onUpdate: this.onMenuUpdate,
           options: TOP_SITES_CONTEXT_MENU_OPTIONS,
           site: link,
           source: TOP_SITES_SOURCE,
           visible: isContextMenuOpen })
-      ),
-      props.onEdit && external__React__default.a.createElement(
-        "div",
-        { className: "edit-menu" },
-        external__React__default.a.createElement("button", {
-          className: `icon icon-${link.isPinned ? "unpin" : "pin"}`,
-          title: this.props.intl.formatMessage({ id: `edit_topsites_${link.isPinned ? "unpin" : "pin"}_button` }),
-          onClick: this.onPinButtonClick }),
-        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: "icon icon-dismiss",
-          title: this.props.intl.formatMessage({ id: "edit_topsites_dismiss_button" }),
-          onClick: this.onDismissButtonClick })
       )
     );
   }
 }
 TopSite_TopSite.defaultProps = {
   link: {},
   onActivate() {}
 };
@@ -2900,61 +3066,68 @@ class TopSite_TopSitePlaceholder extends
       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 })
     );
   }
 }
 
 class TopSite__TopSiteList extends external__React__default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = this.DEFAULT_STATE = {
+  static get DEFAULT_STATE() {
+    return {
+      activeIndex: null,
       draggedIndex: null,
       draggedSite: null,
       draggedTitle: null,
-      topSitesPreview: null,
-      activeIndex: null
+      topSitesPreview: null
     };
+  }
+
+  constructor(props) {
+    super(props);
+    this.state = TopSite__TopSiteList.DEFAULT_STATE;
     this.onDragEvent = this.onDragEvent.bind(this);
     this.onActivate = this.onActivate.bind(this);
   }
+
   componentWillUpdate(nextProps) {
     if (this.state.draggedSite) {
       const prevTopSites = this.props.TopSites && this.props.TopSites.rows;
       const newTopSites = nextProps.TopSites && nextProps.TopSites.rows;
       if (prevTopSites && prevTopSites[this.state.draggedIndex] && prevTopSites[this.state.draggedIndex].url === this.state.draggedSite.url && (!newTopSites[this.state.draggedIndex] || newTopSites[this.state.draggedIndex].url !== this.state.draggedSite.url)) {
         // We got the new order from the redux store via props. We can clear state now.
-        this.setState(this.DEFAULT_STATE);
+        this.setState(TopSite__TopSiteList.DEFAULT_STATE);
       }
     }
   }
+
   userEvent(event, index) {
     this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
       event,
       source: TOP_SITES_SOURCE,
       action_position: index
     }));
   }
+
   onDragEvent(event, index, link, title) {
     switch (event.type) {
       case "dragstart":
         this.dropped = false;
         this.setState({
           draggedIndex: index,
           draggedSite: link,
           draggedTitle: title,
           activeIndex: null
         });
         this.userEvent("DRAG", index);
         break;
       case "dragend":
         if (!this.dropped) {
           // If there was no drop event, reset the state to the default.
-          this.setState(this.DEFAULT_STATE);
+          this.setState(TopSite__TopSiteList.DEFAULT_STATE);
         }
         break;
       case "dragenter":
         if (index === this.state.draggedIndex) {
           this.setState({ topSitesPreview: null });
         } else {
           this.setState({ topSitesPreview: this._makeTopSitesPreview(index) });
         }
@@ -2966,16 +3139,17 @@ class TopSite__TopSiteList extends exter
             type: Actions["b" /* actionTypes */].TOP_SITES_INSERT,
             data: { site: { url: this.state.draggedSite.url, label: this.state.draggedTitle }, index, draggedFromIndex: this.state.draggedIndex }
           }));
           this.userEvent("DROP", index);
         }
         break;
     }
   }
+
   _getTopSites() {
     // Make a copy of the sites to truncate or extend to desired length
     let topSites = this.props.TopSites.rows.slice();
     topSites.length = this.props.TopSitesCount;
     return topSites;
   }
 
   /**
@@ -3014,19 +3188,21 @@ class TopSite__TopSiteList extends exter
     for (let i = 0; i < preview.length; i++) {
       if (!preview[i]) {
         preview[i] = unpinned.shift() || null;
       }
     }
 
     return preview;
   }
+
   onActivate(index) {
     this.setState({ activeIndex: index });
   }
+
   render() {
     const { props } = this;
     const topSites = this.state.topSitesPreview || this._getTopSites();
     const topSitesUI = [];
     const commonProps = {
       onDragEvent: this.onDragEvent,
       dispatch: props.dispatch,
       intl: props.intl
@@ -3055,363 +3231,16 @@ class TopSite__TopSiteList extends exter
       "ul",
       { className: `top-sites-list${this.state.draggedSite ? " dnd-active" : ""}` },
       topSitesUI
     );
   }
 }
 
 const TopSiteList = Object(external__ReactIntl_["injectIntl"])(TopSite__TopSiteList);
-// CONCATENATED MODULE: ./system-addon/content-src/components/TopSites/TopSiteForm.jsx
-
-
-
-
-
-class TopSiteForm_TopSiteForm extends external__React__default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      label: props.label || "",
-      url: props.url || "",
-      validationError: false
-    };
-    this.onLabelChange = this.onLabelChange.bind(this);
-    this.onUrlChange = this.onUrlChange.bind(this);
-    this.onCancelButtonClick = this.onCancelButtonClick.bind(this);
-    this.onAddButtonClick = this.onAddButtonClick.bind(this);
-    this.onSaveButtonClick = this.onSaveButtonClick.bind(this);
-    this.onUrlInputMount = this.onUrlInputMount.bind(this);
-  }
-  onLabelChange(event) {
-    this.resetValidation();
-    this.setState({ "label": event.target.value });
-  }
-  onUrlChange(event) {
-    this.resetValidation();
-    this.setState({ "url": event.target.value });
-  }
-  onCancelButtonClick(ev) {
-    ev.preventDefault();
-    this.props.onClose();
-  }
-  onAddButtonClick(ev) {
-    ev.preventDefault();
-    if (this.validateForm()) {
-      let site = { url: this.cleanUrl() };
-      if (this.state.label !== "") {
-        site.label = this.state.label;
-      }
-      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-        type: Actions["b" /* actionTypes */].TOP_SITES_INSERT,
-        data: { site }
-      }));
-      this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-        source: TOP_SITES_SOURCE,
-        event: "TOP_SITES_ADD"
-      }));
-      this.props.onClose();
-    }
-  }
-  onSaveButtonClick(ev) {
-    ev.preventDefault();
-    if (this.validateForm()) {
-      let site = { url: this.cleanUrl() };
-      if (this.state.label !== "") {
-        site.label = this.state.label;
-      }
-      this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-        type: Actions["b" /* actionTypes */].TOP_SITES_PIN,
-        data: { site, index: this.props.index }
-      }));
-      this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-        source: TOP_SITES_SOURCE,
-        event: "TOP_SITES_EDIT",
-        action_position: this.props.index
-      }));
-      this.props.onClose();
-    }
-  }
-  cleanUrl() {
-    let url = this.state.url;
-    // If we are missing a protocol, prepend http://
-    if (!url.startsWith("http:") && !url.startsWith("https:")) {
-      url = `http://${url}`;
-    }
-    return url;
-  }
-  resetValidation() {
-    if (this.state.validationError) {
-      this.setState({ validationError: false });
-    }
-  }
-  validateUrl() {
-    try {
-      return !!new URL(this.cleanUrl());
-    } catch (e) {
-      return false;
-    }
-  }
-  validateForm() {
-    this.resetValidation();
-    // Only the URL is required and must be valid.
-    if (!this.state.url || !this.validateUrl()) {
-      this.setState({ validationError: true });
-      this.inputUrl.focus();
-      return false;
-    }
-    return true;
-  }
-  onUrlInputMount(input) {
-    this.inputUrl = input;
-  }
-  render() {
-    return external__React__default.a.createElement(
-      "form",
-      { className: "topsite-form" },
-      external__React__default.a.createElement(
-        "section",
-        { className: "edit-topsites-inner-wrapper" },
-        external__React__default.a.createElement(
-          "div",
-          { className: "form-wrapper" },
-          external__React__default.a.createElement(
-            "h3",
-            { className: "section-title" },
-            external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: this.props.editMode ? "topsites_form_edit_header" : "topsites_form_add_header" })
-          ),
-          external__React__default.a.createElement(
-            "div",
-            { className: "field title" },
-            external__React__default.a.createElement("input", {
-              type: "text",
-              value: this.state.label,
-              onChange: this.onLabelChange,
-              placeholder: this.props.intl.formatMessage({ id: "topsites_form_title_placeholder" }) })
-          ),
-          external__React__default.a.createElement(
-            "div",
-            { className: `field url${this.state.validationError ? " invalid" : ""}` },
-            external__React__default.a.createElement("input", {
-              type: "text",
-              ref: this.onUrlInputMount,
-              value: this.state.url,
-              onChange: this.onUrlChange,
-              placeholder: this.props.intl.formatMessage({ id: "topsites_form_url_placeholder" }) }),
-            this.state.validationError && external__React__default.a.createElement(
-              "aside",
-              { className: "error-tooltip" },
-              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_url_validation" })
-            )
-          )
-        )
-      ),
-      external__React__default.a.createElement(
-        "section",
-        { className: "actions" },
-        external__React__default.a.createElement(
-          "button",
-          { className: "cancel", type: "button", onClick: this.onCancelButtonClick },
-          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_cancel_button" })
-        ),
-        this.props.editMode && external__React__default.a.createElement(
-          "button",
-          { className: "done save", type: "submit", onClick: this.onSaveButtonClick },
-          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_save_button" })
-        ),
-        !this.props.editMode && external__React__default.a.createElement(
-          "button",
-          { className: "done add", type: "submit", onClick: this.onAddButtonClick },
-          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "topsites_form_add_button" })
-        )
-      )
-    );
-  }
-}
-
-TopSiteForm_TopSiteForm.defaultProps = {
-  label: "",
-  url: "",
-  index: 0,
-  editMode: false // by default we are in "Add New Top Site" mode
-};
-// CONCATENATED MODULE: ./system-addon/content-src/components/TopSites/TopSitesEdit.jsx
-
-
-
-
-
-
-
-
-class TopSitesEdit__TopSitesEdit extends external__React__default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      showEditModal: false,
-      showAddForm: false,
-      showEditForm: false,
-      editIndex: -1 // Index of top site being edited
-    };
-    this.onEditButtonClick = this.onEditButtonClick.bind(this);
-    this.onShowMoreLessClick = this.onShowMoreLessClick.bind(this);
-    this.onModalOverlayClick = this.onModalOverlayClick.bind(this);
-    this.onAddButtonClick = this.onAddButtonClick.bind(this);
-    this.onFormClose = this.onFormClose.bind(this);
-    this.onEdit = this.onEdit.bind(this);
-    this.dispatchEditModalUserEvent = this.dispatchEditModalUserEvent.bind(this);
-  }
-  dispatchEditModalUserEvent() {
-    const event = this.state.showEditModal ? "TOP_SITES_EDIT_OPEN" : "TOP_SITES_EDIT_CLOSE";
-    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-      source: TOP_SITES_SOURCE,
-      event
-    }));
-  }
-  onEditButtonClick() {
-    function toggleEditModal(prevState) {
-      return { showEditModal: !prevState.showEditModal };
-    }
-    this.setState(toggleEditModal, this.dispatchEditModalUserEvent);
-  }
-  onModalOverlayClick() {
-    this.setState({ showEditModal: false, showAddForm: false, showEditForm: false });
-    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-      source: TOP_SITES_SOURCE,
-      event: "TOP_SITES_EDIT_CLOSE"
-    }));
-    this.props.dispatch({ type: Actions["b" /* actionTypes */].TOP_SITES_CANCEL_EDIT });
-  }
-  onShowMoreLessClick() {
-    const prefIsSetToDefault = this.props.TopSitesCount === Reducers["a" /* TOP_SITES_DEFAULT_LENGTH */];
-    this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
-      type: Actions["b" /* actionTypes */].SET_PREF,
-      data: { name: "topSitesCount", value: prefIsSetToDefault ? Reducers["b" /* TOP_SITES_SHOWMORE_LENGTH */] : Reducers["a" /* TOP_SITES_DEFAULT_LENGTH */] }
-    }));
-    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-      source: TOP_SITES_SOURCE,
-      event: prefIsSetToDefault ? "TOP_SITES_EDIT_SHOW_MORE" : "TOP_SITES_EDIT_SHOW_LESS"
-    }));
-  }
-  onAddButtonClick() {
-    this.setState({ showAddForm: true });
-    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-      source: TOP_SITES_SOURCE,
-      event: "TOP_SITES_ADD_FORM_OPEN"
-    }));
-  }
-  onFormClose() {
-    this.setState({ showAddForm: false, showEditForm: false });
-    this.props.dispatch({ type: Actions["b" /* actionTypes */].TOP_SITES_CANCEL_EDIT });
-  }
-  onEdit(index) {
-    this.setState({ showEditForm: true, editIndex: index });
-    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
-      source: TOP_SITES_SOURCE,
-      event: "TOP_SITES_EDIT_FORM_OPEN"
-    }));
-  }
-  render() {
-    const { editForm } = this.props.TopSites;
-    const showEditForm = editForm && editForm.visible || this.state.showEditModal && this.state.showEditForm;
-    let editIndex = this.state.editIndex;
-    if (editIndex < 0 && editForm) {
-      editIndex = editForm.index;
-    }
-    const editSite = this.props.TopSites.rows[editIndex] || {};
-    return external__React__default.a.createElement(
-      "div",
-      { className: "edit-topsites-wrapper" },
-      external__React__default.a.createElement(
-        "div",
-        { className: "edit-topsites-button" },
-        external__React__default.a.createElement(
-          "button",
-          {
-            className: "edit",
-            title: this.props.intl.formatMessage({ id: "edit_topsites_button_label" }),
-            onClick: this.onEditButtonClick },
-          external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "edit_topsites_button_text" })
-        )
-      ),
-      this.state.showEditModal && !this.state.showAddForm && !this.state.showEditForm && external__React__default.a.createElement(
-        "div",
-        { className: "edit-topsites" },
-        external__React__default.a.createElement("div", { className: "modal-overlay", onClick: this.onModalOverlayClick }),
-        external__React__default.a.createElement(
-          "div",
-          { className: "modal" },
-          external__React__default.a.createElement(
-            "section",
-            { className: "edit-topsites-inner-wrapper" },
-            external__React__default.a.createElement(
-              "div",
-              { className: "section-top-bar" },
-              external__React__default.a.createElement(
-                "h3",
-                { className: "section-title" },
-                external__React__default.a.createElement("span", { className: `icon icon-small-spacer icon-topsites` }),
-                external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "header_top_sites" })
-              )
-            ),
-            external__React__default.a.createElement(TopSiteList, { TopSites: this.props.TopSites, TopSitesCount: this.props.TopSitesCount, onEdit: this.onEdit, dispatch: this.props.dispatch, intl: this.props.intl })
-          ),
-          external__React__default.a.createElement(
-            "section",
-            { className: "actions" },
-            external__React__default.a.createElement(
-              "button",
-              { className: "add", onClick: this.onAddButtonClick },
-              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "edit_topsites_add_button" })
-            ),
-            external__React__default.a.createElement(
-              "button",
-              { className: `icon icon-topsites show-${this.props.TopSitesCount === Reducers["a" /* TOP_SITES_DEFAULT_LENGTH */] ? "more" : "less"}`, onClick: this.onShowMoreLessClick },
-              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: `edit_topsites_show${this.props.TopSitesCount === Reducers["a" /* TOP_SITES_DEFAULT_LENGTH */] ? "more" : "less"}_button` })
-            ),
-            external__React__default.a.createElement(
-              "button",
-              { className: "done", onClick: this.onEditButtonClick },
-              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "edit_topsites_done_button" })
-            )
-          )
-        )
-      ),
-      this.state.showEditModal && this.state.showAddForm && external__React__default.a.createElement(
-        "div",
-        { className: "edit-topsites" },
-        external__React__default.a.createElement("div", { className: "modal-overlay", onClick: this.onModalOverlayClick }),
-        external__React__default.a.createElement(
-          "div",
-          { className: "modal" },
-          external__React__default.a.createElement(TopSiteForm_TopSiteForm, { onClose: this.onFormClose, dispatch: this.props.dispatch, intl: this.props.intl })
-        )
-      ),
-      showEditForm && external__React__default.a.createElement(
-        "div",
-        { className: "edit-topsites" },
-        external__React__default.a.createElement("div", { className: "modal-overlay", onClick: this.onModalOverlayClick }),
-        external__React__default.a.createElement(
-          "div",
-          { className: "modal" },
-          external__React__default.a.createElement(TopSiteForm_TopSiteForm, {
-            label: editSite.label || editSite.hostname || "",
-            url: editSite.url || "",
-            index: editIndex,
-            editMode: true,
-            onClose: this.onFormClose,
-            dispatch: this.props.dispatch,
-            intl: this.props.intl })
-        )
-      )
-    );
-  }
-}
-
-const TopSitesEdit = Object(external__ReactIntl_["injectIntl"])(TopSitesEdit__TopSitesEdit);
 // CONCATENATED MODULE: ./system-addon/content-src/components/TopSites/TopSites.jsx
 
 
 
 
 
 
 
@@ -3445,16 +3274,31 @@ function countTopSitesIconsTypes(topSite
     "screenshot": 0,
     "tippytop": 0,
     "rich_icon": 0,
     "no_image": 0
   });
 }
 
 class TopSites__TopSites extends external__React__default.a.PureComponent {
+  static get DEFAULT_STATE() {
+    return {
+      showAddForm: false,
+      showEditForm: false,
+      editIndex: -1 // Index of top site being edited
+    };
+  }
+
+  constructor(props) {
+    super(props);
+    this.state = TopSites__TopSites.DEFAULT_STATE;
+    this.onAddButtonClick = this.onAddButtonClick.bind(this);
+    this.onFormClose = this.onFormClose.bind(this);
+  }
+
   /**
    * Dispatch session statistics about the quality of TopSites icons and pinned count.
    */
   _dispatchTopSitesStats() {
     const topSites = this._getTopSites();
     const topSitesIconsStats = countTopSitesIconsTypes(topSites);
     const topSitesPinned = topSites.filter(site => !!site.isPinned).length;
     // Dispatch telemetry event with the count of TopSites images types.
@@ -3474,40 +3318,107 @@ class TopSites__TopSites extends externa
   componentDidUpdate() {
     this._dispatchTopSitesStats();
   }
 
   componentDidMount() {
     this._dispatchTopSitesStats();
   }
 
+  onAddButtonClick() {
+    this.setState({ showAddForm: true });
+    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
+      source: TOP_SITES_SOURCE,
+      event: "TOP_SITES_ADD_FORM_OPEN"
+    }));
+  }
+
+  onFormClose() {
+    this.setState(TopSites__TopSites.DEFAULT_STATE);
+    this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
+      source: TOP_SITES_SOURCE,
+      event: "TOP_SITES_EDIT_CLOSE"
+    }));
+    this.props.dispatch({ type: Actions["b" /* actionTypes */].TOP_SITES_CANCEL_EDIT });
+  }
+
   render() {
-    const props = this.props;
+    const { props } = this;
     const infoOption = {
       header: { id: "settings_pane_topsites_header" },
       body: { id: "settings_pane_topsites_body" }
     };
+    const { showAddForm } = this.state;
+    const { editForm } = this.props.TopSites;
+    const showEditForm = editForm && editForm.visible || this.state.showEditForm;
+    let { editIndex } = this.state;
+    if (editIndex < 0 && editForm) {
+      editIndex = editForm.index;
+    }
+    const editSite = this.props.TopSites.rows[editIndex] || {};
     return external__React__default.a.createElement(
       ComponentPerfTimer["a" /* ComponentPerfTimer */],
       { id: "topsites", initialized: props.TopSites.initialized, dispatch: props.dispatch },
       external__React__default.a.createElement(
         CollapsibleSection["a" /* CollapsibleSection */],
         { className: "top-sites", icon: "topsites", title: external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "header_top_sites" }), infoOption: infoOption, prefName: "collapseTopSites", Prefs: props.Prefs, dispatch: props.dispatch },
         external__React__default.a.createElement(TopSiteList, { TopSites: props.TopSites, TopSitesCount: props.TopSitesCount, dispatch: props.dispatch, intl: props.intl }),
-        external__React__default.a.createElement(TopSitesEdit, props)
+        external__React__default.a.createElement(
+          "div",
+          { className: "edit-topsites-wrapper" },
+          external__React__default.a.createElement(
+            "div",
+            { className: "add-topsites-button" },
+            external__React__default.a.createElement(
+              "button",
+              {
+                className: "add",
+                title: this.props.intl.formatMessage({ id: "edit_topsites_add_button_tooltip" }),
+                onClick: this.onAddButtonClick },
+              external__React__default.a.createElement(external__ReactIntl_["FormattedMessage"], { id: "edit_topsites_add_button" })
+            )
+          ),
+          showAddForm && external__React__default.a.createElement(
+            "div",
+            { className: "edit-topsites" },
+            external__React__default.a.createElement("div", { className: "modal-overlay", onClick: this.onFormClose }),
+            external__React__default.a.createElement(
+              "div",
+              { className: "modal" },
+              external__React__default.a.createElement(TopSiteForm_TopSiteForm, { onClose: this.onFormClose, dispatch: this.props.dispatch, intl: this.props.intl })
+            )
+          ),
+          showEditForm && external__React__default.a.createElement(
+            "div",
+            { className: "edit-topsites" },
+            external__React__default.a.createElement("div", { className: "modal-overlay", onClick: this.onFormClose }),
+            external__React__default.a.createElement(
+              "div",
+              { className: "modal" },
+              external__React__default.a.createElement(TopSiteForm_TopSiteForm, {
+                label: editSite.label || editSite.hostname || "",
+                url: editSite.url || "",
+                index: editIndex,
+                editMode: true,
+                onClose: this.onFormClose,
+                dispatch: this.props.dispatch,
+                intl: this.props.intl })
+            )
+          )
+        )
       )
     );
   }
 }
 
 const TopSites = Object(external__ReactRedux_["connect"])(state => ({
   TopSites: state.TopSites,
   Prefs: state.Prefs,
   TopSitesCount: state.Prefs.values.topSitesCount
-}))(TopSites__TopSites);
+}))(Object(external__ReactIntl_["injectIntl"])(TopSites__TopSites));
 // CONCATENATED MODULE: ./system-addon/content-src/components/Base/Base.jsx
 
 
 
 
 
 
 
@@ -3550,17 +3461,17 @@ class Base__Base extends external__React
   sendNewTabRehydrated(App) {
     if (App && App.initialized && !this.renderNotified) {
       this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({ type: Actions["b" /* actionTypes */].NEW_TAB_REHYDRATED, data: {} }));
       this.renderNotified = true;
     }
   }
 
   render() {
-    const props = this.props;
+    const { props } = this;
     const { App, locale, strings } = props;
     const { initialized } = App;
     const prefs = props.Prefs.values;
 
     const shouldBeFixedToTop = PrerenderData.arePrefsValid(name => prefs[name]);
 
     const outerClassName = `outer-wrapper${shouldBeFixedToTop ? " fixed-to-top" : ""}`;
 
@@ -3944,16 +3855,17 @@ class Card_Card extends external__React_
 
   onMenuButtonClick(event) {
     event.preventDefault();
     this.setState({
       activeCard: this.props.index,
       showContextMenu: true
     });
   }
+
   onLinkClick(event) {
     event.preventDefault();
     const { altKey, button, ctrlKey, metaKey, shiftKey } = event;
     this.props.dispatch(Actions["a" /* actionCreators */].SendToMain({
       type: Actions["b" /* actionTypes */].OPEN_LINK,
       data: Object.assign(this.props.link, { event: { altKey, button, ctrlKey, metaKey, shiftKey } })
     }));
     this.props.dispatch(Actions["a" /* actionCreators */].UserEvent({
@@ -3964,31 +3876,36 @@ class Card_Card extends external__React_
     if (this.props.shouldSendImpressionStats) {
       this.props.dispatch(Actions["a" /* actionCreators */].ImpressionStats({
         source: this.props.eventSource,
         click: 0,
         tiles: [{ id: this.props.link.guid, pos: this.props.index }]
       }));
     }
   }
+
   onMenuUpdate(showContextMenu) {
     this.setState({ showContextMenu });
   }
+
   componentDidMount() {
     this.maybeLoadImage();
   }
+
   componentDidUpdate() {
     this.maybeLoadImage();
   }
+
   componentWillReceiveProps(nextProps) {
     // Clear the image state if changing images
     if (nextProps.link.image !== this.props.link.image) {
       this.setState({ imageLoaded: false });
     }
   }
+
   render() {
     const { index, link, dispatch, contextMenuOptions, eventSource, shouldSendImpressionStats } = this.props;
     const { props } = this;
     const isContextMenuOpen = this.state.showContextMenu && this.state.activeCard === index;
     // Display "now" as "trending" until we have new strings #3402
     const { icon, intlID } = cardContextTypes[link.type === "now" ? "trending" : link.type] || {};
     const hasImage = link.image || link.hasImage;
     const imageStyle = { backgroundImage: link.image ? `url(${link.image})` : "none" };

--- a/browser/extensions/activity-stream/install.rdf.in
+++ b/browser/extensions/activity-stream/install.rdf.in
@@ -3,17 +3,17 @@
 #filter substitution
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>activity-stream@mozilla.org</em:id>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:unpack>false</em:unpack>
-    <em:version>2018.01.20.1140-7b6573a1</em:version>
+    <em:version>2018.01.30.1052-2ec746e0</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>
 
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>

--- a/browser/extensions/activity-stream/lib/ActivityStream.jsm
+++ b/browser/extensions/activity-stream/lib/ActivityStream.jsm
@@ -53,19 +53,19 @@ const PREFS_CONFIG = new Map([
       // Use the opposite value as what default value the feed would have used
       hidden: !PREFS_CONFIG.get("feeds.section.topstories").getValue(args),
       provider_header: "pocket_feedback_header",
       provider_description: "pocket_description",
       provider_icon: "pocket",
       provider_name: "Pocket",
       read_more_endpoint: "https://getpocket.com/explore/trending?src=fx_new_tab",
       stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`,
-      stories_referrer: "http://getpocket.com/recommendations",
+      stories_referrer: "https://getpocket.com/recommendations",
       info_link: "https://www.mozilla.org/privacy/firefox/#pocketstories",
-      disclaimer_link: "https://getpocket.com/firefox/new_tab_learn_more.php",
+      disclaimer_link: "https://getpocket.com/firefox/new_tab_learn_more",
       topics_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`,
       show_spocs: false,
       personalized: true
     })
   }],
   ["showSponsored", {
     title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)",
     value: true
@@ -239,16 +239,17 @@ this.ActivityStream = class ActivityStre
    */
   constructor(options = {}) {
     this.initialized = false;
     this.options = options;
     this.store = new Store();
     this.feeds = FEEDS_CONFIG;
     this._defaultPrefs = new DefaultPrefs(PREFS_CONFIG);
   }
+
   init() {
     try {
       this._updateDynamicPrefs();
       this._defaultPrefs.init();
 
       // Hook up the store and let all feeds and pages initialize
       this.store.init(this.feeds, ac.BroadcastToContent({
         type: at.INIT,
@@ -261,32 +262,35 @@ this.ActivityStream = class ActivityStre
       // the telemetry feed is not yet initialized.
       const telemetryFeed = this.store.feeds.get("feeds.telemetry");
       if (telemetryFeed) {
         telemetryFeed.handleUndesiredEvent({data: {event: "ADDON_INIT_FAILED"}});
       }
       throw e;
     }
   }
+
   uninit() {
     if (this.geo === "") {
       Services.prefs.removeObserver(GEO_PREF, this);
     }
 
     this.store.uninit();
     this.initialized = false;
   }
+
   uninstall(reason) {
     if (reason === REASON_ADDON_UNINSTALL) {
       // This resets all prefs in the config to their default values,
       // so we DON'T want to do this on an upgrade/downgrade, only on a
       // real uninstall
       this._defaultPrefs.reset();
     }
   }
+
   _updateDynamicPrefs() {
     // Save the geo pref if we have it
     if (Services.prefs.prefHasUserValue(GEO_PREF)) {
       this.geo = Services.prefs.getStringPref(GEO_PREF);
     } else if (this.geo !== "") {
       // Watch for geo changes and use a dummy value for now
       Services.prefs.addObserver(GEO_PREF, this);
       this.geo = "";
@@ -310,16 +314,17 @@ this.ActivityStream = class ActivityStre
       // overwrite the default with the new value.
       if (prefConfig.value !== undefined && prefConfig.value !== newValue) {
         this._defaultPrefs.setDefaultPref(pref, newValue);
       }
 
       prefConfig.value = newValue;
     }
   }
+
   observe(subject, topic, data) {
     switch (topic) {
       case "nsPref:changed":
         // We should only expect one geo change, so update and stop observing
         if (data === GEO_PREF) {
           this._updateDynamicPrefs();
           Services.prefs.removeObserver(GEO_PREF, this);
         }

--- a/browser/extensions/activity-stream/lib/ActivityStreamPrefs.jsm
+++ b/browser/extensions/activity-stream/lib/ActivityStreamPrefs.jsm
@@ -15,24 +15,27 @@ this.Prefs = class Prefs extends Prefere
    * Prefs - A wrapper around Preferences that always sets the branch to
    *         ACTIVITY_STREAM_PREF_BRANCH
    */
   constructor(branch = ACTIVITY_STREAM_PREF_BRANCH) {
     super({branch});
     this._branchName = branch;
     this._branchObservers = new Map();
   }
+
   get branchName() {
     return this._branchName;
   }
+
   ignoreBranch(listener) {
     const observer = this._branchObservers.get(listener);
     this._prefBranch.removeObserver("", observer);
     this._branchObservers.delete(listener);
   }
+
   observeBranch(listener) {
     const observer = (subject, topic, pref) => {
       listener.onPrefChanged(pref, this.get(pref));
     };
     this._prefBranch.addObserver("", observer);
     this._branchObservers.set(listener, observer);
   }
 };

--- a/browser/extensions/activity-stream/lib/HighlightsFeed.jsm
+++ b/browser/extensions/activity-stream/lib/HighlightsFeed.jsm
@@ -139,17 +139,17 @@ this.HighlightsFeed = class HighlightsFe
 
     SectionsManager.updateSection(SECTION_ID, {rows: highlights}, shouldBroadcast);
   }
 
   /**
    * Fetch an image for a given highlight and update the card with it. If no
    * image is available then fallback to fetching a screenshot.
    */
-  async fetchImage(page) {
+  fetchImage(page) {
     // Request a screenshot if we don't already have one pending
     const {preview_image_url: imageUrl, url} = page;
     Screenshots.maybeCacheScreenshot(page, imageUrl || url, "image", image => {
       SectionsManager.updateSectionCard(SECTION_ID, url, {image}, true);
     });
   }
 
   onAction(action) {

--- a/browser/extensions/activity-stream/lib/LinksCache.jsm
+++ b/browser/extensions/activity-stream/lib/LinksCache.jsm
@@ -99,23 +99,23 @@ this.LinksCache = class LinksCache {
             for (const property of this.migrateProperties) {
               const oldValue = oldLink[property];
               if (oldValue !== undefined) {
                 newLink[property] = oldValue;
               }
             }
           } else {
             // Share data among link copies and new links from future requests
-            newLink.__sharedCache = {
-              // Provide a helper to update the cached link
-              updateLink(property, value) {
-                newLink[property] = value;
-              }
-            };
+            newLink.__sharedCache = {};
           }
+          // Provide a helper to update the cached link
+          newLink.__sharedCache.updateLink = (property, value) => {
+            newLink[property] = value;
+          };
+
           return newLink;
         }));
       });
     }
 
     // Provide a shallow copy of the cached link objects for callers to modify
     return (await this.cache).map(link => link && Object.assign({}, link));
   }

--- a/browser/extensions/activity-stream/lib/NewTabInit.jsm
+++ b/browser/extensions/activity-stream/lib/NewTabInit.jsm
@@ -10,31 +10,33 @@ const {actionCreators: ac, actionTypes: 
 /**
  * NewTabInit - A placeholder for now. This will send a copy of the state to all
  *              newly opened tabs.
  */
 this.NewTabInit = class NewTabInit {
   constructor() {
     this._repliedEarlyTabs = new Map();
   }
+
   reply(target) {
     // Skip this reply if we already replied to an early tab
     if (this._repliedEarlyTabs.get(target)) {
       return;
     }
 
     const action = {type: at.NEW_TAB_INITIAL_STATE, data: this.store.getState()};
     this.store.dispatch(ac.SendToContent(action, target));
 
     // Remember that this early tab has already gotten a rehydration response in
     // case it thought we lost its initial REQUEST and asked again
     if (this._repliedEarlyTabs.has(target)) {
       this._repliedEarlyTabs.set(target, true);
     }
   }
+
   onAction(action) {
     switch (action.type) {
       case at.NEW_TAB_STATE_REQUEST:
         this.reply(action.meta.fromTarget);
         break;
       case at.NEW_TAB_INIT:
         // Initialize data for early tabs that might REQUEST twice
         if (action.data.simulated) {

--- a/browser/extensions/activity-stream/lib/PlacesFeed.jsm
+++ b/browser/extensions/activity-stream/lib/PlacesFeed.jsm
@@ -66,22 +66,29 @@ class HistoryObserver extends Observer {
    * onClearHistory - Called when the user clears their entire history.
    */
   onClearHistory() {
     this.dispatch({type: at.PLACES_HISTORY_CLEARED});
   }
 
   // Empty functions to make xpconnect happy
   onBeginUpdateBatch() {}
+
   onEndUpdateBatch() {}
+
   onVisits() {}
+
   onTitleChanged() {}
+
   onFrecencyChanged() {}
+
   onManyFrecenciesChanged() {}
+
   onPageChanged() {}
+
   onDeleteVisits() {}
 }
 
 /**
  * BookmarksObserver - observes events from PlacesUtils.bookmarks
  */
 class BookmarksObserver extends Observer {
   constructor(dispatch) {
@@ -99,30 +106,24 @@ class BookmarksObserver extends Observer
    * @param  {str} uri
    * @param  {str} title
    * @param  {int} dateAdded
    * @param  {str} guid      The unique id of the bookmark
    * @param  {str} parent guid
    * @param  {int} source    Used to distinguish bookmarks made by different
    *                         actions: sync, bookmarks import, other.
    */
-  onItemAdded(...args) {
-    const type = args[3];
-    const source = args[9];
-    const uri = args[4];
+  onItemAdded(id, folderId, index, type, uri, bookmarkTitle, dateAdded, bookmarkGuid, parentGuid, source) { // eslint-disable-line max-params
     // Skips items that are not bookmarks (like folders), about:* pages or
     // default bookmarks, added when the profile is created.
     if (type !== PlacesUtils.bookmarks.TYPE_BOOKMARK ||
         source === PlacesUtils.bookmarks.SOURCES.IMPORT_REPLACE ||
         (uri.scheme !== "http" && uri.scheme !== "https")) {
       return;
     }
-    const bookmarkTitle = args[5];
-    const dateAdded = args[6];
-    const bookmarkGuid = args[7];
     this.dispatch({
       type: at.PLACES_BOOKMARK_ADDED,
       data: {
         bookmarkGuid,
         bookmarkTitle,
         dateAdded,
         url: uri.spec
       }
@@ -188,18 +189,21 @@ class BookmarksObserver extends Observer
     } catch (e) {
       Cu.reportError(e);
     }
     */
   }
 
   // Empty functions to make xpconnect happy
   onBeginUpdateBatch() {}
+
   onEndUpdateBatch() {}
+
   onItemVisited() {}
+
   onItemMoved() {}
 }
 
 class PlacesFeed {
   constructor() {
     this.historyObserver = new HistoryObserver(action => this.store.dispatch(ac.BroadcastToContent(action)));
     this.bookmarksObserver = new BookmarksObserver(action => this.store.dispatch(ac.BroadcastToContent(action)));
   }
@@ -234,22 +238,31 @@ class PlacesFeed {
     if (topic === LINK_BLOCKED_EVENT) {
       this.store.dispatch(ac.BroadcastToContent({
         type: at.PLACES_LINK_BLOCKED,
         data: {url: value}
       }));
     }
   }
 
-  openNewWindow(action, isPrivate = false) {
+  /**
+   * Open a link in a desired destination defaulting to action's event.
+   */
+  openLink(action, where = "", isPrivate = false) {
+    const params = {private: isPrivate};
+
+    // Always include the referrer (even for http links) if we have one
+    const {event, referrer} = action.data;
+    if (referrer) {
+      params.referrerPolicy = Ci.nsIHttpChannel.REFERRER_POLICY_UNSAFE_URL;
+      params.referrerURI = Services.io.newURI(referrer);
+    }
+
     const win = action._target.browser.ownerGlobal;
-    const privateParam = {private: isPrivate};
-    const params = (action.data.referrer) ?
-      Object.assign(privateParam, {referrerURI: Services.io.newURI(action.data.referrer)}) : privateParam;
-    win.openLinkIn(action.data.url, "window", params);
+    win.openLinkIn(action.data.url, where || win.whereToOpenLink(event), params);
   }
 
   onAction(action) {
     switch (action.type) {
       case at.INIT:
         // Briefly avoid loading services for observing for better startup timing
         Services.tm.dispatchToMainThread(() => this.addObservers());
         break;
@@ -269,32 +282,26 @@ class PlacesFeed {
         const {url, forceBlock} = action.data;
         NewTabUtils.activityStreamLinks.deleteHistoryEntry(url);
         if (forceBlock) {
           NewTabUtils.activityStreamLinks.blockURL({url});
         }
         break;
       }
       case at.OPEN_NEW_WINDOW:
-        this.openNewWindow(action);
+        this.openLink(action, "window");
         break;
       case at.OPEN_PRIVATE_WINDOW:
-        this.openNewWindow(action, true);
+        this.openLink(action, "window", true);
         break;
       case at.SAVE_TO_POCKET:
         Pocket.savePage(action._target.browser, action.data.site.url, action.data.site.title);
         break;
       case at.OPEN_LINK: {
-        const win = action._target.browser.ownerGlobal;
-        const where = win.whereToOpenLink(action.data.event);
-        if (action.data.referrer) {
-          win.openLinkIn(action.data.url, where, {referrerURI: Services.io.newURI(action.data.referrer)});
-        } else {
-          win.openLinkIn(action.data.url, where, {});
-        }
+        this.openLink(action);
         break;
       }
     }
   }
 }
 
 this.PlacesFeed = PlacesFeed;
 

--- a/browser/extensions/activity-stream/lib/PrefsFeed.jsm
+++ b/browser/extensions/activity-stream/lib/PrefsFeed.jsm
@@ -66,19 +66,21 @@ this.PrefsFeed = class PrefsFeed {
     }
 
     // Set the initial state of all prefs in redux
     this.store.dispatch(ac.BroadcastToContent({type: at.PREFS_INITIAL_VALUES, data: values}));
 
     this._setPrerenderPref();
     this._initOnboardingPref();
   }
+
   removeListeners() {
     this._prefs.ignoreBranch(this);
   }
+
   onAction(action) {
     switch (action.type) {
       case at.INIT:
         this.init();
         break;
       case at.UNINIT:
         this.removeListeners();
         this.setOnboardingDisabledDefault(false);

--- a/browser/extensions/activity-stream/lib/Screenshots.jsm
+++ b/browser/extensions/activity-stream/lib/Screenshots.jsm
@@ -13,16 +13,20 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
   "resource://gre/modules/PageThumbs.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
     "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "MIMEService",
   "@mozilla.org/mime;1", "nsIMIMEService");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
   "resource://gre/modules/osfile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
+  "resource://gre/modules/PrivateBrowsingUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
 
 const GREY_10 = "#F9F9FA";
 
 this.Screenshots = {
   /**
    * Convert bytes to a string using extremely fast String.fromCharCode without
    * exceeding the max number of arguments that can be provided to a function.
    */
@@ -59,25 +63,45 @@ this.Screenshots = {
       screenshot = `data:${contentType};base64,${encodedData}`;
     } catch (err) {
       Cu.reportError(`getScreenshot error: ${err}`);
     }
     return screenshot;
   },
 
   /**
+   * Checks if all the open windows are private browsing windows. If so, we do not
+   * want to collect screenshots. If there exists at least 1 non-private window,
+   * we are ok to collect screenshots.
+   */
+  _shouldGetScreenshots() {
+    const windows = Services.wm.getEnumerator("navigator:browser");
+    while (windows.hasMoreElements()) {
+      if (!PrivateBrowsingUtils.isWindowPrivate(windows.getNext())) {
+        // As soon as we encounter 1 non-private window, screenshots are fair game.
+        return true;
+      }
+    }
+    return false;
+  },
+
+  /**
    * Conditionally get a screenshot for a link if there's no existing pending
    * screenshot. Updates the cached link's desired property with the result.
    *
    * @param link {object} Link object to update
    * @param url {string} Url to get a screenshot of
    * @param property {string} Name of property on object to set
    @ @param onScreenshot {function} Callback for when the screenshot loads
    */
   async maybeCacheScreenshot(link, url, property, onScreenshot) {
+    // If there are only private windows open, do not collect screenshots
+    if (!this._shouldGetScreenshots()) {
+      return;
+    }
     // Nothing to do if we already have a pending screenshot or
     // if a previous request failed and returned null.
     const cache = link.__sharedCache;
     if (cache.fetchingScreenshot || link[property] !== undefined) {
       return;
     }
 
     // Save the promise to the cache so other links get it immediately

--- a/browser/extensions/activity-stream/lib/TelemetryFeed.jsm
+++ b/browser/extensions/activity-stream/lib/TelemetryFeed.jsm
@@ -328,17 +328,17 @@ this.TelemetryFeed = class TelemetryFeed
         page: session.page,
         session_duration: session.session_duration,
         action: "activity_stream_session",
         perf: session.perf
       }
     );
   }
 
-  async sendEvent(event_object) {
+  sendEvent(event_object) {
     if (this.telemetryEnabled) {
       this.pingCentre.sendPing(event_object,
       {filter: ACTIVITY_STREAM_ID});
     }
   }
 
   handleImpressionStats(action) {
     this.sendEvent(this.createImpressionStats(action));

--- a/browser/extensions/activity-stream/lib/TippyTopProvider.jsm
+++ b/browser/extensions/activity-stream/lib/TippyTopProvider.jsm
@@ -21,31 +21,33 @@ function getDomain(url) {
 }
 this.getDomain = getDomain;
 
 this.TippyTopProvider = class TippyTopProvider {
   constructor() {
     this._sitesByDomain = new Map();
     this.initialized = false;
   }
+
   async init() {
     // Load the Tippy Top sites from the json manifest.
     try {
       for (const site of await (await fetch(TIPPYTOP_JSON_PATH)).json()) {
         // The tippy top manifest can have a url property (string) or a
         // urls property (array of strings)
         for (const url of site.url ? [site.url] : site.urls || []) {
           this._sitesByDomain.set(getDomain(url), site);
         }
       }
       this.initialized = true;
     } catch (error) {
       Cu.reportError("Failed to load tippy top manifest.");
     }
   }
+
   processSite(site) {
     const tippyTop = this._sitesByDomain.get(getDomain(site.url));
     if (tippyTop) {
       site.tippyTopIcon = TIPPYTOP_URL_PREFIX + tippyTop.image_url;
       site.backgroundColor = tippyTop.background_color;
     }
     return site;
   }

--- a/browser/extensions/activity-stream/lib/TopSitesFeed.jsm
+++ b/browser/extensions/activity-stream/lib/TopSitesFeed.jsm
@@ -45,16 +45,17 @@ this.TopSitesFeed = class TopSitesFeed {
 
   uninit() {
     PageThumbs.removeExpirationFilter(this);
   }
 
   _dedupeKey(site) {
     return site && site.hostname;
   }
+
   refreshDefaults(sites) {
     // Clear out the array of any previous defaults
     DEFAULT_TOP_SITES.length = 0;
 
     // Add default sites if any based on the pref
     if (sites) {
       for (const url of sites.split(",")) {
         const site = {
@@ -287,17 +288,17 @@ this.TopSitesFeed = class TopSitesFeed {
     // Inserting a top site pins it in the specified slot, pushing over any link already
     // pinned in the slot (unless it's the last slot, then it replaces).
     this._insertPin(
       action.data.site, action.data.index || 0,
       action.data.draggedFromIndex !== undefined ? action.data.draggedFromIndex : this.store.getState().Prefs.values.topSitesCount);
     this._broadcastPinnedSitesUpdated();
   }
 
-  async onAction(action) {
+  onAction(action) {
     switch (action.type) {
       case at.INIT:
         this.refresh({broadcast: true});
         break;
       case at.SYSTEM_TICK:
         this.refresh({broadcast: false});
         break;
       // All these actions mean we need new top sites

--- a/browser/extensions/activity-stream/lib/TopStoriesFeed.jsm
+++ b/browser/extensions/activity-stream/lib/TopStoriesFeed.jsm
@@ -37,17 +37,17 @@ this.TopStoriesFeed = class TopStoriesFe
     this.cache = new PersistentCache(SECTION_ID, true);
     this._prefs = new Prefs();
   }
 
   init() {
     const initFeed = () => {
       SectionsManager.enableSection(SECTION_ID);
       try {
-        const options = SectionsManager.sections.get(SECTION_ID).options;
+        const {options} = SectionsManager.sections.get(SECTION_ID);
         const apiKey = this.getApiKeyFromPref(options.api_key_pref);
         this.stories_endpoint = this.produceFinalEndpointUrl(options.stories_endpoint, apiKey);
         this.topics_endpoint = this.produceFinalEndpointUrl(options.topics_endpoint, apiKey);
         this.read_more_endpoint = options.read_more_endpoint;
         this.stories_referrer = options.stories_referrer;
         this.personalized = options.personalized;
         this.show_spocs = options.show_spocs;
         this.maxHistoryQueryResults = options.maxHistoryQueryResults;
@@ -97,17 +97,18 @@ this.TopStoriesFeed = class TopStoriesFe
 
       if (this.show_spocs && body.spocs) {
         this.spocCampaignMap = new Map(body.spocs.map(s => [s.id, `${s.campaign_id}`]));
         this.spocs = this.transform(body.spocs).filter(s => s.score >= s.min_score);
         this.cleanUpCampaignImpressionPref();
       }
 
       this.dispatchUpdateEvent(this.storiesLastUpdated, {rows: this.stories});
-      body._timestamp = this.storiesLastUpdated = Date.now();
+      this.storiesLastUpdated = Date.now();
+      body._timestamp = this.storiesLastUpdated;
       // This is filtered so an update function can return true to retry on the next run
       this.contentUpdateQueue = this.contentUpdateQueue.filter(update => update());
 
       this.cache.set("stories", body);
     } catch (error) {
       Cu.reportError(`Failed to fetch content: ${error.message}`);
     }
   }
@@ -167,17 +168,18 @@ this.TopStoriesFeed = class TopStoriesFe
       const response = await fetch(this.topics_endpoint);
       if (!response.ok) {
         throw new Error(`Topics endpoint returned unexpected status: ${response.status}`);
       }
       const body = await response.json();
       const {topics} = body;
       if (topics) {
         this.dispatchUpdateEvent(this.topicsLastUpdated, {topics, read_more_endpoint: this.read_more_endpoint});
-        body._timestamp = this.topicsLastUpdated = Date.now();
+        this.topicsLastUpdated = Date.now();
+        body._timestamp = this.topicsLastUpdated;
         this.cache.set("topics", body);
       }
     } catch (error) {
       Cu.reportError(`Failed to fetch topics: ${error.message}`);
     }
   }
 
   dispatchUpdateEvent(lastUpdated, data) {
@@ -219,17 +221,18 @@ this.TopStoriesFeed = class TopStoriesFe
       this.version);
 
     this.store.dispatch(ac.PerfEvent({
       event: "topstories.domain.affinity.calculation.ms",
       value: Math.round(perfService.absNow() - start)
     }));
 
     const affinities = this.affinityProvider.getAffinities();
-    affinities._timestamp = this.domainAffinitiesLastUpdated = Date.now();
+    this.domainAffinitiesLastUpdated = Date.now();
+    affinities._timestamp = this.domainAffinitiesLastUpdated;
     this.cache.set("domainAffinities", affinities);
   }
 
   resetDomainAffinityScores() {
     delete this.affinityProvider;
     this.cache.set("domainAffinities", {});
   }
 

--- a/browser/extensions/activity-stream/lib/UserDomainAffinityProvider.jsm
+++ b/browser/extensions/activity-stream/lib/UserDomainAffinityProvider.jsm
@@ -252,17 +252,17 @@ this.UserDomainAffinityProvider = class 
 
     query.endTimeReference = query.TIME_RELATIVE_NOW;
     query.endTime = (ts.endTime && ts.endTime !== 0) ? -(ts.endTime * 1000 * 1000) : 0;
 
     const options = history.getNewQueryOptions();
     options.sortingMode = options.SORT_BY_VISITCOUNT_DESCENDING;
     options.maxResults = this.maxHistoryQueryResults;
 
-    const root = history.executeQuery(query, options).root;
+    const {root} = history.executeQuery(query, options);
     root.containerOpen = true;
     for (let i = 0; i < root.childCount; i++) {
       let node = root.getChild(i);
       let host = Services.io.newURI(node.uri).host.replace(wwwRegEx, "");
       if (!visitCounts[host]) {
         visitCounts[host] = 0;
       }
       visitCounts[host] += node.accessCount;

--- a/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>Dirica matidi manyen</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="1403040358"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="1036495419"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" title="Add Top Site" data-reactid="129"><span data-reactid="130">Medi</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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/ach/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "Kakube maloyo",
   "header_stories": "Lok madito",
   "header_highlights": "Wiye madito",
   "header_visit_again": "Lim doki",
   "header_bookmarks": "Alamabuk ma cok coki",
   "header_recommended_by": "Lami tam obedo {provider}",
   "header_bookmarks_placeholder": "Pud i pee ki alamabuk.",
   "header_stories_from": "ki bot",
+  "context_menu_button_sr": "Open context menu for {title}",
   "type_label_visited": "Kilimo",
   "type_label_bookmarked": "Kiketo alamabuk",
   "type_label_synced": "Kiribo ki i nyonyo mukene",
   "type_label_recommended": "Ma cuke lamal",
   "type_label_open": "Tye ayaba",
   "type_label_topic": "Lok",
   "type_label_now": "Kombedi",
   "menu_action_bookmark": "Alamabuk",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "Nyut mukene",
   "edit_topsites_showless_button": "Nyut manok",
   "edit_topsites_done_button": "Otum",
   "edit_topsites_pin_button": "Mwon kakube man",
   "edit_topsites_unpin_button": "War kakube man",
   "edit_topsites_edit_button": "Yub kakube man",
   "edit_topsites_dismiss_button": "Kwer kakube man",
   "edit_topsites_add_button": "Medi",
+  "edit_topsites_add_button_tooltip": "Add Top Site",
   "topsites_form_add_header": "Kakube maloyo manyen",
   "topsites_form_edit_header": "Yub Kakube maloyo",
   "topsites_form_title_placeholder": "Ket wiye",
   "topsites_form_url_placeholder": "Coo onyo mwon URL",
   "topsites_form_add_button": "Medi",
   "topsites_form_save_button": "Gwoki",
   "topsites_form_cancel_button": "Kwer",
   "topsites_form_url_validation": "URL ma tye atir mite",

--- a/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>لسان جديد</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="-987189301"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1557652136"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" title="Add Top Site" 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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/ar/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "المواقع الأكثر زيارة",
   "header_stories": "أهم الأخبار",
   "header_highlights": "أهم الأحداث",
   "header_visit_again": "زرها مجددا",
   "header_bookmarks": "أحدث العلامات",
   "header_recommended_by": "ينصح به {provider}",
   "header_bookmarks_placeholder": "لا علامات لديك بعد.",
   "header_stories_from": "من",
+  "context_menu_button_sr": "Open context menu for {title}",
   "type_label_visited": "مُزارة",
   "type_label_bookmarked": "معلّمة",
   "type_label_synced": "مُزامنة من جهاز آخر",
   "type_label_recommended": "مُتداول",
   "type_label_open": "مفتوحة",
   "type_label_topic": "الموضوع",
   "type_label_now": "الآن",
   "menu_action_bookmark": "علّم",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "اعرض المزيد",
   "edit_topsites_showless_button": "اعرض أقل",
   "edit_topsites_done_button": "تمّ",
   "edit_topsites_pin_button": "ثبّت هذا الموقع",
   "edit_topsites_unpin_button": "افصل هذا الموقع",
   "edit_topsites_edit_button": "حرّر هذا الموقع",
   "edit_topsites_dismiss_button": "احذف هذا الموقع",
   "edit_topsites_add_button": "أضِفْ",
+  "edit_topsites_add_button_tooltip": "Add Top Site",
   "topsites_form_add_header": "موقع شائع جديد",
   "topsites_form_edit_header": "حرّر الموقع الشائع",
   "topsites_form_title_placeholder": "أدخل عنوانًا",
   "topsites_form_url_placeholder": "اكتب أو ألصق مسارًا",
   "topsites_form_add_button": "أضِفْ",
   "topsites_form_save_button": "احفظ",
   "topsites_form_cancel_button": "ألغِ",
   "topsites_form_url_validation": "مطلوب مسار صالح",

--- a/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>Llingüeta nueva</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="423154596"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-279918722"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" title="Add Top Site" data-reactid="129"><span data-reactid="130">Amestar</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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/ast/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "Más visitaos",
   "header_stories": "Histories destacaes",
   "header_highlights": "Destacaos",
   "header_visit_again": "Visitar de nueves",
   "header_bookmarks": "Marcadores recientes",
   "header_recommended_by": "Recomendáu por {provider}",
   "header_bookmarks_placeholder": "Entá nun tienes dengún marcador.",
   "header_stories_from": "de",
+  "context_menu_button_sr": "Open context menu for {title}",
   "type_label_visited": "Visitóse",
   "type_label_bookmarked": "Amestóse a marcadores",
   "type_label_synced": "Sincronizóse dende otru preséu",
   "type_label_recommended": "Tendencia",
   "type_label_open": "Abrir",
   "type_label_topic": "Tema",
   "type_label_now": "Agora",
   "menu_action_bookmark": "Amestar a marcadores",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "Amosar más",
   "edit_topsites_showless_button": "Amosar menos",
   "edit_topsites_done_button": "Fecho",
   "edit_topsites_pin_button": "Fixar esti sitiu",
   "edit_topsites_unpin_button": "Desfixar esti sitiu",
   "edit_topsites_edit_button": "Editar esti sitiu",
   "edit_topsites_dismiss_button": "Escartar esti sitiu",
   "edit_topsites_add_button": "Amestar",
+  "edit_topsites_add_button_tooltip": "Add Top Site",
   "topsites_form_add_header": "Nuevu Sitiu más visitáu",
   "topsites_form_edit_header": "Editar Sitiu más visitáu",
   "topsites_form_title_placeholder": "Introducir títulu",
   "topsites_form_url_placeholder": "Escribi o apega una URL",
   "topsites_form_add_button": "Amestar",
   "topsites_form_save_button": "Guardar",
   "topsites_form_cancel_button": "Encaboxar",
   "topsites_form_url_validation": "Ríquese una URL válida",

--- a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>Yeni Vərəq</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="-71359289"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-937160722"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" title="Add Top Site" data-reactid="129"><span data-reactid="130">Əlavə 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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/az/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "Qabaqcıl Saytlar",
   "header_stories": "Qabaqcıl Hekayələr",
   "header_highlights": "Seçilmişlər",
   "header_visit_again": "Təkrar ziyarət et",
   "header_bookmarks": "Son Əlfəcinlər",
   "header_recommended_by": "{provider} məsləhət görür",
   "header_bookmarks_placeholder": "Hələlik heç əlfəcininiz yoxdur.",
   "header_stories_from": "qaynaq:",
+  "context_menu_button_sr": "Open context menu for {title}",
   "type_label_visited": "Ziyarət edilib",
   "type_label_bookmarked": "Əlfəcinlənib",
   "type_label_synced": "Digər cihazdan sync edilib",
   "type_label_recommended": "Populyar",
   "type_label_open": "Açıq",
   "type_label_topic": "Mövzu",
   "type_label_now": "İndi",
   "menu_action_bookmark": "Əlfəcinlə",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "Daha çox göstər",
   "edit_topsites_showless_button": "Daha az göstər",
   "edit_topsites_done_button": "Oldu",
   "edit_topsites_pin_button": "Bu saytı sabitlə",
   "edit_topsites_unpin_button": "Bu saytı çıxart",
   "edit_topsites_edit_button": "Bu saytı düzəlt",
   "edit_topsites_dismiss_button": "Bu saytı çıxart",
   "edit_topsites_add_button": "Əlavə et",
+  "edit_topsites_add_button_tooltip": "Add Top Site",
   "topsites_form_add_header": "Yeni Qabaqcıl Saytlar",
   "topsites_form_edit_header": "Qabaqcıl Saytları Dəyişdir",
   "topsites_form_title_placeholder": "Başlıq daxil et",
   "topsites_form_url_placeholder": "Ünvanı yazın və ya yapışdırın",
   "topsites_form_add_button": "Əlavə et",
   "topsites_form_save_button": "Saxla",
   "topsites_form_cancel_button": "Ləğv et",
   "topsites_form_url_validation": "Doğru ünvan tələb olunur",

--- a/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>Новая картка</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="1745643494"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="799681335"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" 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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/be/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "Папулярныя сайты",
   "header_stories": "Галоўныя навіны",
   "header_highlights": "Выбранае",
   "header_visit_again": "Наведаць зноў",
   "header_bookmarks": "Нядаўнія закладкі",
   "header_recommended_by": "Рэкамендавана {provider}",
   "header_bookmarks_placeholder": "У вас яшчэ няма закладак.",
   "header_stories_from": "ад",
+  "context_menu_button_sr": "Адкрыць кантэкстнае меню для {title}",
   "type_label_visited": "Наведанае",
   "type_label_bookmarked": "У закладках",
   "type_label_synced": "Сінхранізаванае з іншай прылады",
   "type_label_recommended": "Тэндэнцыі",
   "type_label_open": "Адкрыта",
   "type_label_topic": "Тэма",
   "type_label_now": "Зараз",
   "menu_action_bookmark": "У закладкі",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "Паказаць больш",
   "edit_topsites_showless_button": "Паказаць менш",
   "edit_topsites_done_button": "Гатова",
   "edit_topsites_pin_button": "Замацаваць гэты сайт",
   "edit_topsites_unpin_button": "Адшпіліць гэты сайт",
   "edit_topsites_edit_button": "Рэдагаваць гэты сайт",
   "edit_topsites_dismiss_button": "Адхіліць гэты сайт",
   "edit_topsites_add_button": "Дадаць",
+  "edit_topsites_add_button_tooltip": "Дадаць папулярны сайт",
   "topsites_form_add_header": "Новы папулярны сайт",
   "topsites_form_edit_header": "Рэдагаваць папулярны сайт",
   "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": "Патрабуецца сапраўдны URL",

--- a/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html
+++ b/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-prerendered.html
@@ -4,17 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
     <title>Нов раздел</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <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="-686742593"><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="collapsible-arrow 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="collapsible-arrow 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="collapsible-arrow 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="root"><div class="outer-wrapper fixed-to-top" data-reactroot="" data-reactid="1" data-react-checksum="-1512985621"><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="collapsible-arrow 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="add-topsites-button" data-reactid="128"><button class="add" title="Add Top Site" 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="collapsible-arrow 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="collapsible-arrow 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>
     <script>
 // Don't directly load the following scripts as part of html to let the page
 // finish loading to render the content sooner.
 for (const src of [
   "resource://activity-stream/prerendered/static/activity-stream-initial-state.js",

--- a/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-strings.js
+++ b/browser/extensions/activity-stream/prerendered/locales/bg/activity-stream-strings.js
@@ -5,16 +5,17 @@ window.gActivityStreamStrings = {
   "header_top_sites": "Най-посещавани",
   "header_stories": "Популярни",
   "header_highlights": "Акценти",
   "header_visit_again": "Посещаване",
   "header_bookmarks": "Последни отметки",
   "header_recommended_by": "Препоръчано от {provider}",
   "header_bookmarks_placeholder": "Все още нямате отметки.",
   "header_stories_from": "от",
+  "context_menu_button_sr": "Open context menu for {title}",
   "type_label_visited": "Посетена",
   "type_label_bookmarked": "Отметната",
   "type_label_synced": "Синхронизирана от друго устройство",
   "type_label_recommended": "Тенденции",
   "type_label_open": "Отваряне",
   "type_label_topic": "Тема",
   "type_label_now": "Сега",
   "menu_action_bookmark": "Отметка",
@@ -73,16 +74,17 @@ window.gActivityStreamStrings = {
   "edit_topsites_showmore_button": "Повече",
   "edit_topsites_showless_button": "По-малко",
   "edit_topsites_done_button": "Готово",
   "edit_topsites_pin_button": "Закачане",
   "edit_topsites_unpin_button": "Премахване от закачените",
   "edit_topsites_edit_button": "Редактиране",
   "edit_topsites_dismiss_button": "Изтриване",
   "edit_topsites_add_button": "Добавяне",
+  "edit_topsites_add_button_tooltip": "Add Top Site",
   "topsites_form_add_header": "Нов най-посещаван сайт",
   "topsites_form_edit_header": "Редактиране на най-посещаван сайт",
   "topsites_form_title_placeholder": "Заглавие",
   "topsites_form_url_placeholder": "Адрес",
   "topsites_form_add_button": "Добавяне",
   "topsites_form_save_button": "Запазване",
   "topsites_form_cancel_button": "Отказ",
   "topsites_form_url_validation": "Необходим е валиден URL",