--- a/browser/base/content/test/favicons/browser_preferred_icons.js
+++ b/browser/base/content/test/favicons/browser_preferred_icons.js
@@ -1,14 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const ROOT = "http://mochi.test:8888/browser/browser/base/content/test/favicons/";
 
 function waitIcon(url) {
+  // Make sure we don't miss out on an icon if it was previously used in a test
+  PlacesUtils.favicons.removeFailedFavicon(makeURI(url));
+
   // Because there is debounce logic in ContentLinkHandler.jsm to reduce the
   // favicon loads, we have to wait some time before checking that icon was
   // stored properly.
   return BrowserTestUtils.waitForCondition(
     () => {
       let tabIcon = gBrowser.getIcon();
       info("Found icon " + tabIcon);
       return tabIcon == url;
@@ -19,17 +22,18 @@ function waitIcon(url) {
 function createLinks(linkInfos) {
   return ContentTask.spawn(gBrowser.selectedBrowser, linkInfos, links => {
     let doc = content.document;
     let head = doc.getElementById("linkparent");
     for (let l of links) {
       let link = doc.createElement("link");
       link.rel = "icon";
       link.href = l.href;
-      link.type = l.type;
+      if (l.type)
+        link.type = l.type;
       if (l.size)
         link.setAttribute("sizes", `${l.size}x${l.size}`);
       head.appendChild(link);
     }
   });
 }
 
 add_task(async function setup() {
@@ -73,25 +77,90 @@ add_task(async function prefer_sized() {
       type: "image/x-icon"
     },
   ]);
   await promise;
   // Must have at least one test.
   Assert.ok(true, "The expected icon has been set");
 });
 
-add_task(async function prefer_ico() {
+add_task(async function prefer_last_ico() {
   let promise = waitIcon(ROOT + "icon2.ico");
   await createLinks([
     { href: ROOT + "icon.ico",
       type: "image/x-icon"
     },
     { href: ROOT + "icon.png",
       type: "image/png",
     },
     { href: ROOT + "icon2.ico",
-    type: "image/x-icon"
-  },
+      type: "image/x-icon"
+    },
+  ]);
+  await promise;
+  // Must have at least one test.
+  Assert.ok(true, "The expected icon has been set");
+});
+
+add_task(async function fuzzy_ico() {
+  let promise = waitIcon(ROOT + "microsoft.ico");
+  await createLinks([
+    { href: ROOT + "icon.ico",
+      type: "image/x-icon"
+    },
+    { href: ROOT + "icon.png",
+      type: "image/png",
+    },
+    { href: ROOT + "microsoft.ico",
+      type: "image/vnd.microsoft.icon"
+    },
   ]);
   await promise;
   // Must have at least one test.
   Assert.ok(true, "The expected icon has been set");
 });
+
+add_task(async function guess_svg() {
+  let promise = waitIcon(ROOT + "icon.svg");
+  await createLinks([
+    { href: ROOT + "icon.svg" },
+    { href: ROOT + "icon.png",
+      type: "image/png",
+      size: 16 * Math.ceil(window.devicePixelRatio)
+    },
+    { href: ROOT + "icon.ico",
+      type: "image/x-icon"
+    },
+  ]);
+  await promise;
+  // Must have at least one test.
+  Assert.ok(true, "The expected icon has been set");
+});
+
+add_task(async function guess_ico() {
+  let promise = waitIcon(ROOT + "icon.ico");
+  await createLinks([
+    { href: ROOT + "icon.ico" },
+    { href: ROOT + "icon.png",
+      type: "image/png",
+    },
+  ]);
+  await promise;
+  // Must have at least one test.
+  Assert.ok(true, "The expected icon has been set");
+});
+
+add_task(async function guess_invalid() {
+  let promise = waitIcon(ROOT + "icon.svg");
+  // Create strange links to make sure they don't break us
+  await createLinks([
+    { href: ROOT + "icon.svg" },
+    { href: ROOT + "icon" },
+    { href: ROOT + "icon?.svg" },
+    { href: ROOT + "icon#.svg" },
+    { href: "data:text/plain,icon" },
+    { href: "file:///icon" },
+    { href: "about:icon" },
+  ]);
+  await promise;
+  // Must have at least one test.
+  Assert.ok(true, "The expected icon has been set");
+});

--- a/browser/components/extensions/ext-tabs.js
+++ b/browser/components/extensions/ext-tabs.js
@@ -612,16 +612,22 @@ this.tabs = class extends ExtensionAPI {
           let lastInsertion = new Map();
 
           let tabs = tabIds.map(tabId => tabTracker.getTab(tabId));
           for (let nativeTab of tabs) {
             // If the window is not specified, use the window from the tab.
             let window = destinationWindow || nativeTab.ownerGlobal;
             let gBrowser = window.gBrowser;
 
+            // If we are not moving the tab to a different window, and the window
+            // only has one tab, do nothing.
+            if (nativeTab.ownerGlobal == window && gBrowser.tabs.length === 1) {
+              continue;
+            }
+
             let insertionPoint = indexMap.get(window) || moveProperties.index;
             // If the index is -1 it should go to the end of the tabs.
             if (insertionPoint == -1) {
               insertionPoint = gBrowser.tabs.length;
             }
 
             // We can only move pinned tabs to a point within, or just after,
             // the current set of pinned tabs. Unpinned tabs, likewise, can only

--- a/browser/components/newtab/aboutNewTabService.js
+++ b/browser/components/newtab/aboutNewTabService.js
@@ -16,17 +16,17 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource:///modules/AboutNewTab.jsm");
 
 const LOCAL_NEWTAB_URL = "chrome://browser/content/newtab/newTab.xhtml";
 const TOPIC_APP_QUIT = "quit-application-granted";
 const TOPIC_LOCALES_CHANGE = "intl:requested-locales-changed";
 
 // Automated tests ensure packaged locales are in this list. Copied output of:
 // https://github.com/mozilla/activity-stream/blob/master/bin/render-activity-stream-html.js
-const ACTIVITY_STREAM_LOCALES = new Set("en-US ach ar ast az be bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM ia id it ja ka kab kk km kn ko lij lo lt ltg lv mk ml mr ms my nb-NO ne-NP nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru sk sl sq sr sv-SE ta te th tl tr uk ur uz vi zh-CN zh-TW".split(" "));
+const ACTIVITY_STREAM_LOCALES = new Set("en-US ach ar ast az be bg bn-BD bn-IN br bs ca cak cs cy da de dsb el en-GB eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM ia id it ja ka kab kk km kn ko lij lo lt ltg lv mk ml mr ms my nb-NO ne-NP nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta te th tl tr uk ur uz vi zh-CN zh-TW".split(" "));
 
 const ABOUT_URL = "about:newtab";
 
 const IS_MAIN_PROCESS = Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT;
 
 const IS_RELEASE_OR_BETA = AppConstants.RELEASE_OR_BETA;
 
 // Pref that tells if activity stream is enabled

--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -5,29 +5,16 @@
 
 XPCOMUtils.defineLazyModuleGetter(this, "ForgetAboutSite",
                                   "resource://gre/modules/ForgetAboutSite.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-// XXXmano: we should move most/all of these constants to PlacesUtils
-const ORGANIZER_ROOT_BOOKMARKS = "place:folder=BOOKMARKS_MENU&excludeItems=1&queryType=1";
-
-// No change to the view, preserve current selection
-const RELOAD_ACTION_NOTHING = 0;
-// Inserting items new to the view, select the inserted rows
-const RELOAD_ACTION_INSERT = 1;
-// Removing items from the view, select the first item after the last selected
-const RELOAD_ACTION_REMOVE = 2;
-// Moving items within a view, don't treat the dropped items as additional
-// rows.
-const RELOAD_ACTION_MOVE = 3;
-
 /**
  * Represents an insertion point within a container where we can insert
  * items.
  * @param {object} an object containing the following properties:
  *   - parentId
  *     The identifier of the parent container
  *   - parentGuid
  *     The unique identifier of the parent container

--- a/browser/extensions/activity-stream/bootstrap.js
+++ b/browser/extensions/activity-stream/bootstrap.js
@@ -176,17 +176,17 @@ this.install = function install(data, re
 
 this.startup = function startup(data, reason) {
   // Cache startup data which contains stuff like the version number, etc.
   // so we can use it when we init
   startupData = data;
   startupReason = reason;
 
   // Only start Activity Stream up when the browser UI is ready
-  if (Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).startingUp) {
+  if (Services.startup.startingUp) {
     Services.obs.addObserver(observe, BROWSER_READY_NOTIFICATION);
   } else {
     // Handle manual install or automatic install after manual uninstall
     onBrowserReady();
   }
 };
 
 this.shutdown = function shutdown(data, reason) {

--- a/browser/extensions/activity-stream/common/Actions.jsm
+++ b/browser/extensions/activity-stream/common/Actions.jsm
@@ -64,18 +64,20 @@ for (const type of [
   "SECTION_OPTIONS_CHANGED",
   "SECTION_REGISTER",
   "SECTION_UPDATE",
   "SECTION_UPDATE_CARD",
   "SETTINGS_CLOSE",
   "SETTINGS_OPEN",
   "SET_PREF",
   "SHOW_FIREFOX_ACCOUNTS",
+  "SNIPPETS_BLOCKLIST_UPDATED",
   "SNIPPETS_DATA",
   "SNIPPETS_RESET",
+  "SNIPPET_BLOCKED",
   "SYSTEM_TICK",
   "TELEMETRY_IMPRESSION_STATS",
   "TELEMETRY_PERFORMANCE_EVENT",
   "TELEMETRY_UNDESIRED_EVENT",
   "TELEMETRY_USER_EVENT",
   "TOP_SITES_ADD",
   "TOP_SITES_CANCEL_EDIT",
   "TOP_SITES_EDIT",

--- a/browser/extensions/activity-stream/css/activity-stream-linux.css
+++ b/browser/extensions/activity-stream/css/activity-stream-linux.css
@@ -18,40 +18,40 @@ button,
 input {
   font-family: inherit;
   font-size: inherit; }
 
 [hidden] {
   display: none !important; }
 
 .icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-size: 16px;
   background-position: center center;
   background-repeat: no-repeat;
-  vertical-align: middle;
+  background-size: 16px;
+  -moz-context-properties: fill;
+  display: inline-block;
   fill: rgba(12, 12, 13, 0.8);
-  -moz-context-properties: fill; }
+  height: 16px;
+  vertical-align: middle;
+  width: 16px; }
   .icon.icon-spacer {
     margin-inline-end: 8px; }
   .icon.icon-small-spacer {
     margin-inline-end: 6px; }
   .icon.icon-bookmark-added {
     background-image: url("chrome://browser/skin/bookmark.svg"); }
   .icon.icon-bookmark-hollow {
     background-image: url("chrome://browser/skin/bookmark-hollow.svg"); }
   .icon.icon-delete {
     background-image: url("../data/content/assets/glyph-delete-16.svg"); }
   .icon.icon-modal-delete {
     background-image: url("../data/content/assets/glyph-modal-delete-32.svg");
-    width: 32px;
+    background-size: 32px;
     height: 32px;
-    background-size: 32px; }
+    width: 32px; }
   .icon.icon-dismiss {
     background-image: url("../data/content/assets/glyph-dismiss-16.svg"); }
   .icon.icon-info {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-import {
     background-image: url("../data/content/assets/glyph-import-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
@@ -66,18 +66,17 @@ input {
   .icon.icon-edit {
     background-image: url("../data/content/assets/glyph-edit-16.svg"); }
   .icon.icon-pocket {
     background-image: url("../data/content/assets/glyph-pocket-16.svg"); }
   .icon.icon-historyItem {
     background-image: url("../data/content/assets/glyph-historyItem-16.svg"); }
   .icon.icon-trending {
     background-image: url("../data/content/assets/glyph-trending-16.svg");
-    transform: translateY(2px);
-    /* trending bolt is visually top heavy */ }
+    transform: translateY(2px); }
   .icon.icon-now {
     background-image: url("chrome://browser/skin/history.svg"); }
   .icon.icon-topsites {
     background-image: url("../data/content/assets/glyph-topsites-16.svg"); }
   .icon.icon-pin-small {
     background-image: url("../data/content/assets/glyph-pin-12.svg");
     background-size: 12px;
     height: 12px;
@@ -120,65 +119,65 @@ h2 {
 
 a {
   color: #0060DF;
   text-decoration: none; }
   a:hover {
     color: #008EA4; }
 
 .sr-only {
-  position: absolute;
-  width: 1px;
+  border: 0;
+  clip: rect(0, 0, 0, 0);
   height: 1px;
-  padding: 0;
   margin: -1px;
   overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
+  padding: 0;
+  position: absolute;
+  width: 1px; }
 
 .inner-border {
   border: 1px solid #D7D7DB;
   border-radius: 3px;
+  height: 100%;
+  left: 0;
+  pointer-events: none;
   position: absolute;
   top: 0;
-  left: 0;
   width: 100%;
-  height: 100%;
-  pointer-events: none;
   z-index: 100; }
 
 @keyframes fadeIn {
   from {
     opacity: 0; }
   to {
     opacity: 1; } }
 
 .show-on-init {
   opacity: 0;
   transition: opacity 0.2s ease-in; }
   .show-on-init.on {
-    opacity: 1;
-    animation: fadeIn 0.2s; }
+    animation: fadeIn 0.2s;
+    opacity: 1; }
 
 .actions {
   border-top: 1px solid #D7D7DB;
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   margin: 0;
-  padding: 15px 25px 0 25px;
-  justify-content: flex-start;
-  flex-wrap: wrap; }
+  padding: 15px 25px 0; }
   .actions button {
     background-color: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
     color: inherit;
     cursor: pointer;
+    margin-bottom: 15px;
     padding: 10px 30px;
-    margin-bottom: 15px;
     white-space: nowrap; }
     .actions button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     .actions button.dismiss {
       border: 0;
       padding: 0;
       text-decoration: underline; }
@@ -188,26 +187,26 @@ a {
       color: #FFF;
       margin-inline-start: auto; }
 
 #snippets-container {
   z-index: 1; }
 
 .outer-wrapper {
   display: flex;
-  padding: 40px 32px 32px;
+  flex-grow: 1;
   height: 100%;
-  flex-grow: 1; }
+  padding: 40px 32px 32px; }
   .outer-wrapper.fixed-to-top {
     height: auto; }
 
 main {
   margin: auto;
-  width: 224px;
-  padding-bottom: 48px; }
+  padding-bottom: 48px;
+  width: 224px; }
   @media (min-width: 416px) {
     main {
       width: 352px; } }
   @media (min-width: 544px) {
     main {
       width: 480px; } }
   @media (min-width: 800px) {
     main {
@@ -240,157 +239,161 @@ main {
 .body-wrapper.on .sections-list .section:last-of-type,
 .body-wrapper.on .topic {
   opacity: 1; }
 
 .top-sites-list {
   list-style: none;
   margin: 0;
   margin-bottom: -18px;
-  padding: 0;
-  margin-inline-end: -32px; }
+  margin-inline-end: -32px;
+  padding: 0; }
   @media (max-width: 416px) {
     .top-sites-list :nth-child(2n+1) .context-menu {
+      margin-inline-end: auto;
       margin-inline-start: auto;
-      margin-inline-end: auto;
-      offset-inline-start: -32px;
-      offset-inline-end: auto; }
+      offset-inline-end: auto;
+      offset-inline-start: -32px; }
     .top-sites-list :nth-child(2n) .context-menu {
-      margin-inline-start: auto;
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 416px) and (max-width: 544px) {
-    .top-sites-list :nth-child(3n+2) .context-menu, .top-sites-list :nth-child(3n) .context-menu {
-      margin-inline-start: auto;
+    .top-sites-list :nth-child(3n+2) .context-menu,
+    .top-sites-list :nth-child(3n) .context-menu {
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .top-sites-list :nth-child(4n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 768px) {
     .top-sites-list :nth-child(4n+3) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .top-sites-list :nth-child(6n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1024px) {
     .top-sites-list :nth-child(6n+5) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   .top-sites-list li {
     display: inline-block;
     margin: 0 0 8px;
     margin-inline-end: 32px; }
   .top-sites-list .top-site-outer {
     position: relative; }
     .top-sites-list .top-site-outer > a {
+      color: inherit;
       display: block;
-      color: inherit;
       outline: none; }
-      .top-sites-list .top-site-outer > a.active .tile, .top-sites-list .top-site-outer > a:focus .tile {
+      .top-sites-list .top-site-outer > a:-moz-any(.active, :focus) .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 .top-site-outer .context-menu-button {
-      cursor: pointer;
-      position: absolute;
-      top: -13.5px;
-      offset-inline-end: -13.5px;
-      width: 27px;
-      height: 27px;
+      background-clip: padding-box;
       background-color: #FFF;
       background-image: url("chrome://browser/skin/page-action.svg");
       background-position: 55%;
-      background-clip: padding-box;
       border: 1px solid #B1B1B3;
       border-radius: 100%;
       box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+      cursor: pointer;
       fill: rgba(12, 12, 13, 0.8);
+      height: 27px;
+      offset-inline-end: -13.5px;
+      opacity: 0;
+      position: absolute;
+      top: -13.5px;
       transform: scale(0.25);
-      opacity: 0;
+      transition-duration: 200ms;
       transition-property: transform, opacity;
-      transition-duration: 200ms; }
-      .top-sites-list .top-site-outer .context-menu-button:focus, .top-sites-list .top-site-outer .context-menu-button:active {
-        transform: scale(1);
-        opacity: 1; }
-    .top-sites-list .top-site-outer:hover .tile, .top-sites-list .top-site-outer:focus .tile, .top-sites-list .top-site-outer.active .tile {
+      width: 27px; }
+      .top-sites-list .top-site-outer .context-menu-button:-moz-any(:active, :focus) {
+        opacity: 1;
+        transform: scale(1); }
+    .top-sites-list .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 .top-site-outer:hover .context-menu-button, .top-sites-list .top-site-outer:focus .context-menu-button, .top-sites-list .top-site-outer.active .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
+      opacity: 1;
+      transform: scale(1); }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
+      opacity: 1;
+      transform: scale(1); }
     .top-sites-list .top-site-outer .tile {
-      position: relative;
-      height: 96px;
-      width: 96px;
       border-radius: 6px;
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+      height: 96px;
+      position: relative;
+      width: 96px;
+      align-items: center;
       color: #737373;
-      font-weight: 200;
+      display: flex;
       font-size: 32px;
-      text-transform: uppercase;
-      display: flex;
-      align-items: center;
-      justify-content: center; }
+      font-weight: 200;
+      justify-content: center;
+      text-transform: uppercase; }
       .top-sites-list .top-site-outer .tile::before {
         content: attr(data-fallback); }
     .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 .screenshot {
+      background-color: #FFF;
+      background-position: top left;
+      background-size: cover;
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      height: 100%;
+      left: 0;
+      opacity: 0;
       position: absolute;
       top: 0;
-      left: 0;
-      height: 100%;
-      width: 100%;
-      background-color: #FFF;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-      background-size: cover;
-      background-position: top left;
       transition: opacity 1s;
-      opacity: 0; }
+      width: 100%; }
       .top-sites-list .top-site-outer .screenshot.active {
         opacity: 1; }
     .top-sites-list .top-site-outer .top-site-icon {
-      position: absolute;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      background-color: #F9F9FA;
       background-position: center center;
       background-repeat: no-repeat;
-      background-color: #F9F9FA; }
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      position: absolute; }
     .top-sites-list .top-site-outer .rich-icon {
-      top: 0;
+      background-size: 96px;
+      height: 100%;
       offset-inline-start: 0;
-      height: 100%;
-      width: 100%;
-      background-size: 96px; }
+      top: 0;
+      width: 100%; }
     .top-sites-list .top-site-outer .default-icon {
+      background-size: 32px;
       bottom: -6px;
       height: 42px;
       offset-inline-end: -6px;
       width: 42px;
-      background-size: 32px;
+      align-items: center;
       display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 20px; }
+      font-size: 20px;
+      justify-content: center; }
       .top-sites-list .top-site-outer .default-icon[data-fallback]::before {
         content: attr(data-fallback); }
     .top-sites-list .top-site-outer .title {
       font: message-box;
       height: 30px;
       line-height: 30px;
       text-align: center;
       width: 96px;
@@ -418,17 +421,17 @@ main {
       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:focus, .top-sites-list .top-site-outer .edit-menu:active {
+      .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%;
@@ -438,34 +441,31 @@ main {
         .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:hover .edit-menu, .top-sites-list .top-site-outer:focus .edit-menu, .top-sites-list .top-site-outer.active .edit-menu {
-      transform: scale(1);
-      opacity: 1; }
 
 .edit-topsites-wrapper .edit-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) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:focus, .edit-topsites-wrapper .edit-topsites-button:active {
+  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
   .edit-topsites-wrapper .edit-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
@@ -494,17 +494,17 @@ main {
   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; }
 
-section.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .edit-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {
@@ -559,69 +559,69 @@ section.top-sites:not(.collapsed):hover 
   0% {
     opacity: 0;
     transform: translateY(15px); }
   100% {
     opacity: 1;
     transform: translateY(0); } }
 
 .sections-list .section-list {
-  margin: 0;
   display: grid;
+  grid-gap: 32px;
   grid-template-columns: repeat(auto-fit, 224px);
-  grid-gap: 32px; }
+  margin: 0; }
   @media (max-width: 544px) {
     .sections-list .section-list .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .sections-list .section-list :nth-child(2n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .sections-list .section-list :nth-child(3n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
 
 .sections-list .section-empty-state {
-  width: 100%;
-  height: 266px;
+  border: 1px solid #D7D7DB;
+  border-radius: 3px;
   display: flex;
-  border: 1px solid #D7D7DB;
-  border-radius: 3px; }
+  height: 266px;
+  width: 100%; }
   .sections-list .section-empty-state .empty-state {
     margin: auto;
     max-width: 350px; }
     .sections-list .section-empty-state .empty-state .empty-state-icon {
-      background-size: 50px 50px;
+      background-position: center;
       background-repeat: no-repeat;
-      background-position: center;
+      background-size: 50px 50px;
+      -moz-context-properties: fill;
+      display: block;
       fill: rgba(12, 12, 13, 0.6);
-      -moz-context-properties: fill;
       height: 50px;
-      width: 50px;
       margin: 0 auto;
-      display: block; }
+      width: 50px; }
     .sections-list .section-empty-state .empty-state .empty-state-message {
-      margin-bottom: 0;
+      color: #737373;
       font-size: 13px;
-      color: #737373;
+      margin-bottom: 0;
       text-align: center; }
 
 .topic {
+  color: #737373;
   font-size: 12px;
-  color: #737373;
-  margin-top: 12px;
-  line-height: 1.6; }
+  line-height: 1.6;
+  margin-top: 12px; }
   @media (min-width: 800px) {
     .topic {
       line-height: 16px; } }
   .topic ul {
     margin: 0;
     padding: 0; }
     @media (min-width: 800px) {
       .topic ul {
@@ -651,110 +651,110 @@ section.top-sites:not(.collapsed):hover 
       fill: #008EA4;
       height: 16px;
       margin-inline-start: 5px;
       vertical-align: top;
       width: 12px; }
     .topic .topic-read-more:dir(rtl)::after {
       transform: scaleX(-1); }
   .topic::after {
-    content: "";
-    display: table;
-    clear: both; }
+    clear: both;
+    content: '';
+    display: table; }
 
 .search-wrapper {
   cursor: default;
   display: flex;
-  position: relative;
+  height: 35px;
   margin: 1px 1px 40px;
-  width: 100%;
-  height: 35px; }
+  position: relative;
+  width: 100%; }
   .search-wrapper input {
-    border: none;
+    border: 0;
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
     color: inherit;
+    font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
     padding-inline-start: 35px;
-    width: 100%;
-    font-size: 15px; }
+    width: 100%; }
   .search-wrapper:hover input {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
     box-shadow: 0 0 0 3px #0A84FF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
+    height: 100%;
+    offset-inline-start: 0;
     position: absolute;
-    offset-inline-start: 0;
-    height: 100%;
     width: 35px; }
   .search-wrapper .search-button {
     background: url("chrome://browser/skin/forward.svg") no-repeat center center;
-    border-radius: 0 3px 3px 0;
+    background-size: 16px 16px;
     border: 0;
-    width: 36px;
+    border-radius: 0 3px 3px 0;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
-    background-size: 16px 16px;
     height: 100%;
     offset-inline-end: 0;
-    position: absolute; }
+    position: absolute;
+    width: 36px; }
     .search-wrapper .search-button:focus, .search-wrapper .search-button:hover {
       background-color: rgba(12, 12, 13, 0.1);
       cursor: pointer; }
     .search-wrapper .search-button:active {
       background-color: rgba(12, 12, 13, 0.2); }
     .search-wrapper .search-button:dir(rtl) {
       transform: scaleX(-1); }
   .search-wrapper .contentSearchSuggestionTable {
     border: 0;
     transform: translateY(2px); }
 
 .context-menu {
+  background: #F9F9FA;
+  border-radius: 5px;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   display: block;
-  position: absolute;
   font-size: 14px;
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
-  top: 6.75px;
-  offset-inline-start: 100%;
   margin-inline-start: 5px;
-  z-index: 10000;
-  background: #F9F9FA;
-  border-radius: 5px; }
+  offset-inline-start: 100%;
+  position: absolute;
+  top: 6.75px;
+  z-index: 10000; }
   .context-menu > ul {
+    list-style: none;
     margin: 0;
-    padding: 5px 0;
-    list-style: none; }
+    padding: 5px 0; }
     .context-menu > ul > li {
       margin: 0;
       width: 100%; }
       .context-menu > ul > li.separator {
-        margin: 5px 0;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
+        border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+        margin: 5px 0; }
       .context-menu > ul > li > a {
-        outline: none;
-        cursor: pointer;
+        align-items: center;
         color: inherit;
-        white-space: nowrap;
-        padding: 3px 12px;
+        cursor: pointer;
+        display: flex;
         line-height: 16px;
-        display: flex;
-        align-items: center; }
-        .context-menu > ul > li > a:hover, .context-menu > ul > li > a:focus {
+        outline: none;
+        padding: 3px 12px;
+        white-space: nowrap; }
+        .context-menu > ul > li > a:-moz-any(:focus, :hover) {
           background: #0060DF;
           color: #FFF; }
-          .context-menu > ul > li > a:hover a, .context-menu > ul > li > a:focus a {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
             color: #0C0C0D; }
-          .context-menu > ul > li > a:hover .icon, .context-menu > ul > li > a:focus .icon {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
             fill: #FFF; }
-          .context-menu > ul > li > a:hover:hover, .context-menu > ul > li > a:hover:focus, .context-menu > ul > li > a:focus:hover, .context-menu > ul > li > a:focus:focus {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
             color: #FFF; }
 
 .prefs-pane {
   color: #4A4A4F;
   font-size: 14px;
   line-height: 21px; }
   .prefs-pane .sidebar {
     background: #FFF;
@@ -854,79 +854,79 @@ section.top-sites:not(.collapsed):hover 
     offset-inline-start: 0;
     position: absolute;
     top: 0;
     width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after,
   .prefs-pane [type='checkbox']:checked + label::after {
     background: url("chrome://global/skin/in-content/check.svg") no-repeat center center;
     content: '';
+    -moz-context-properties: fill, stroke;
+    fill: #0060DF;
     height: 21px;
     offset-inline-start: 0;
     position: absolute;
+    stroke: none;
     top: 0;
-    width: 21px;
-    -moz-context-properties: fill, stroke;
-    fill: #0060DF;
-    stroke: none; }
+    width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after {
     opacity: 0; }
   .prefs-pane [type='checkbox']:checked + label::after {
     opacity: 1; }
   .prefs-pane [type='checkbox']:not(:disabled) + label:hover::before {
     border: 1px solid #0060DF; }
   .prefs-pane [type='checkbox']:not(:disabled):checked:focus + label::before,
   .prefs-pane [type='checkbox']:not(:disabled):not(:checked):focus + label::before {
     border: 1px dotted #0060DF; }
 
 .prefs-pane-button button {
   background-color: transparent;
   border: 0;
   cursor: pointer;
   fill: rgba(12, 12, 13, 0.6);
+  offset-inline-end: 15px;
   padding: 15px;
   position: fixed;
-  offset-inline-end: 15px;
   top: 15px;
   z-index: 12001; }
   .prefs-pane-button button:hover {
     background-color: #EDEDF0; }
   .prefs-pane-button button:active {
     background-color: #F9F9FA; }
 
 .confirmation-dialog .modal {
-  position: fixed;
-  width: 400px;
-  top: 20%;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
   left: 50%;
   margin-left: -200px;
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.08); }
+  position: fixed;
+  top: 20%;
+  width: 400px; }
 
 .confirmation-dialog section {
   margin: 0; }
 
 .confirmation-dialog .modal-message {
+  display: flex;
   padding: 16px;
-  padding-bottom: 0;
-  display: flex; }
+  padding-bottom: 0; }
   .confirmation-dialog .modal-message p {
     margin: 0;
     margin-bottom: 16px; }
 
 .confirmation-dialog .actions {
-  padding: 0px 16px 0 16px;
-  border: none;
+  border: 0;
+  display: flex;
   flex-wrap: nowrap;
-  display: flex; }
+  padding: 0 16px; }
   .confirmation-dialog .actions button {
     margin-inline-end: 16px;
     width: 50%; }
     .confirmation-dialog .actions button.done {
-      margin-inline-start: 0;
-      margin-inline-end: 0; }
+      margin-inline-end: 0;
+      margin-inline-start: 0; }
 
 .confirmation-dialog .icon {
   margin-inline-end: 16px; }
 
 .modal-overlay {
   background: #EDEDF0;
   height: 100%;
   left: 0;
@@ -940,142 +940,142 @@ section.top-sites:not(.collapsed):hover 
   background: #FFF;
   border: 1px solid #D7D7DB;
   border-radius: 5px;
   font-size: 15px;
   z-index: 11002; }
 
 .card-outer {
   background: #FFF;
+  border-radius: 3px;
   display: inline-block;
+  height: 266px;
   margin-inline-end: 32px;
-  width: 224px;
-  border-radius: 3px;
-  height: 266px;
-  position: relative; }
+  position: relative;
+  width: 224px; }
   .card-outer .context-menu-button {
-    cursor: pointer;
-    position: absolute;
-    top: -13.5px;
-    offset-inline-end: -13.5px;
-    width: 27px;
-    height: 27px;
+    background-clip: padding-box;
     background-color: #FFF;
     background-image: url("chrome://browser/skin/page-action.svg");
     background-position: 55%;
-    background-clip: padding-box;
     border: 1px solid #B1B1B3;
     border-radius: 100%;
     box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+    cursor: pointer;
     fill: rgba(12, 12, 13, 0.8);
+    height: 27px;
+    offset-inline-end: -13.5px;
+    opacity: 0;
+    position: absolute;
+    top: -13.5px;
     transform: scale(0.25);
-    opacity: 0;
+    transition-duration: 200ms;
     transition-property: transform, opacity;
-    transition-duration: 200ms; }
-    .card-outer .context-menu-button:focus, .card-outer .context-menu-button:active {
-      transform: scale(1);
-      opacity: 1; }
+    width: 27px; }
+    .card-outer .context-menu-button:-moz-any(:active, :focus) {
+      opacity: 1;
+      transform: scale(1); }
   .card-outer.placeholder {
     background: transparent; }
     .card-outer.placeholder .card {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
   .card-outer .card {
-    height: 100%;
     border-radius: 3px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+    height: 100%; }
   .card-outer > a {
+    color: inherit;
     display: block;
-    color: inherit;
     height: 100%;
     outline: none;
     position: absolute;
     width: 224px; }
-    .card-outer > a.active .card, .card-outer > a:focus .card {
+    .card-outer > a:-moz-any(.active, :focus) .card {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
-    .card-outer > a.active .card-title, .card-outer > a:focus .card-title {
+    .card-outer > a:-moz-any(.active, :focus) .card-title {
       color: #0060DF; }
   .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) {
-    outline: none;
     box-shadow: 0 0 0 5px #D7D7DB;
-    transition: box-shadow 150ms; }
+    transition: box-shadow 150ms;
+    outline: none; }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+      opacity: 1;
+      transform: scale(1); }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: #0060DF; }
   .card-outer .card-preview-image-outer {
     background-color: #F9F9FA;
-    position: relative;
+    border-radius: 3px 3px 0 0;
     height: 122px;
-    border-radius: 3px 3px 0 0;
-    overflow: hidden; }
+    overflow: hidden;
+    position: relative; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid rgba(0, 0, 0, 0.05);
       bottom: 0;
-      content: " ";
+      content: '';
       position: absolute;
       width: 100%; }
     .card-outer .card-preview-image-outer .card-preview-image {
-      width: 100%;
-      height: 100%;
-      background-size: cover;
       background-position: center;
       background-repeat: no-repeat;
+      background-size: cover;
+      height: 100%;
       opacity: 0;
-      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1); }
+      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1);
+      width: 100%; }
       .card-outer .card-preview-image-outer .card-preview-image.loaded {
         opacity: 1; }
   .card-outer .card-details {
     padding: 15px 16px 12px; }
     .card-outer .card-details.no-image {
       padding-top: 16px; }
   .card-outer .card-text {
-    overflow: hidden;
-    max-height: 78px; }
+    max-height: 78px;
+    overflow: hidden; }
     .card-outer .card-text.no-image {
       max-height: 192px; }
     .card-outer .card-text.no-host-name, .card-outer .card-text.no-context {
       max-height: 97px; }
     .card-outer .card-text.no-image.no-host-name, .card-outer .card-text.no-image.no-context {
       max-height: 211px; }
     .card-outer .card-text.no-host-name.no-context {
       max-height: 116px; }
     .card-outer .card-text.no-image.no-host-name.no-context {
       max-height: 230px; }
     .card-outer .card-text:not(.no-description) .card-title {
       max-height: 57px;
       overflow: hidden; }
   .card-outer .card-host-name {
     color: #737373;
     font-size: 10px;
+    overflow: hidden;
     padding-bottom: 4px;
-    text-transform: uppercase;
-    overflow: hidden;
-    text-overflow: ellipsis; }
+    text-overflow: ellipsis;
+    text-transform: uppercase; }
   .card-outer .card-title {
+    font-size: 14px;
+    line-height: 19px;
     margin: 0 0 2px;
-    font-size: 14px;
-    word-wrap: break-word;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-description {
     font-size: 12px;
+    line-height: 19px;
     margin: 0;
-    word-wrap: break-word;
     overflow: hidden;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-context {
+    bottom: 0;
+    color: #737373;
+    display: flex;
+    font-size: 11px;
+    left: 0;
     padding: 12px 16px 12px 14px;
     position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    color: #737373;
-    font-size: 11px;
-    display: flex; }
+    right: 0; }
   .card-outer .card-context-icon {
     fill: rgba(12, 12, 13, 0.6);
     margin-inline-end: 6px; }
   .card-outer .card-context-label {
     flex-grow: 1;
     line-height: 16px;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -1098,23 +1098,23 @@ section.top-sites:not(.collapsed):hover 
       .manual-migration-container p {
         align-self: center;
         display: flex;
         justify-content: space-between; } }
   .manual-migration-container .icon {
     display: none; }
     @media (min-width: 544px) {
       .manual-migration-container .icon {
+        align-self: center;
         display: block;
         fill: rgba(12, 12, 13, 0.6);
-        margin-inline-end: 6px;
-        align-self: center; } }
+        margin-inline-end: 6px; } }
 
 .manual-migration-actions {
-  border: none;
+  border: 0;
   display: block;
   flex-wrap: nowrap; }
   @media (min-width: 544px) {
     .manual-migration-actions {
       display: flex;
       justify-content: space-between;
       padding: 0; } }
   .manual-migration-actions button {
@@ -1126,102 +1126,102 @@ section.top-sites:not(.collapsed):hover 
 
 .collapsible-section .section-title .click-target {
   cursor: pointer;
   vertical-align: top;
   white-space: nowrap; }
 
 .collapsible-section .section-title .icon-arrowhead-down,
 .collapsible-section .section-title .icon-arrowhead-forward {
-  margin-top: -1px;
-  margin-inline-start: 8px; }
+  margin-inline-start: 8px;
+  margin-top: -1px; }
 
 .collapsible-section .section-top-bar {
   position: relative; }
   .collapsible-section .section-top-bar .section-info-option {
     offset-inline-end: 0;
     position: absolute;
     top: 0; }
   .collapsible-section .section-top-bar .info-option-icon {
     background-image: url("../data/content/assets/glyph-info-option-12.svg");
-    background-size: 12px 12px;
+    background-position: center;
     background-repeat: no-repeat;
-    background-position: center;
+    background-size: 12px 12px;
+    -moz-context-properties: fill;
+    display: inline-block;
     fill: rgba(12, 12, 13, 0.6);
-    -moz-context-properties: fill;
     height: 16px;
-    width: 16px;
-    display: inline-block;
     margin-bottom: -2px;
     opacity: 0;
-    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-    .collapsible-section .section-top-bar .info-option-icon:focus, .collapsible-section .section-top-bar .info-option-icon:active {
+    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    width: 16px; }
+    .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] {
+      background-color: rgba(12, 12, 13, 0.1);
+      border-radius: 1px;
+      box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
+      fill: rgba(12, 12, 13, 0.8); }
+      .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] + .info-option {
+        opacity: 1;
+        transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+        visibility: visible; }
+    .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded='true']) + .info-option {
+      pointer-events: none; }
+    .collapsible-section .section-top-bar .info-option-icon:-moz-any(:active, :focus) {
       opacity: 1; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] {
-    background-color: rgba(12, 12, 13, 0.1);
-    border-radius: 1px;
-    box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
-    fill: rgba(12, 12, 13, 0.8); }
   .collapsible-section .section-top-bar .section-info-option .info-option {
-    visibility: hidden;
     opacity: 0;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
+    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    visibility: hidden; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after, .collapsible-section .section-top-bar .section-info-option .info-option::before {
-      content: "";
+      content: '';
       offset-inline-end: 0;
       position: absolute; }
     .collapsible-section .section-top-bar .section-info-option .info-option::before {
       background-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg");
       background-position: right 6px bottom;
       background-repeat: no-repeat;
       background-size: 20px 10px;
       height: 32px;
       top: -32px;
       width: 43px; }
     .collapsible-section .section-top-bar .section-info-option .info-option:dir(rtl)::before {
       background-position-x: 6px; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after {
       height: 10px;
       offset-inline-start: 0;
       top: -10px; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] + .info-option {
-    visibility: visible;
-    opacity: 1;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded="true"]) + .info-option {
-    pointer-events: none; }
   .collapsible-section .section-top-bar .info-option {
-    z-index: 9999;
-    position: absolute;
     background: #FFF;
     border: 1px solid #D7D7DB;
     border-radius: 3px;
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
     font-size: 13px;
     line-height: 120%;
     margin-inline-end: -9px;
     offset-inline-end: 0;
+    padding: 24px;
+    position: absolute;
     top: 26px;
+    -moz-user-select: none;
     width: 320px;
-    padding: 24px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
-    -moz-user-select: none; }
+    z-index: 9999; }
   .collapsible-section .section-top-bar .info-option-header {
     font-size: 15px;
     font-weight: 600; }
   .collapsible-section .section-top-bar .info-option-body {
     margin: 0;
     margin-top: 12px; }
   .collapsible-section .section-top-bar .info-option-link {
     color: #0060DF;
     margin-left: 7px; }
   .collapsible-section .section-top-bar .info-option-manage {
     margin-top: 24px; }
     .collapsible-section .section-top-bar .info-option-manage button {
-      background: none;
-      border: none;
+      background: 0;
+      border: 0;
       color: #0060DF;
       cursor: pointer;
       margin: 0;
       padding: 0; }
       .collapsible-section .section-top-bar .info-option-manage button::after {
         background-image: url("../data/content/assets/topic-show-more-12.svg");
         background-repeat: no-repeat;
         content: '';
@@ -1251,24 +1251,24 @@ section.top-sites:not(.collapsed):hover 
         width: 340px; } }
     @media (min-width: 800px) {
       .collapsible-section .section-disclaimer .section-disclaimer-text {
         width: 610px; } }
   .collapsible-section .section-disclaimer a {
     color: #008EA4;
     padding-left: 3px; }
   .collapsible-section .section-disclaimer button {
-    margin-top: 2px;
-    offset-inline-end: 0;
-    min-height: 26px;
-    max-width: 130px;
     background: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
-    cursor: pointer; }
+    cursor: pointer;
+    margin-top: 2px;
+    max-width: 130px;
+    min-height: 26px;
+    offset-inline-end: 0; }
     .collapsible-section .section-disclaimer button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     @media (min-width: 416px) {
       .collapsible-section .section-disclaimer button {
         position: absolute; } }
 
 .collapsible-section .section-body {

--- a/browser/extensions/activity-stream/css/activity-stream-mac.css
+++ b/browser/extensions/activity-stream/css/activity-stream-mac.css
@@ -18,40 +18,40 @@ button,
 input {
   font-family: inherit;
   font-size: inherit; }
 
 [hidden] {
   display: none !important; }
 
 .icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-size: 16px;
   background-position: center center;
   background-repeat: no-repeat;
-  vertical-align: middle;
+  background-size: 16px;
+  -moz-context-properties: fill;
+  display: inline-block;
   fill: rgba(12, 12, 13, 0.8);
-  -moz-context-properties: fill; }
+  height: 16px;
+  vertical-align: middle;
+  width: 16px; }
   .icon.icon-spacer {
     margin-inline-end: 8px; }
   .icon.icon-small-spacer {
     margin-inline-end: 6px; }
   .icon.icon-bookmark-added {
     background-image: url("chrome://browser/skin/bookmark.svg"); }
   .icon.icon-bookmark-hollow {
     background-image: url("chrome://browser/skin/bookmark-hollow.svg"); }
   .icon.icon-delete {
     background-image: url("../data/content/assets/glyph-delete-16.svg"); }
   .icon.icon-modal-delete {
     background-image: url("../data/content/assets/glyph-modal-delete-32.svg");
-    width: 32px;
+    background-size: 32px;
     height: 32px;
-    background-size: 32px; }
+    width: 32px; }
   .icon.icon-dismiss {
     background-image: url("../data/content/assets/glyph-dismiss-16.svg"); }
   .icon.icon-info {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-import {
     background-image: url("../data/content/assets/glyph-import-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
@@ -66,18 +66,17 @@ input {
   .icon.icon-edit {
     background-image: url("../data/content/assets/glyph-edit-16.svg"); }
   .icon.icon-pocket {
     background-image: url("../data/content/assets/glyph-pocket-16.svg"); }
   .icon.icon-historyItem {
     background-image: url("../data/content/assets/glyph-historyItem-16.svg"); }
   .icon.icon-trending {
     background-image: url("../data/content/assets/glyph-trending-16.svg");
-    transform: translateY(2px);
-    /* trending bolt is visually top heavy */ }
+    transform: translateY(2px); }
   .icon.icon-now {
     background-image: url("chrome://browser/skin/history.svg"); }
   .icon.icon-topsites {
     background-image: url("../data/content/assets/glyph-topsites-16.svg"); }
   .icon.icon-pin-small {
     background-image: url("../data/content/assets/glyph-pin-12.svg");
     background-size: 12px;
     height: 12px;
@@ -120,65 +119,65 @@ h2 {
 
 a {
   color: #0060DF;
   text-decoration: none; }
   a:hover {
     color: #008EA4; }
 
 .sr-only {
-  position: absolute;
-  width: 1px;
+  border: 0;
+  clip: rect(0, 0, 0, 0);
   height: 1px;
-  padding: 0;
   margin: -1px;
   overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
+  padding: 0;
+  position: absolute;
+  width: 1px; }
 
 .inner-border {
   border: 1px solid #D7D7DB;
   border-radius: 3px;
+  height: 100%;
+  left: 0;
+  pointer-events: none;
   position: absolute;
   top: 0;
-  left: 0;
   width: 100%;
-  height: 100%;
-  pointer-events: none;
   z-index: 100; }
 
 @keyframes fadeIn {
   from {
     opacity: 0; }
   to {
     opacity: 1; } }
 
 .show-on-init {
   opacity: 0;
   transition: opacity 0.2s ease-in; }
   .show-on-init.on {
-    opacity: 1;
-    animation: fadeIn 0.2s; }
+    animation: fadeIn 0.2s;
+    opacity: 1; }
 
 .actions {
   border-top: 1px solid #D7D7DB;
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   margin: 0;
-  padding: 15px 25px 0 25px;
-  justify-content: flex-start;
-  flex-wrap: wrap; }
+  padding: 15px 25px 0; }
   .actions button {
     background-color: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
     color: inherit;
     cursor: pointer;
+    margin-bottom: 15px;
     padding: 10px 30px;
-    margin-bottom: 15px;
     white-space: nowrap; }
     .actions button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     .actions button.dismiss {
       border: 0;
       padding: 0;
       text-decoration: underline; }
@@ -188,26 +187,26 @@ a {
       color: #FFF;
       margin-inline-start: auto; }
 
 #snippets-container {
   z-index: 1; }
 
 .outer-wrapper {
   display: flex;
-  padding: 40px 32px 32px;
+  flex-grow: 1;
   height: 100%;
-  flex-grow: 1; }
+  padding: 40px 32px 32px; }
   .outer-wrapper.fixed-to-top {
     height: auto; }
 
 main {
   margin: auto;
-  width: 224px;
-  padding-bottom: 48px; }
+  padding-bottom: 48px;
+  width: 224px; }
   @media (min-width: 416px) {
     main {
       width: 352px; } }
   @media (min-width: 544px) {
     main {
       width: 480px; } }
   @media (min-width: 800px) {
     main {
@@ -240,157 +239,161 @@ main {
 .body-wrapper.on .sections-list .section:last-of-type,
 .body-wrapper.on .topic {
   opacity: 1; }
 
 .top-sites-list {
   list-style: none;
   margin: 0;
   margin-bottom: -18px;
-  padding: 0;
-  margin-inline-end: -32px; }
+  margin-inline-end: -32px;
+  padding: 0; }
   @media (max-width: 416px) {
     .top-sites-list :nth-child(2n+1) .context-menu {
+      margin-inline-end: auto;
       margin-inline-start: auto;
-      margin-inline-end: auto;
-      offset-inline-start: -32px;
-      offset-inline-end: auto; }
+      offset-inline-end: auto;
+      offset-inline-start: -32px; }
     .top-sites-list :nth-child(2n) .context-menu {
-      margin-inline-start: auto;
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 416px) and (max-width: 544px) {
-    .top-sites-list :nth-child(3n+2) .context-menu, .top-sites-list :nth-child(3n) .context-menu {
-      margin-inline-start: auto;
+    .top-sites-list :nth-child(3n+2) .context-menu,
+    .top-sites-list :nth-child(3n) .context-menu {
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .top-sites-list :nth-child(4n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 768px) {
     .top-sites-list :nth-child(4n+3) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .top-sites-list :nth-child(6n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1024px) {
     .top-sites-list :nth-child(6n+5) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   .top-sites-list li {
     display: inline-block;
     margin: 0 0 8px;
     margin-inline-end: 32px; }
   .top-sites-list .top-site-outer {
     position: relative; }
     .top-sites-list .top-site-outer > a {
+      color: inherit;
       display: block;
-      color: inherit;
       outline: none; }
-      .top-sites-list .top-site-outer > a.active .tile, .top-sites-list .top-site-outer > a:focus .tile {
+      .top-sites-list .top-site-outer > a:-moz-any(.active, :focus) .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 .top-site-outer .context-menu-button {
-      cursor: pointer;
-      position: absolute;
-      top: -13.5px;
-      offset-inline-end: -13.5px;
-      width: 27px;
-      height: 27px;
+      background-clip: padding-box;
       background-color: #FFF;
       background-image: url("chrome://browser/skin/page-action.svg");
       background-position: 55%;
-      background-clip: padding-box;
       border: 1px solid #B1B1B3;
       border-radius: 100%;
       box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+      cursor: pointer;
       fill: rgba(12, 12, 13, 0.8);
+      height: 27px;
+      offset-inline-end: -13.5px;
+      opacity: 0;
+      position: absolute;
+      top: -13.5px;
       transform: scale(0.25);
-      opacity: 0;
+      transition-duration: 200ms;
       transition-property: transform, opacity;
-      transition-duration: 200ms; }
-      .top-sites-list .top-site-outer .context-menu-button:focus, .top-sites-list .top-site-outer .context-menu-button:active {
-        transform: scale(1);
-        opacity: 1; }
-    .top-sites-list .top-site-outer:hover .tile, .top-sites-list .top-site-outer:focus .tile, .top-sites-list .top-site-outer.active .tile {
+      width: 27px; }
+      .top-sites-list .top-site-outer .context-menu-button:-moz-any(:active, :focus) {
+        opacity: 1;
+        transform: scale(1); }
+    .top-sites-list .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 .top-site-outer:hover .context-menu-button, .top-sites-list .top-site-outer:focus .context-menu-button, .top-sites-list .top-site-outer.active .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
+      opacity: 1;
+      transform: scale(1); }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
+      opacity: 1;
+      transform: scale(1); }
     .top-sites-list .top-site-outer .tile {
-      position: relative;
-      height: 96px;
-      width: 96px;
       border-radius: 6px;
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+      height: 96px;
+      position: relative;
+      width: 96px;
+      align-items: center;
       color: #737373;
-      font-weight: 200;
+      display: flex;
       font-size: 32px;
-      text-transform: uppercase;
-      display: flex;
-      align-items: center;
-      justify-content: center; }
+      font-weight: 200;
+      justify-content: center;
+      text-transform: uppercase; }
       .top-sites-list .top-site-outer .tile::before {
         content: attr(data-fallback); }
     .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 .screenshot {
+      background-color: #FFF;
+      background-position: top left;
+      background-size: cover;
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      height: 100%;
+      left: 0;
+      opacity: 0;
       position: absolute;
       top: 0;
-      left: 0;
-      height: 100%;
-      width: 100%;
-      background-color: #FFF;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-      background-size: cover;
-      background-position: top left;
       transition: opacity 1s;
-      opacity: 0; }
+      width: 100%; }
       .top-sites-list .top-site-outer .screenshot.active {
         opacity: 1; }
     .top-sites-list .top-site-outer .top-site-icon {
-      position: absolute;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      background-color: #F9F9FA;
       background-position: center center;
       background-repeat: no-repeat;
-      background-color: #F9F9FA; }
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      position: absolute; }
     .top-sites-list .top-site-outer .rich-icon {
-      top: 0;
+      background-size: 96px;
+      height: 100%;
       offset-inline-start: 0;
-      height: 100%;
-      width: 100%;
-      background-size: 96px; }
+      top: 0;
+      width: 100%; }
     .top-sites-list .top-site-outer .default-icon {
+      background-size: 32px;
       bottom: -6px;
       height: 42px;
       offset-inline-end: -6px;
       width: 42px;
-      background-size: 32px;
+      align-items: center;
       display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 20px; }
+      font-size: 20px;
+      justify-content: center; }
       .top-sites-list .top-site-outer .default-icon[data-fallback]::before {
         content: attr(data-fallback); }
     .top-sites-list .top-site-outer .title {
       font: message-box;
       height: 30px;
       line-height: 30px;
       text-align: center;
       width: 96px;
@@ -418,17 +421,17 @@ main {
       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:focus, .top-sites-list .top-site-outer .edit-menu:active {
+      .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%;
@@ -438,34 +441,31 @@ main {
         .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:hover .edit-menu, .top-sites-list .top-site-outer:focus .edit-menu, .top-sites-list .top-site-outer.active .edit-menu {
-      transform: scale(1);
-      opacity: 1; }
 
 .edit-topsites-wrapper .edit-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) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:focus, .edit-topsites-wrapper .edit-topsites-button:active {
+  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
   .edit-topsites-wrapper .edit-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
@@ -494,17 +494,17 @@ main {
   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; }
 
-section.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .edit-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {
@@ -559,69 +559,69 @@ section.top-sites:not(.collapsed):hover 
   0% {
     opacity: 0;
     transform: translateY(15px); }
   100% {
     opacity: 1;
     transform: translateY(0); } }
 
 .sections-list .section-list {
-  margin: 0;
   display: grid;
+  grid-gap: 32px;
   grid-template-columns: repeat(auto-fit, 224px);
-  grid-gap: 32px; }
+  margin: 0; }
   @media (max-width: 544px) {
     .sections-list .section-list .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .sections-list .section-list :nth-child(2n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .sections-list .section-list :nth-child(3n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
 
 .sections-list .section-empty-state {
-  width: 100%;
-  height: 266px;
+  border: 1px solid #D7D7DB;
+  border-radius: 3px;
   display: flex;
-  border: 1px solid #D7D7DB;
-  border-radius: 3px; }
+  height: 266px;
+  width: 100%; }
   .sections-list .section-empty-state .empty-state {
     margin: auto;
     max-width: 350px; }
     .sections-list .section-empty-state .empty-state .empty-state-icon {
-      background-size: 50px 50px;
+      background-position: center;
       background-repeat: no-repeat;
-      background-position: center;
+      background-size: 50px 50px;
+      -moz-context-properties: fill;
+      display: block;
       fill: rgba(12, 12, 13, 0.6);
-      -moz-context-properties: fill;
       height: 50px;
-      width: 50px;
       margin: 0 auto;
-      display: block; }
+      width: 50px; }
     .sections-list .section-empty-state .empty-state .empty-state-message {
-      margin-bottom: 0;
+      color: #737373;
       font-size: 13px;
-      color: #737373;
+      margin-bottom: 0;
       text-align: center; }
 
 .topic {
+  color: #737373;
   font-size: 12px;
-  color: #737373;
-  margin-top: 12px;
-  line-height: 1.6; }
+  line-height: 1.6;
+  margin-top: 12px; }
   @media (min-width: 800px) {
     .topic {
       line-height: 16px; } }
   .topic ul {
     margin: 0;
     padding: 0; }
     @media (min-width: 800px) {
       .topic ul {
@@ -651,110 +651,110 @@ section.top-sites:not(.collapsed):hover 
       fill: #008EA4;
       height: 16px;
       margin-inline-start: 5px;
       vertical-align: top;
       width: 12px; }
     .topic .topic-read-more:dir(rtl)::after {
       transform: scaleX(-1); }
   .topic::after {
-    content: "";
-    display: table;
-    clear: both; }
+    clear: both;
+    content: '';
+    display: table; }
 
 .search-wrapper {
   cursor: default;
   display: flex;
-  position: relative;
+  height: 35px;
   margin: 1px 1px 40px;
-  width: 100%;
-  height: 35px; }
+  position: relative;
+  width: 100%; }
   .search-wrapper input {
-    border: none;
+    border: 0;
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
     color: inherit;
+    font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
     padding-inline-start: 35px;
-    width: 100%;
-    font-size: 15px; }
+    width: 100%; }
   .search-wrapper:hover input {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
     box-shadow: 0 0 0 3px #0A84FF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
+    height: 100%;
+    offset-inline-start: 0;
     position: absolute;
-    offset-inline-start: 0;
-    height: 100%;
     width: 35px; }
   .search-wrapper .search-button {
     background: url("chrome://browser/skin/forward.svg") no-repeat center center;
-    border-radius: 0 3px 3px 0;
+    background-size: 16px 16px;
     border: 0;
-    width: 36px;
+    border-radius: 0 3px 3px 0;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
-    background-size: 16px 16px;
     height: 100%;
     offset-inline-end: 0;
-    position: absolute; }
+    position: absolute;
+    width: 36px; }
     .search-wrapper .search-button:focus, .search-wrapper .search-button:hover {
       background-color: rgba(12, 12, 13, 0.1);
       cursor: pointer; }
     .search-wrapper .search-button:active {
       background-color: rgba(12, 12, 13, 0.2); }
     .search-wrapper .search-button:dir(rtl) {
       transform: scaleX(-1); }
   .search-wrapper .contentSearchSuggestionTable {
     border: 0;
     transform: translateY(2px); }
 
 .context-menu {
+  background: #F9F9FA;
+  border-radius: 5px;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   display: block;
-  position: absolute;
   font-size: 14px;
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
-  top: 6.75px;
-  offset-inline-start: 100%;
   margin-inline-start: 5px;
-  z-index: 10000;
-  background: #F9F9FA;
-  border-radius: 5px; }
+  offset-inline-start: 100%;
+  position: absolute;
+  top: 6.75px;
+  z-index: 10000; }
   .context-menu > ul {
+    list-style: none;
     margin: 0;
-    padding: 5px 0;
-    list-style: none; }
+    padding: 5px 0; }
     .context-menu > ul > li {
       margin: 0;
       width: 100%; }
       .context-menu > ul > li.separator {
-        margin: 5px 0;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
+        border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+        margin: 5px 0; }
       .context-menu > ul > li > a {
-        outline: none;
-        cursor: pointer;
+        align-items: center;
         color: inherit;
-        white-space: nowrap;
-        padding: 3px 12px;
+        cursor: pointer;
+        display: flex;
         line-height: 16px;
-        display: flex;
-        align-items: center; }
-        .context-menu > ul > li > a:hover, .context-menu > ul > li > a:focus {
+        outline: none;
+        padding: 3px 12px;
+        white-space: nowrap; }
+        .context-menu > ul > li > a:-moz-any(:focus, :hover) {
           background: #0060DF;
           color: #FFF; }
-          .context-menu > ul > li > a:hover a, .context-menu > ul > li > a:focus a {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
             color: #0C0C0D; }
-          .context-menu > ul > li > a:hover .icon, .context-menu > ul > li > a:focus .icon {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
             fill: #FFF; }
-          .context-menu > ul > li > a:hover:hover, .context-menu > ul > li > a:hover:focus, .context-menu > ul > li > a:focus:hover, .context-menu > ul > li > a:focus:focus {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
             color: #FFF; }
 
 .prefs-pane {
   color: #4A4A4F;
   font-size: 14px;
   line-height: 21px; }
   .prefs-pane .sidebar {
     background: #FFF;
@@ -854,79 +854,79 @@ section.top-sites:not(.collapsed):hover 
     offset-inline-start: 0;
     position: absolute;
     top: 0;
     width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after,
   .prefs-pane [type='checkbox']:checked + label::after {
     background: url("chrome://global/skin/in-content/check.svg") no-repeat center center;
     content: '';
+    -moz-context-properties: fill, stroke;
+    fill: #0060DF;
     height: 21px;
     offset-inline-start: 0;
     position: absolute;
+    stroke: none;
     top: 0;
-    width: 21px;
-    -moz-context-properties: fill, stroke;
-    fill: #0060DF;
-    stroke: none; }
+    width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after {
     opacity: 0; }
   .prefs-pane [type='checkbox']:checked + label::after {
     opacity: 1; }
   .prefs-pane [type='checkbox']:not(:disabled) + label:hover::before {
     border: 1px solid #0060DF; }
   .prefs-pane [type='checkbox']:not(:disabled):checked:focus + label::before,
   .prefs-pane [type='checkbox']:not(:disabled):not(:checked):focus + label::before {
     border: 1px dotted #0060DF; }
 
 .prefs-pane-button button {
   background-color: transparent;
   border: 0;
   cursor: pointer;
   fill: rgba(12, 12, 13, 0.6);
+  offset-inline-end: 15px;
   padding: 15px;
   position: fixed;
-  offset-inline-end: 15px;
   top: 15px;
   z-index: 12001; }
   .prefs-pane-button button:hover {
     background-color: #EDEDF0; }
   .prefs-pane-button button:active {
     background-color: #F9F9FA; }
 
 .confirmation-dialog .modal {
-  position: fixed;
-  width: 400px;
-  top: 20%;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
   left: 50%;
   margin-left: -200px;
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.08); }
+  position: fixed;
+  top: 20%;
+  width: 400px; }
 
 .confirmation-dialog section {
   margin: 0; }
 
 .confirmation-dialog .modal-message {
+  display: flex;
   padding: 16px;
-  padding-bottom: 0;
-  display: flex; }
+  padding-bottom: 0; }
   .confirmation-dialog .modal-message p {
     margin: 0;
     margin-bottom: 16px; }
 
 .confirmation-dialog .actions {
-  padding: 0px 16px 0 16px;
-  border: none;
+  border: 0;
+  display: flex;
   flex-wrap: nowrap;
-  display: flex; }
+  padding: 0 16px; }
   .confirmation-dialog .actions button {
     margin-inline-end: 16px;
     width: 50%; }
     .confirmation-dialog .actions button.done {
-      margin-inline-start: 0;
-      margin-inline-end: 0; }
+      margin-inline-end: 0;
+      margin-inline-start: 0; }
 
 .confirmation-dialog .icon {
   margin-inline-end: 16px; }
 
 .modal-overlay {
   background: #EDEDF0;
   height: 100%;
   left: 0;
@@ -940,142 +940,142 @@ section.top-sites:not(.collapsed):hover 
   background: #FFF;
   border: 1px solid #D7D7DB;
   border-radius: 5px;
   font-size: 15px;
   z-index: 11002; }
 
 .card-outer {
   background: #FFF;
+  border-radius: 3px;
   display: inline-block;
+  height: 266px;
   margin-inline-end: 32px;
-  width: 224px;
-  border-radius: 3px;
-  height: 266px;
-  position: relative; }
+  position: relative;
+  width: 224px; }
   .card-outer .context-menu-button {
-    cursor: pointer;
-    position: absolute;
-    top: -13.5px;
-    offset-inline-end: -13.5px;
-    width: 27px;
-    height: 27px;
+    background-clip: padding-box;
     background-color: #FFF;
     background-image: url("chrome://browser/skin/page-action.svg");
     background-position: 55%;
-    background-clip: padding-box;
     border: 1px solid #B1B1B3;
     border-radius: 100%;
     box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+    cursor: pointer;
     fill: rgba(12, 12, 13, 0.8);
+    height: 27px;
+    offset-inline-end: -13.5px;
+    opacity: 0;
+    position: absolute;
+    top: -13.5px;
     transform: scale(0.25);
-    opacity: 0;
+    transition-duration: 200ms;
     transition-property: transform, opacity;
-    transition-duration: 200ms; }
-    .card-outer .context-menu-button:focus, .card-outer .context-menu-button:active {
-      transform: scale(1);
-      opacity: 1; }
+    width: 27px; }
+    .card-outer .context-menu-button:-moz-any(:active, :focus) {
+      opacity: 1;
+      transform: scale(1); }
   .card-outer.placeholder {
     background: transparent; }
     .card-outer.placeholder .card {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
   .card-outer .card {
-    height: 100%;
     border-radius: 3px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+    height: 100%; }
   .card-outer > a {
+    color: inherit;
     display: block;
-    color: inherit;
     height: 100%;
     outline: none;
     position: absolute;
     width: 224px; }
-    .card-outer > a.active .card, .card-outer > a:focus .card {
+    .card-outer > a:-moz-any(.active, :focus) .card {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
-    .card-outer > a.active .card-title, .card-outer > a:focus .card-title {
+    .card-outer > a:-moz-any(.active, :focus) .card-title {
       color: #0060DF; }
   .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) {
-    outline: none;
     box-shadow: 0 0 0 5px #D7D7DB;
-    transition: box-shadow 150ms; }
+    transition: box-shadow 150ms;
+    outline: none; }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+      opacity: 1;
+      transform: scale(1); }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: #0060DF; }
   .card-outer .card-preview-image-outer {
     background-color: #F9F9FA;
-    position: relative;
+    border-radius: 3px 3px 0 0;
     height: 122px;
-    border-radius: 3px 3px 0 0;
-    overflow: hidden; }
+    overflow: hidden;
+    position: relative; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid rgba(0, 0, 0, 0.05);
       bottom: 0;
-      content: " ";
+      content: '';
       position: absolute;
       width: 100%; }
     .card-outer .card-preview-image-outer .card-preview-image {
-      width: 100%;
-      height: 100%;
-      background-size: cover;
       background-position: center;
       background-repeat: no-repeat;
+      background-size: cover;
+      height: 100%;
       opacity: 0;
-      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1); }
+      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1);
+      width: 100%; }
       .card-outer .card-preview-image-outer .card-preview-image.loaded {
         opacity: 1; }
   .card-outer .card-details {
     padding: 15px 16px 12px; }
     .card-outer .card-details.no-image {
       padding-top: 16px; }
   .card-outer .card-text {
-    overflow: hidden;
-    max-height: 78px; }
+    max-height: 78px;
+    overflow: hidden; }
     .card-outer .card-text.no-image {
       max-height: 192px; }
     .card-outer .card-text.no-host-name, .card-outer .card-text.no-context {
       max-height: 97px; }
     .card-outer .card-text.no-image.no-host-name, .card-outer .card-text.no-image.no-context {
       max-height: 211px; }
     .card-outer .card-text.no-host-name.no-context {
       max-height: 116px; }
     .card-outer .card-text.no-image.no-host-name.no-context {
       max-height: 230px; }
     .card-outer .card-text:not(.no-description) .card-title {
       max-height: 57px;
       overflow: hidden; }
   .card-outer .card-host-name {
     color: #737373;
     font-size: 10px;
+    overflow: hidden;
     padding-bottom: 4px;
-    text-transform: uppercase;
-    overflow: hidden;
-    text-overflow: ellipsis; }
+    text-overflow: ellipsis;
+    text-transform: uppercase; }
   .card-outer .card-title {
+    font-size: 14px;
+    line-height: 19px;
     margin: 0 0 2px;
-    font-size: 14px;
-    word-wrap: break-word;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-description {
     font-size: 12px;
+    line-height: 19px;
     margin: 0;
-    word-wrap: break-word;
     overflow: hidden;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-context {
+    bottom: 0;
+    color: #737373;
+    display: flex;
+    font-size: 11px;
+    left: 0;
     padding: 12px 16px 12px 14px;
     position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    color: #737373;
-    font-size: 11px;
-    display: flex; }
+    right: 0; }
   .card-outer .card-context-icon {
     fill: rgba(12, 12, 13, 0.6);
     margin-inline-end: 6px; }
   .card-outer .card-context-label {
     flex-grow: 1;
     line-height: 16px;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -1098,23 +1098,23 @@ section.top-sites:not(.collapsed):hover 
       .manual-migration-container p {
         align-self: center;
         display: flex;
         justify-content: space-between; } }
   .manual-migration-container .icon {
     display: none; }
     @media (min-width: 544px) {
       .manual-migration-container .icon {
+        align-self: center;
         display: block;
         fill: rgba(12, 12, 13, 0.6);
-        margin-inline-end: 6px;
-        align-self: center; } }
+        margin-inline-end: 6px; } }
 
 .manual-migration-actions {
-  border: none;
+  border: 0;
   display: block;
   flex-wrap: nowrap; }
   @media (min-width: 544px) {
     .manual-migration-actions {
       display: flex;
       justify-content: space-between;
       padding: 0; } }
   .manual-migration-actions button {
@@ -1126,102 +1126,102 @@ section.top-sites:not(.collapsed):hover 
 
 .collapsible-section .section-title .click-target {
   cursor: pointer;
   vertical-align: top;
   white-space: nowrap; }
 
 .collapsible-section .section-title .icon-arrowhead-down,
 .collapsible-section .section-title .icon-arrowhead-forward {
-  margin-top: -1px;
-  margin-inline-start: 8px; }
+  margin-inline-start: 8px;
+  margin-top: -1px; }
 
 .collapsible-section .section-top-bar {
   position: relative; }
   .collapsible-section .section-top-bar .section-info-option {
     offset-inline-end: 0;
     position: absolute;
     top: 0; }
   .collapsible-section .section-top-bar .info-option-icon {
     background-image: url("../data/content/assets/glyph-info-option-12.svg");
-    background-size: 12px 12px;
+    background-position: center;
     background-repeat: no-repeat;
-    background-position: center;
+    background-size: 12px 12px;
+    -moz-context-properties: fill;
+    display: inline-block;
     fill: rgba(12, 12, 13, 0.6);
-    -moz-context-properties: fill;
     height: 16px;
-    width: 16px;
-    display: inline-block;
     margin-bottom: -2px;
     opacity: 0;
-    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-    .collapsible-section .section-top-bar .info-option-icon:focus, .collapsible-section .section-top-bar .info-option-icon:active {
+    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    width: 16px; }
+    .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] {
+      background-color: rgba(12, 12, 13, 0.1);
+      border-radius: 1px;
+      box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
+      fill: rgba(12, 12, 13, 0.8); }
+      .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] + .info-option {
+        opacity: 1;
+        transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+        visibility: visible; }
+    .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded='true']) + .info-option {
+      pointer-events: none; }
+    .collapsible-section .section-top-bar .info-option-icon:-moz-any(:active, :focus) {
       opacity: 1; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] {
-    background-color: rgba(12, 12, 13, 0.1);
-    border-radius: 1px;
-    box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
-    fill: rgba(12, 12, 13, 0.8); }
   .collapsible-section .section-top-bar .section-info-option .info-option {
-    visibility: hidden;
     opacity: 0;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
+    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    visibility: hidden; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after, .collapsible-section .section-top-bar .section-info-option .info-option::before {
-      content: "";
+      content: '';
       offset-inline-end: 0;
       position: absolute; }
     .collapsible-section .section-top-bar .section-info-option .info-option::before {
       background-image: url("chrome://global/skin/arrow/panelarrow-vertical@2x.png");
       background-position: right 7px bottom;
       background-repeat: no-repeat;
       background-size: 18px 10px;
       height: 32px;
       top: -32px;
       width: 43px; }
     .collapsible-section .section-top-bar .section-info-option .info-option:dir(rtl)::before {
       background-position-x: 7px; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after {
       height: 10px;
       offset-inline-start: 0;
       top: -10px; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] + .info-option {
-    visibility: visible;
-    opacity: 1;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded="true"]) + .info-option {
-    pointer-events: none; }
   .collapsible-section .section-top-bar .info-option {
-    z-index: 9999;
-    position: absolute;
     background: #FFF;
     border: 1px solid #D7D7DB;
     border-radius: 3px;
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
     font-size: 13px;
     line-height: 120%;
     margin-inline-end: -9px;
     offset-inline-end: 0;
+    padding: 24px;
+    position: absolute;
     top: 26px;
+    -moz-user-select: none;
     width: 320px;
-    padding: 24px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
-    -moz-user-select: none; }
+    z-index: 9999; }
   .collapsible-section .section-top-bar .info-option-header {
     font-size: 15px;
     font-weight: 600; }
   .collapsible-section .section-top-bar .info-option-body {
     margin: 0;
     margin-top: 12px; }
   .collapsible-section .section-top-bar .info-option-link {
     color: #0060DF;
     margin-left: 7px; }
   .collapsible-section .section-top-bar .info-option-manage {
     margin-top: 24px; }
     .collapsible-section .section-top-bar .info-option-manage button {
-      background: none;
-      border: none;
+      background: 0;
+      border: 0;
       color: #0060DF;
       cursor: pointer;
       margin: 0;
       padding: 0; }
       .collapsible-section .section-top-bar .info-option-manage button::after {
         background-image: url("../data/content/assets/topic-show-more-12.svg");
         background-repeat: no-repeat;
         content: '';
@@ -1251,24 +1251,24 @@ section.top-sites:not(.collapsed):hover 
         width: 340px; } }
     @media (min-width: 800px) {
       .collapsible-section .section-disclaimer .section-disclaimer-text {
         width: 610px; } }
   .collapsible-section .section-disclaimer a {
     color: #008EA4;
     padding-left: 3px; }
   .collapsible-section .section-disclaimer button {
-    margin-top: 2px;
-    offset-inline-end: 0;
-    min-height: 26px;
-    max-width: 130px;
     background: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
-    cursor: pointer; }
+    cursor: pointer;
+    margin-top: 2px;
+    max-width: 130px;
+    min-height: 26px;
+    offset-inline-end: 0; }
     .collapsible-section .section-disclaimer button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     @media (min-width: 416px) {
       .collapsible-section .section-disclaimer button {
         position: absolute; } }
 
 .collapsible-section .section-body {

--- a/browser/extensions/activity-stream/css/activity-stream-windows.css
+++ b/browser/extensions/activity-stream/css/activity-stream-windows.css
@@ -18,40 +18,40 @@ button,
 input {
   font-family: inherit;
   font-size: inherit; }
 
 [hidden] {
   display: none !important; }
 
 .icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-size: 16px;
   background-position: center center;
   background-repeat: no-repeat;
-  vertical-align: middle;
+  background-size: 16px;
+  -moz-context-properties: fill;
+  display: inline-block;
   fill: rgba(12, 12, 13, 0.8);
-  -moz-context-properties: fill; }
+  height: 16px;
+  vertical-align: middle;
+  width: 16px; }
   .icon.icon-spacer {
     margin-inline-end: 8px; }
   .icon.icon-small-spacer {
     margin-inline-end: 6px; }
   .icon.icon-bookmark-added {
     background-image: url("chrome://browser/skin/bookmark.svg"); }
   .icon.icon-bookmark-hollow {
     background-image: url("chrome://browser/skin/bookmark-hollow.svg"); }
   .icon.icon-delete {
     background-image: url("../data/content/assets/glyph-delete-16.svg"); }
   .icon.icon-modal-delete {
     background-image: url("../data/content/assets/glyph-modal-delete-32.svg");
-    width: 32px;
+    background-size: 32px;
     height: 32px;
-    background-size: 32px; }
+    width: 32px; }
   .icon.icon-dismiss {
     background-image: url("../data/content/assets/glyph-dismiss-16.svg"); }
   .icon.icon-info {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-import {
     background-image: url("../data/content/assets/glyph-import-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
@@ -66,18 +66,17 @@ input {
   .icon.icon-edit {
     background-image: url("../data/content/assets/glyph-edit-16.svg"); }
   .icon.icon-pocket {
     background-image: url("../data/content/assets/glyph-pocket-16.svg"); }
   .icon.icon-historyItem {
     background-image: url("../data/content/assets/glyph-historyItem-16.svg"); }
   .icon.icon-trending {
     background-image: url("../data/content/assets/glyph-trending-16.svg");
-    transform: translateY(2px);
-    /* trending bolt is visually top heavy */ }
+    transform: translateY(2px); }
   .icon.icon-now {
     background-image: url("chrome://browser/skin/history.svg"); }
   .icon.icon-topsites {
     background-image: url("../data/content/assets/glyph-topsites-16.svg"); }
   .icon.icon-pin-small {
     background-image: url("../data/content/assets/glyph-pin-12.svg");
     background-size: 12px;
     height: 12px;
@@ -120,65 +119,65 @@ h2 {
 
 a {
   color: #0060DF;
   text-decoration: none; }
   a:hover {
     color: #008EA4; }
 
 .sr-only {
-  position: absolute;
-  width: 1px;
+  border: 0;
+  clip: rect(0, 0, 0, 0);
   height: 1px;
-  padding: 0;
   margin: -1px;
   overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
+  padding: 0;
+  position: absolute;
+  width: 1px; }
 
 .inner-border {
   border: 1px solid #D7D7DB;
   border-radius: 3px;
+  height: 100%;
+  left: 0;
+  pointer-events: none;
   position: absolute;
   top: 0;
-  left: 0;
   width: 100%;
-  height: 100%;
-  pointer-events: none;
   z-index: 100; }
 
 @keyframes fadeIn {
   from {
     opacity: 0; }
   to {
     opacity: 1; } }
 
 .show-on-init {
   opacity: 0;
   transition: opacity 0.2s ease-in; }
   .show-on-init.on {
-    opacity: 1;
-    animation: fadeIn 0.2s; }
+    animation: fadeIn 0.2s;
+    opacity: 1; }
 
 .actions {
   border-top: 1px solid #D7D7DB;
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   margin: 0;
-  padding: 15px 25px 0 25px;
-  justify-content: flex-start;
-  flex-wrap: wrap; }
+  padding: 15px 25px 0; }
   .actions button {
     background-color: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
     color: inherit;
     cursor: pointer;
+    margin-bottom: 15px;
     padding: 10px 30px;
-    margin-bottom: 15px;
     white-space: nowrap; }
     .actions button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     .actions button.dismiss {
       border: 0;
       padding: 0;
       text-decoration: underline; }
@@ -188,26 +187,26 @@ a {
       color: #FFF;
       margin-inline-start: auto; }
 
 #snippets-container {
   z-index: 1; }
 
 .outer-wrapper {
   display: flex;
-  padding: 40px 32px 32px;
+  flex-grow: 1;
   height: 100%;
-  flex-grow: 1; }
+  padding: 40px 32px 32px; }
   .outer-wrapper.fixed-to-top {
     height: auto; }
 
 main {
   margin: auto;
-  width: 224px;
-  padding-bottom: 48px; }
+  padding-bottom: 48px;
+  width: 224px; }
   @media (min-width: 416px) {
     main {
       width: 352px; } }
   @media (min-width: 544px) {
     main {
       width: 480px; } }
   @media (min-width: 800px) {
     main {
@@ -240,157 +239,161 @@ main {
 .body-wrapper.on .sections-list .section:last-of-type,
 .body-wrapper.on .topic {
   opacity: 1; }
 
 .top-sites-list {
   list-style: none;
   margin: 0;
   margin-bottom: -18px;
-  padding: 0;
-  margin-inline-end: -32px; }
+  margin-inline-end: -32px;
+  padding: 0; }
   @media (max-width: 416px) {
     .top-sites-list :nth-child(2n+1) .context-menu {
+      margin-inline-end: auto;
       margin-inline-start: auto;
-      margin-inline-end: auto;
-      offset-inline-start: -32px;
-      offset-inline-end: auto; }
+      offset-inline-end: auto;
+      offset-inline-start: -32px; }
     .top-sites-list :nth-child(2n) .context-menu {
-      margin-inline-start: auto;
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 416px) and (max-width: 544px) {
-    .top-sites-list :nth-child(3n+2) .context-menu, .top-sites-list :nth-child(3n) .context-menu {
-      margin-inline-start: auto;
+    .top-sites-list :nth-child(3n+2) .context-menu,
+    .top-sites-list :nth-child(3n) .context-menu {
       margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      margin-inline-start: auto;
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .top-sites-list :nth-child(4n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 768px) {
     .top-sites-list :nth-child(4n+3) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .top-sites-list :nth-child(6n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1024px) {
     .top-sites-list :nth-child(6n+5) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   .top-sites-list li {
     display: inline-block;
     margin: 0 0 8px;
     margin-inline-end: 32px; }
   .top-sites-list .top-site-outer {
     position: relative; }
     .top-sites-list .top-site-outer > a {
+      color: inherit;
       display: block;
-      color: inherit;
       outline: none; }
-      .top-sites-list .top-site-outer > a.active .tile, .top-sites-list .top-site-outer > a:focus .tile {
+      .top-sites-list .top-site-outer > a:-moz-any(.active, :focus) .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 .top-site-outer .context-menu-button {
-      cursor: pointer;
-      position: absolute;
-      top: -13.5px;
-      offset-inline-end: -13.5px;
-      width: 27px;
-      height: 27px;
+      background-clip: padding-box;
       background-color: #FFF;
       background-image: url("chrome://browser/skin/page-action.svg");
       background-position: 55%;
-      background-clip: padding-box;
       border: 1px solid #B1B1B3;
       border-radius: 100%;
       box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+      cursor: pointer;
       fill: rgba(12, 12, 13, 0.8);
+      height: 27px;
+      offset-inline-end: -13.5px;
+      opacity: 0;
+      position: absolute;
+      top: -13.5px;
       transform: scale(0.25);
-      opacity: 0;
+      transition-duration: 200ms;
       transition-property: transform, opacity;
-      transition-duration: 200ms; }
-      .top-sites-list .top-site-outer .context-menu-button:focus, .top-sites-list .top-site-outer .context-menu-button:active {
-        transform: scale(1);
-        opacity: 1; }
-    .top-sites-list .top-site-outer:hover .tile, .top-sites-list .top-site-outer:focus .tile, .top-sites-list .top-site-outer.active .tile {
+      width: 27px; }
+      .top-sites-list .top-site-outer .context-menu-button:-moz-any(:active, :focus) {
+        opacity: 1;
+        transform: scale(1); }
+    .top-sites-list .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 .top-site-outer:hover .context-menu-button, .top-sites-list .top-site-outer:focus .context-menu-button, .top-sites-list .top-site-outer.active .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .edit-menu {
+      opacity: 1;
+      transform: scale(1); }
+    .top-sites-list .top-site-outer:-moz-any(.active, :focus, :hover) .context-menu-button {
+      opacity: 1;
+      transform: scale(1); }
     .top-sites-list .top-site-outer .tile {
-      position: relative;
-      height: 96px;
-      width: 96px;
       border-radius: 6px;
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1), 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+      height: 96px;
+      position: relative;
+      width: 96px;
+      align-items: center;
       color: #737373;
-      font-weight: 200;
+      display: flex;
       font-size: 32px;
-      text-transform: uppercase;
-      display: flex;
-      align-items: center;
-      justify-content: center; }
+      font-weight: 200;
+      justify-content: center;
+      text-transform: uppercase; }
       .top-sites-list .top-site-outer .tile::before {
         content: attr(data-fallback); }
     .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 .screenshot {
+      background-color: #FFF;
+      background-position: top left;
+      background-size: cover;
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      height: 100%;
+      left: 0;
+      opacity: 0;
       position: absolute;
       top: 0;
-      left: 0;
-      height: 100%;
-      width: 100%;
-      background-color: #FFF;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-      background-size: cover;
-      background-position: top left;
       transition: opacity 1s;
-      opacity: 0; }
+      width: 100%; }
       .top-sites-list .top-site-outer .screenshot.active {
         opacity: 1; }
     .top-sites-list .top-site-outer .top-site-icon {
-      position: absolute;
-      border-radius: 6px;
-      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      background-color: #F9F9FA;
       background-position: center center;
       background-repeat: no-repeat;
-      background-color: #F9F9FA; }
+      border-radius: 6px;
+      box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+      position: absolute; }
     .top-sites-list .top-site-outer .rich-icon {
-      top: 0;
+      background-size: 96px;
+      height: 100%;
       offset-inline-start: 0;
-      height: 100%;
-      width: 100%;
-      background-size: 96px; }
+      top: 0;
+      width: 100%; }
     .top-sites-list .top-site-outer .default-icon {
+      background-size: 32px;
       bottom: -6px;
       height: 42px;
       offset-inline-end: -6px;
       width: 42px;
-      background-size: 32px;
+      align-items: center;
       display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 20px; }
+      font-size: 20px;
+      justify-content: center; }
       .top-sites-list .top-site-outer .default-icon[data-fallback]::before {
         content: attr(data-fallback); }
     .top-sites-list .top-site-outer .title {
       font: message-box;
       height: 30px;
       line-height: 30px;
       text-align: center;
       width: 96px;
@@ -418,17 +421,17 @@ main {
       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:focus, .top-sites-list .top-site-outer .edit-menu:active {
+      .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%;
@@ -438,34 +441,31 @@ main {
         .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:hover .edit-menu, .top-sites-list .top-site-outer:focus .edit-menu, .top-sites-list .top-site-outer.active .edit-menu {
-      transform: scale(1);
-      opacity: 1; }
 
 .edit-topsites-wrapper .edit-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) {
     border-left: 1px solid #D7D7DB;
     border-right: 0; }
-  .edit-topsites-wrapper .edit-topsites-button:focus, .edit-topsites-wrapper .edit-topsites-button:active {
+  .edit-topsites-wrapper .edit-topsites-button:-moz-any(:active, :focus) {
     opacity: 1; }
   .edit-topsites-wrapper .edit-topsites-button button {
     background: none;
     border: 0;
     color: #737373;
     cursor: pointer;
     font-size: 12px;
     padding: 0; }
@@ -494,17 +494,17 @@ main {
   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; }
 
-section.top-sites:not(.collapsed):hover .edit-topsites-button {
+.top-sites:not(.collapsed):hover .edit-topsites-button {
   opacity: 1;
   pointer-events: auto; }
 
 .topsite-form .form-wrapper {
   margin: auto;
   max-width: 350px;
   padding: 15px 0; }
   .topsite-form .form-wrapper .field {
@@ -559,69 +559,69 @@ section.top-sites:not(.collapsed):hover 
   0% {
     opacity: 0;
     transform: translateY(15px); }
   100% {
     opacity: 1;
     transform: translateY(0); } }
 
 .sections-list .section-list {
-  margin: 0;
   display: grid;
+  grid-gap: 32px;
   grid-template-columns: repeat(auto-fit, 224px);
-  grid-gap: 32px; }
+  margin: 0; }
   @media (max-width: 544px) {
     .sections-list .section-list .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 544px) and (max-width: 800px) {
     .sections-list .section-list :nth-child(2n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
   @media (min-width: 800px) and (max-width: 1248px) {
     .sections-list .section-list :nth-child(3n) .context-menu {
+      margin-inline-end: 5px;
       margin-inline-start: auto;
-      margin-inline-end: 5px;
-      offset-inline-start: auto;
-      offset-inline-end: 0; } }
+      offset-inline-end: 0;
+      offset-inline-start: auto; } }
 
 .sections-list .section-empty-state {
-  width: 100%;
-  height: 266px;
+  border: 1px solid #D7D7DB;
+  border-radius: 3px;
   display: flex;
-  border: 1px solid #D7D7DB;
-  border-radius: 3px; }
+  height: 266px;
+  width: 100%; }
   .sections-list .section-empty-state .empty-state {
     margin: auto;
     max-width: 350px; }
     .sections-list .section-empty-state .empty-state .empty-state-icon {
-      background-size: 50px 50px;
+      background-position: center;
       background-repeat: no-repeat;
-      background-position: center;
+      background-size: 50px 50px;
+      -moz-context-properties: fill;
+      display: block;
       fill: rgba(12, 12, 13, 0.6);
-      -moz-context-properties: fill;
       height: 50px;
-      width: 50px;
       margin: 0 auto;
-      display: block; }
+      width: 50px; }
     .sections-list .section-empty-state .empty-state .empty-state-message {
-      margin-bottom: 0;
+      color: #737373;
       font-size: 13px;
-      color: #737373;
+      margin-bottom: 0;
       text-align: center; }
 
 .topic {
+  color: #737373;
   font-size: 12px;
-  color: #737373;
-  margin-top: 12px;
-  line-height: 1.6; }
+  line-height: 1.6;
+  margin-top: 12px; }
   @media (min-width: 800px) {
     .topic {
       line-height: 16px; } }
   .topic ul {
     margin: 0;
     padding: 0; }
     @media (min-width: 800px) {
       .topic ul {
@@ -651,110 +651,110 @@ section.top-sites:not(.collapsed):hover 
       fill: #008EA4;
       height: 16px;
       margin-inline-start: 5px;
       vertical-align: top;
       width: 12px; }
     .topic .topic-read-more:dir(rtl)::after {
       transform: scaleX(-1); }
   .topic::after {
-    content: "";
-    display: table;
-    clear: both; }
+    clear: both;
+    content: '';
+    display: table; }
 
 .search-wrapper {
   cursor: default;
   display: flex;
-  position: relative;
+  height: 35px;
   margin: 1px 1px 40px;
-  width: 100%;
-  height: 35px; }
+  position: relative;
+  width: 100%; }
   .search-wrapper input {
-    border: none;
+    border: 0;
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
     color: inherit;
+    font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
     padding-inline-start: 35px;
-    width: 100%;
-    font-size: 15px; }
+    width: 100%; }
   .search-wrapper:hover input {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
     box-shadow: 0 0 0 1px #0A84FF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
+    height: 100%;
+    offset-inline-start: 0;
     position: absolute;
-    offset-inline-start: 0;
-    height: 100%;
     width: 35px; }
   .search-wrapper .search-button {
     background: url("chrome://browser/skin/forward.svg") no-repeat center center;
-    border-radius: 0 3px 3px 0;
+    background-size: 16px 16px;
     border: 0;
-    width: 36px;
+    border-radius: 0 3px 3px 0;
+    -moz-context-properties: fill;
     fill: rgba(12, 12, 13, 0.4);
-    -moz-context-properties: fill;
-    background-size: 16px 16px;
     height: 100%;
     offset-inline-end: 0;
-    position: absolute; }
+    position: absolute;
+    width: 36px; }
     .search-wrapper .search-button:focus, .search-wrapper .search-button:hover {
       background-color: rgba(12, 12, 13, 0.1);
       cursor: pointer; }
     .search-wrapper .search-button:active {
       background-color: rgba(12, 12, 13, 0.2); }
     .search-wrapper .search-button:dir(rtl) {
       transform: scaleX(-1); }
   .search-wrapper .contentSearchSuggestionTable {
     border: 0;
     transform: translateY(2px); }
 
 .context-menu {
+  background: #F9F9FA;
+  border-radius: 5px;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   display: block;
-  position: absolute;
   font-size: 14px;
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
-  top: 6.75px;
-  offset-inline-start: 100%;
   margin-inline-start: 5px;
-  z-index: 10000;
-  background: #F9F9FA;
-  border-radius: 5px; }
+  offset-inline-start: 100%;
+  position: absolute;
+  top: 6.75px;
+  z-index: 10000; }
   .context-menu > ul {
+    list-style: none;
     margin: 0;
-    padding: 5px 0;
-    list-style: none; }
+    padding: 5px 0; }
     .context-menu > ul > li {
       margin: 0;
       width: 100%; }
       .context-menu > ul > li.separator {
-        margin: 5px 0;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
+        border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+        margin: 5px 0; }
       .context-menu > ul > li > a {
-        outline: none;
-        cursor: pointer;
+        align-items: center;
         color: inherit;
-        white-space: nowrap;
-        padding: 3px 12px;
+        cursor: pointer;
+        display: flex;
         line-height: 16px;
-        display: flex;
-        align-items: center; }
-        .context-menu > ul > li > a:hover, .context-menu > ul > li > a:focus {
+        outline: none;
+        padding: 3px 12px;
+        white-space: nowrap; }
+        .context-menu > ul > li > a:-moz-any(:focus, :hover) {
           background: #0060DF;
           color: #FFF; }
-          .context-menu > ul > li > a:hover a, .context-menu > ul > li > a:focus a {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
             color: #0C0C0D; }
-          .context-menu > ul > li > a:hover .icon, .context-menu > ul > li > a:focus .icon {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
             fill: #FFF; }
-          .context-menu > ul > li > a:hover:hover, .context-menu > ul > li > a:hover:focus, .context-menu > ul > li > a:focus:hover, .context-menu > ul > li > a:focus:focus {
+          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
             color: #FFF; }
 
 .prefs-pane {
   color: #4A4A4F;
   font-size: 14px;
   line-height: 21px; }
   .prefs-pane .sidebar {
     background: #FFF;
@@ -854,79 +854,79 @@ section.top-sites:not(.collapsed):hover 
     offset-inline-start: 0;
     position: absolute;
     top: 0;
     width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after,
   .prefs-pane [type='checkbox']:checked + label::after {
     background: url("chrome://global/skin/in-content/check.svg") no-repeat center center;
     content: '';
+    -moz-context-properties: fill, stroke;
+    fill: #0060DF;
     height: 21px;
     offset-inline-start: 0;
     position: absolute;
+    stroke: none;
     top: 0;
-    width: 21px;
-    -moz-context-properties: fill, stroke;
-    fill: #0060DF;
-    stroke: none; }
+    width: 21px; }
   .prefs-pane [type='checkbox']:not(:checked) + label::after {
     opacity: 0; }
   .prefs-pane [type='checkbox']:checked + label::after {
     opacity: 1; }
   .prefs-pane [type='checkbox']:not(:disabled) + label:hover::before {
     border: 1px solid #0060DF; }
   .prefs-pane [type='checkbox']:not(:disabled):checked:focus + label::before,
   .prefs-pane [type='checkbox']:not(:disabled):not(:checked):focus + label::before {
     border: 1px dotted #0060DF; }
 
 .prefs-pane-button button {
   background-color: transparent;
   border: 0;
   cursor: pointer;
   fill: rgba(12, 12, 13, 0.6);
+  offset-inline-end: 15px;
   padding: 15px;
   position: fixed;
-  offset-inline-end: 15px;
   top: 15px;
   z-index: 12001; }
   .prefs-pane-button button:hover {
     background-color: #EDEDF0; }
   .prefs-pane-button button:active {
     background-color: #F9F9FA; }
 
 .confirmation-dialog .modal {
-  position: fixed;
-  width: 400px;
-  top: 20%;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
   left: 50%;
   margin-left: -200px;
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.08); }
+  position: fixed;
+  top: 20%;
+  width: 400px; }
 
 .confirmation-dialog section {
   margin: 0; }
 
 .confirmation-dialog .modal-message {
+  display: flex;
   padding: 16px;
-  padding-bottom: 0;
-  display: flex; }
+  padding-bottom: 0; }
   .confirmation-dialog .modal-message p {
     margin: 0;
     margin-bottom: 16px; }
 
 .confirmation-dialog .actions {
-  padding: 0px 16px 0 16px;
-  border: none;
+  border: 0;
+  display: flex;
   flex-wrap: nowrap;
-  display: flex; }
+  padding: 0 16px; }
   .confirmation-dialog .actions button {
     margin-inline-end: 16px;
     width: 50%; }
     .confirmation-dialog .actions button.done {
-      margin-inline-start: 0;
-      margin-inline-end: 0; }
+      margin-inline-end: 0;
+      margin-inline-start: 0; }
 
 .confirmation-dialog .icon {
   margin-inline-end: 16px; }
 
 .modal-overlay {
   background: #EDEDF0;
   height: 100%;
   left: 0;
@@ -940,142 +940,142 @@ section.top-sites:not(.collapsed):hover 
   background: #FFF;
   border: 1px solid #D7D7DB;
   border-radius: 5px;
   font-size: 15px;
   z-index: 11002; }
 
 .card-outer {
   background: #FFF;
+  border-radius: 3px;
   display: inline-block;
+  height: 266px;
   margin-inline-end: 32px;
-  width: 224px;
-  border-radius: 3px;
-  height: 266px;
-  position: relative; }
+  position: relative;
+  width: 224px; }
   .card-outer .context-menu-button {
-    cursor: pointer;
-    position: absolute;
-    top: -13.5px;
-    offset-inline-end: -13.5px;
-    width: 27px;
-    height: 27px;
+    background-clip: padding-box;
     background-color: #FFF;
     background-image: url("chrome://browser/skin/page-action.svg");
     background-position: 55%;
-    background-clip: padding-box;
     border: 1px solid #B1B1B3;
     border-radius: 100%;
     box-shadow: 0 2px rgba(12, 12, 13, 0.1);
+    cursor: pointer;
     fill: rgba(12, 12, 13, 0.8);
+    height: 27px;
+    offset-inline-end: -13.5px;
+    opacity: 0;
+    position: absolute;
+    top: -13.5px;
     transform: scale(0.25);
-    opacity: 0;
+    transition-duration: 200ms;
     transition-property: transform, opacity;
-    transition-duration: 200ms; }
-    .card-outer .context-menu-button:focus, .card-outer .context-menu-button:active {
-      transform: scale(1);
-      opacity: 1; }
+    width: 27px; }
+    .card-outer .context-menu-button:-moz-any(:active, :focus) {
+      opacity: 1;
+      transform: scale(1); }
   .card-outer.placeholder {
     background: transparent; }
     .card-outer.placeholder .card {
       box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); }
   .card-outer .card {
-    height: 100%;
     border-radius: 3px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); }
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
+    height: 100%; }
   .card-outer > a {
+    color: inherit;
     display: block;
-    color: inherit;
     height: 100%;
     outline: none;
     position: absolute;
     width: 224px; }
-    .card-outer > a.active .card, .card-outer > a:focus .card {
+    .card-outer > a:-moz-any(.active, :focus) .card {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
-    .card-outer > a.active .card-title, .card-outer > a:focus .card-title {
+    .card-outer > a:-moz-any(.active, :focus) .card-title {
       color: #0060DF; }
   .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) {
-    outline: none;
     box-shadow: 0 0 0 5px #D7D7DB;
-    transition: box-shadow 150ms; }
+    transition: box-shadow 150ms;
+    outline: none; }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .context-menu-button {
-      transform: scale(1);
-      opacity: 1; }
+      opacity: 1;
+      transform: scale(1); }
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: #0060DF; }
   .card-outer .card-preview-image-outer {
     background-color: #F9F9FA;
-    position: relative;
+    border-radius: 3px 3px 0 0;
     height: 122px;
-    border-radius: 3px 3px 0 0;
-    overflow: hidden; }
+    overflow: hidden;
+    position: relative; }
     .card-outer .card-preview-image-outer::after {
       border-bottom: 1px solid rgba(0, 0, 0, 0.05);
       bottom: 0;
-      content: " ";
+      content: '';
       position: absolute;
       width: 100%; }
     .card-outer .card-preview-image-outer .card-preview-image {
-      width: 100%;
-      height: 100%;
-      background-size: cover;
       background-position: center;
       background-repeat: no-repeat;
+      background-size: cover;
+      height: 100%;
       opacity: 0;
-      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1); }
+      transition: opacity 1s cubic-bezier(0.07, 0.95, 0, 1);
+      width: 100%; }
       .card-outer .card-preview-image-outer .card-preview-image.loaded {
         opacity: 1; }
   .card-outer .card-details {
     padding: 15px 16px 12px; }
     .card-outer .card-details.no-image {
       padding-top: 16px; }
   .card-outer .card-text {
-    overflow: hidden;
-    max-height: 78px; }
+    max-height: 78px;
+    overflow: hidden; }
     .card-outer .card-text.no-image {
       max-height: 192px; }
     .card-outer .card-text.no-host-name, .card-outer .card-text.no-context {
       max-height: 97px; }
     .card-outer .card-text.no-image.no-host-name, .card-outer .card-text.no-image.no-context {
       max-height: 211px; }
     .card-outer .card-text.no-host-name.no-context {
       max-height: 116px; }
     .card-outer .card-text.no-image.no-host-name.no-context {
       max-height: 230px; }
     .card-outer .card-text:not(.no-description) .card-title {
       max-height: 57px;
       overflow: hidden; }
   .card-outer .card-host-name {
     color: #737373;
     font-size: 10px;
+    overflow: hidden;
     padding-bottom: 4px;
-    text-transform: uppercase;
-    overflow: hidden;
-    text-overflow: ellipsis; }
+    text-overflow: ellipsis;
+    text-transform: uppercase; }
   .card-outer .card-title {
+    font-size: 14px;
+    line-height: 19px;
     margin: 0 0 2px;
-    font-size: 14px;
-    word-wrap: break-word;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-description {
     font-size: 12px;
+    line-height: 19px;
     margin: 0;
-    word-wrap: break-word;
     overflow: hidden;
-    line-height: 19px; }
+    word-wrap: break-word; }
   .card-outer .card-context {
+    bottom: 0;
+    color: #737373;
+    display: flex;
+    font-size: 11px;
+    left: 0;
     padding: 12px 16px 12px 14px;
     position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    color: #737373;
-    font-size: 11px;
-    display: flex; }
+    right: 0; }
   .card-outer .card-context-icon {
     fill: rgba(12, 12, 13, 0.6);
     margin-inline-end: 6px; }
   .card-outer .card-context-label {
     flex-grow: 1;
     line-height: 16px;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -1098,23 +1098,23 @@ section.top-sites:not(.collapsed):hover 
       .manual-migration-container p {
         align-self: center;
         display: flex;
         justify-content: space-between; } }
   .manual-migration-container .icon {
     display: none; }
     @media (min-width: 544px) {
       .manual-migration-container .icon {
+        align-self: center;
         display: block;
         fill: rgba(12, 12, 13, 0.6);
-        margin-inline-end: 6px;
-        align-self: center; } }
+        margin-inline-end: 6px; } }
 
 .manual-migration-actions {
-  border: none;
+  border: 0;
   display: block;
   flex-wrap: nowrap; }
   @media (min-width: 544px) {
     .manual-migration-actions {
       display: flex;
       justify-content: space-between;
       padding: 0; } }
   .manual-migration-actions button {
@@ -1126,102 +1126,102 @@ section.top-sites:not(.collapsed):hover 
 
 .collapsible-section .section-title .click-target {
   cursor: pointer;
   vertical-align: top;
   white-space: nowrap; }
 
 .collapsible-section .section-title .icon-arrowhead-down,
 .collapsible-section .section-title .icon-arrowhead-forward {
-  margin-top: -1px;
-  margin-inline-start: 8px; }
+  margin-inline-start: 8px;
+  margin-top: -1px; }
 
 .collapsible-section .section-top-bar {
   position: relative; }
   .collapsible-section .section-top-bar .section-info-option {
     offset-inline-end: 0;
     position: absolute;
     top: 0; }
   .collapsible-section .section-top-bar .info-option-icon {
     background-image: url("../data/content/assets/glyph-info-option-12.svg");
-    background-size: 12px 12px;
+    background-position: center;
     background-repeat: no-repeat;
-    background-position: center;
+    background-size: 12px 12px;
+    -moz-context-properties: fill;
+    display: inline-block;
     fill: rgba(12, 12, 13, 0.6);
-    -moz-context-properties: fill;
     height: 16px;
-    width: 16px;
-    display: inline-block;
     margin-bottom: -2px;
     opacity: 0;
-    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-    .collapsible-section .section-top-bar .info-option-icon:focus, .collapsible-section .section-top-bar .info-option-icon:active {
+    transition: opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    width: 16px; }
+    .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] {
+      background-color: rgba(12, 12, 13, 0.1);
+      border-radius: 1px;
+      box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
+      fill: rgba(12, 12, 13, 0.8); }
+      .collapsible-section .section-top-bar .info-option-icon[aria-expanded='true'] + .info-option {
+        opacity: 1;
+        transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+        visibility: visible; }
+    .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded='true']) + .info-option {
+      pointer-events: none; }
+    .collapsible-section .section-top-bar .info-option-icon:-moz-any(:active, :focus) {
       opacity: 1; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] {
-    background-color: rgba(12, 12, 13, 0.1);
-    border-radius: 1px;
-    box-shadow: 0 0 0 5px rgba(12, 12, 13, 0.1);
-    fill: rgba(12, 12, 13, 0.8); }
   .collapsible-section .section-top-bar .section-info-option .info-option {
-    visibility: hidden;
     opacity: 0;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
+    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1);
+    visibility: hidden; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after, .collapsible-section .section-top-bar .section-info-option .info-option::before {
-      content: "";
+      content: '';
       offset-inline-end: 0;
       position: absolute; }
     .collapsible-section .section-top-bar .section-info-option .info-option::before {
       background-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg");
       background-position: right 6px bottom;
       background-repeat: no-repeat;
       background-size: 20px 10px;
       height: 32px;
       top: -32px;
       width: 43px; }
     .collapsible-section .section-top-bar .section-info-option .info-option:dir(rtl)::before {
       background-position-x: 6px; }
     .collapsible-section .section-top-bar .section-info-option .info-option::after {
       height: 10px;
       offset-inline-start: 0;
       top: -10px; }
-  .collapsible-section .section-top-bar .info-option-icon[aria-expanded="true"] + .info-option {
-    visibility: visible;
-    opacity: 1;
-    transition: visibility 0.2s, opacity 0.2s cubic-bezier(0.07, 0.95, 0, 1); }
-  .collapsible-section .section-top-bar .info-option-icon:not([aria-expanded="true"]) + .info-option {
-    pointer-events: none; }
   .collapsible-section .section-top-bar .info-option {
-    z-index: 9999;
-    position: absolute;
     background: #FFF;
     border: 1px solid #D7D7DB;
     border-radius: 3px;
+    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
     font-size: 13px;
     line-height: 120%;
     margin-inline-end: -9px;
     offset-inline-end: 0;
+    padding: 24px;
+    position: absolute;
     top: 26px;
+    -moz-user-select: none;
     width: 320px;
-    padding: 24px;
-    box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
-    -moz-user-select: none; }
+    z-index: 9999; }
   .collapsible-section .section-top-bar .info-option-header {
     font-size: 15px;
     font-weight: 600; }
   .collapsible-section .section-top-bar .info-option-body {
     margin: 0;
     margin-top: 12px; }
   .collapsible-section .section-top-bar .info-option-link {
     color: #0060DF;
     margin-left: 7px; }
   .collapsible-section .section-top-bar .info-option-manage {
     margin-top: 24px; }
     .collapsible-section .section-top-bar .info-option-manage button {
-      background: none;
-      border: none;
+      background: 0;
+      border: 0;
       color: #0060DF;
       cursor: pointer;
       margin: 0;
       padding: 0; }
       .collapsible-section .section-top-bar .info-option-manage button::after {
         background-image: url("../data/content/assets/topic-show-more-12.svg");
         background-repeat: no-repeat;
         content: '';
@@ -1251,24 +1251,24 @@ section.top-sites:not(.collapsed):hover 
         width: 340px; } }
     @media (min-width: 800px) {
       .collapsible-section .section-disclaimer .section-disclaimer-text {
         width: 610px; } }
   .collapsible-section .section-disclaimer a {
     color: #008EA4;
     padding-left: 3px; }
   .collapsible-section .section-disclaimer button {
-    margin-top: 2px;
-    offset-inline-end: 0;
-    min-height: 26px;
-    max-width: 130px;
     background: #F9F9FA;
     border: 1px solid #B1B1B3;
     border-radius: 4px;
-    cursor: pointer; }
+    cursor: pointer;
+    margin-top: 2px;
+    max-width: 130px;
+    min-height: 26px;
+    offset-inline-end: 0; }
     .collapsible-section .section-disclaimer button:hover:not(.dismiss) {
       box-shadow: 0 0 0 5px #D7D7DB;
       transition: box-shadow 150ms; }
     @media (min-width: 416px) {
       .collapsible-section .section-disclaimer button {
         position: absolute; } }
 
 .collapsible-section .section-body {

--- a/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
+++ b/browser/extensions/activity-stream/data/content/activity-stream.bundle.js
@@ -89,17 +89,17 @@ const globalImportContext = typeof Windo
 
 
 // Create an object that avoids accidental differing key/value pairs:
 // {
 //   INIT: "INIT",
 //   UNINIT: "UNINIT"
 // }
 const actionTypes = {};
-for (const type of ["BLOCK_URL", "BOOKMARK_URL", "DELETE_BOOKMARK_BY_ID", "DELETE_HISTORY_URL", "DELETE_HISTORY_URL_CONFIRM", "DIALOG_CANCEL", "DIALOG_OPEN", "DISABLE_ONBOARDING", "INIT", "MIGRATION_CANCEL", "MIGRATION_COMPLETED", "MIGRATION_START", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_CHANGED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_DELETED", "PLACES_LINK_BLOCKED", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_FIREFOX_ACCOUNTS", "SNIPPETS_DATA", "SNIPPETS_RESET", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_ADD", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_EDIT", "TOP_SITES_PIN", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "UNINIT"]) {
+for (const type of ["BLOCK_URL", "BOOKMARK_URL", "DELETE_BOOKMARK_BY_ID", "DELETE_HISTORY_URL", "DELETE_HISTORY_URL_CONFIRM", "DIALOG_CANCEL", "DIALOG_OPEN", "DISABLE_ONBOARDING", "INIT", "MIGRATION_CANCEL", "MIGRATION_COMPLETED", "MIGRATION_START", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_CHANGED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_DELETED", "PLACES_LINK_BLOCKED", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_FIREFOX_ACCOUNTS", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_ADD", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_EDIT", "TOP_SITES_PIN", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "UNINIT"]) {
   actionTypes[type] = type;
 }
 
 // Helper function for creating routed actions between content and main
 // Not intended to be used by consumers
 function _RouteMessage(action, options) {
   const meta = action.meta ? Object.assign({}, action.meta) : {};
   if (!options || !options.from || !options.to) {
@@ -305,37 +305,37 @@ module.exports = ReactIntl;
 /***/ (function(module, exports) {
 
 module.exports = ReactRedux;
 
 /***/ }),
 /* 4 */
 /***/ (function(module, exports) {
 
-var g;
-
-// This works in non-strict mode
-g = (function() {
-	return this;
-})();
-
-try {
-	// This works if eval is allowed (see CSP)
-	g = g || Function("return this")() || (1,eval)("this");
-} catch(e) {
-	// This works if the window reference is available
-	if(typeof window === "object")
-		g = window;
-}
-
-// g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-module.exports = g;
+var g;
+
+// This works in non-strict mode
+g = (function() {
+	return this;
+})();
+
+try {
+	// This works if eval is allowed (see CSP)
+	g = g || Function("return this")() || (1,eval)("this");
+} catch(e) {
+	// This works if the window reference is available
+	if(typeof window === "object")
+		g = window;
+}
+
+// g can still be undefined, but nothing to do about it...
+// We return undefined, instead of nothing here, so it's
+// easier to handle this case. if(!global) { ...}
+
+module.exports = g;
 
 
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
 
 module.exports = {
   TOP_SITES_SOURCE: "TOP_SITES",
@@ -2468,21 +2468,16 @@ class Search extends React.PureComponent
       // more details)
       const searchSource = IS_NEWTAB ? "newtab" : "homepage";
 
       // gContentSearchController needs to exist as a global so that tests for
       // the existing about:home can find it; and so it allows these tests to pass.
       // In the future, when activity stream is default about:home, this can be renamed
       window.gContentSearchController = new ContentSearchUIController(input, input.parentNode, healthReportKey, searchSource);
       addEventListener("ContentSearchClient", this);
-
-      // Focus the search box if we are on about:home
-      if (!IS_NEWTAB) {
-        input.focus();
-      }
     } else {
       window.gContentSearchController = null;
       removeEventListener("ContentSearchClient", this);
     }
   }
 
   /*
    * Do not change the ID on the input field, as legacy newtab code
@@ -3764,18 +3759,19 @@ class SnippetsMap extends Map {
    */
   async blockSnippetById(id) {
     if (!id) {
       return;
     }
     let blockList = this.blockList;
     if (!blockList.includes(id)) {
       blockList.push(id);
+      this._dispatch(ac.SendToMain({ type: at.SNIPPETS_BLOCKLIST_UPDATED, data: blockList }));
+      await this.set("blockList", blockList);
     }
-    await this.set("blockList", blockList);
   }
 
   disableOnboarding() {
     this._dispatch(ac.SendToMain({ type: at.DISABLE_ONBOARDING }));
   }
 
   showFirefoxAccounts() {
     this._dispatch(ac.SendToMain({ type: at.SHOW_FIREFOX_ACCOUNTS }));
@@ -3888,16 +3884,17 @@ class SnippetsMap extends Map {
  *                    remote location, or else default snippets if the remote
  *                    snippets cannot be retrieved.
  */
 class SnippetsProvider {
   constructor(dispatch) {
     // Initialize the Snippets Map and attaches it to a global so that
     // the snippet payload can interact with it.
     global.gSnippetsMap = new SnippetsMap(dispatch);
+    this._onAction = this._onAction.bind(this);
   }
 
   get snippetsMap() {
     return global.gSnippetsMap;
   }
 
   async _refreshSnippets() {
     // Check if the cached version of of the snippets in snippetsMap. If it's too
@@ -3953,43 +3950,56 @@ class SnippetsProvider {
       throw new Error("No remote snippets were found in gSnippetsMap.");
     }
 
     if (typeof payload !== "string") {
       throw new Error("Snippet payload was incorrectly formatted");
     }
 
     // Note that injecting snippets can throw if they're invalid XML.
+    // eslint-disable-next-line no-unsanitized/property
     snippetsEl.innerHTML = payload;
 
     // Scripts injected by innerHTML are inactive, so we have to relocate them
     // through DOM manipulation to activate their contents.
     for (const scriptEl of snippetsEl.getElementsByTagName("script")) {
       const relocatedScript = document.createElement("script");
       relocatedScript.text = scriptEl.text;
       scriptEl.parentNode.replaceChild(relocatedScript, scriptEl);
     }
   }
 
+  _onAction(msg) {
+    if (msg.data.type === at.SNIPPET_BLOCKED) {
+      this.snippetsMap.set("blockList", msg.data.data);
+      document.getElementById("snippets-container").style.display = "none";
+    }
+  }
+
   /**
    * init - Fetch the snippet payload and show snippets
    *
    * @param  {obj} options
    * @param  {str} options.appData.snippetsURL  The URL from which we fetch snippets
    * @param  {int} options.appData.version  The current snippets version
    * @param  {str} options.elementId  The id of the element in which to inject snippets
    * @param  {bool} options.connect  Should gSnippetsMap connect to indexedDB?
    */
   async init(options) {
     Object.assign(this, {
       appData: {},
       elementId: "snippets",
       connect: true
     }, options);
 
+    // Add listener so we know when snippets are blocked on other pages
+    if (global.addMessageListener) {
+      global.addMessageListener("ActivityStream:MainToContent", this._onAction);
+    }
+
     // TODO: Requires enabling indexedDB on newtab
     // Restore the snippets map from indexedDB
     if (this.connect) {
       try {
         await this.snippetsMap.connect();
       } catch (e) {
         console.error(e); // eslint-disable-line no-console
       }
@@ -4014,16 +4024,19 @@ class SnippetsProvider {
 
     this._forceOnboardingVisibility(true);
     this.initialized = true;
   }
 
   uninit() {
     window.dispatchEvent(new Event(SNIPPETS_DISABLED_EVENT));
     this._forceOnboardingVisibility(false);
+    if (global.removeMessageListener) {
+      global.removeMessageListener("ActivityStream:MainToContent", this._onAction);
+    }
     this.initialized = false;
   }
 }
 
 /**
  * addSnippetsSubscriber - Creates a SnippetsProvider that Initializes
  *                         when the store has received the appropriate
  *                         Snippet data.