Merge branch 'master' into Basilisk-release

39 files changed, 4433 insertions, 4069 deletions

diff --git a/application/basilisk/app/blocklist.xml b/application/basilisk/app/blocklist.xml
index 239fe43a4..435d0e78f 100644
--- a/application/basilisk/app/blocklist.xml
+++ b/application/basilisk/app/blocklist.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<blocklist lastupdate="1521130300000" xmlns="http://www.mozilla.org/2006/addons-blocklist">
+<blocklist lastupdate="1547041082000" xmlns="http://www.mozilla.org/2006/addons-blocklist">
   <emItems>
+    <!-- Basilisk -->
+    <!-- Inherited malware items -->
     <emItem blockID="i988" id="{b12785f5-d8d0-4530-a3ea-5c4263b85bef}">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="1"/>
diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js
index cff5f599f..ff1f1fbc2 100644
--- a/application/basilisk/app/profile/basilisk.js
+++ b/application/basilisk/app/profile/basilisk.js
@@ -1051,6 +1051,9 @@ sticky_pref("browser.newtabpage.enhanced", false);
 // enables Activity Stream inspired layout
 pref("browser.newtabpage.compact", false);
 
+// Disables capturing of page thumbnails
+pref("browser.pagethumbnails.capturing_disabled", false);
+
 // enables showing basic placeholders for missing thumbnails
 pref("browser.newtabpage.thumbnailPlaceholder", false);
 
diff --git a/application/basilisk/base/content/browser-fullScreenAndPointerLock.js b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
index ebe55377f..b26a31f78 100644
--- a/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
+++ b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
@@ -322,15 +322,9 @@ var FullScreen = {
       document.addEventListener("popuphidden", this._setPopupOpen, false);
       // If it is not safe to collapse, add the mouse position tracker or
       // else it won't be possible to hide the navigation toolbox again
-      if (!this._safeToCollapse()) {
-        let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-        this._mouseTargetRect = {
-          top: rect.top + 50,
-          bottom: rect.bottom,
-          left: rect.left,
-          right: rect.right
-        };
-        MousePosTracker.addListener(this);
+      if (gPrefService.getBoolPref("browser.fullscreen.autohide")) {
+        gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                  this._collapseCallback, false);
       }
       // In DOM fullscreen mode, we hide toolbars with CSS
       if (!document.fullscreenElement)
@@ -468,7 +462,8 @@ var FullScreen = {
 
   cleanup: function () {
     if (!window.fullScreen) {
-      MousePosTracker.removeListener(this);
+      gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                   this._collapseCallback, false);
       document.removeEventListener("keypress", this._keyToggleCallback, false);
       document.removeEventListener("popupshown", this._setPopupOpen, false);
       document.removeEventListener("popuphidden", this._setPopupOpen, false);
@@ -497,17 +492,12 @@ var FullScreen = {
                  .getInterface(Ci.nsIDOMWindowUtils);
   },
 
-  getMouseTargetRect: function()
-  {
-    return this._mouseTargetRect;
-  },
-
   // Event callbacks
   _expandCallback: function()
   {
     FullScreen.showNavToolbox();
   },
-  onMouseEnter: function()
+  _collapseCallback: function()
   {
     FullScreen.hideNavToolbox();
   },
@@ -588,14 +578,8 @@ var FullScreen = {
 
     // Track whether mouse is near the toolbox
     if (trackMouse && !this.useLionFullScreen) {
-      let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-      this._mouseTargetRect = {
-        top: rect.top + 50,
-        bottom: rect.bottom,
-        left: rect.left,
-        right: rect.right
-      };
-      MousePosTracker.addListener(this);
+      gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                this._collapseCallback, false);
     }
 
     this._isChromeCollapsed = false;
@@ -622,7 +606,8 @@ var FullScreen = {
     gNavToolbox.style.marginTop =
       -gNavToolbox.getBoundingClientRect().height + "px";
     this._isChromeCollapsed = true;
-    MousePosTracker.removeListener(this);
+    gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                 this._collapseCallback, false);
   },
 
   _updateToolbars: function (aEnterFS) {
diff --git a/application/basilisk/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js
index 3258159b6..d77e97f87 100644
--- a/application/basilisk/components/nsBrowserGlue.js
+++ b/application/basilisk/components/nsBrowserGlue.js
@@ -1080,24 +1080,19 @@ BrowserGlue.prototype = {
 
     // For any add-ons that were installed disabled and can be enabled offer
     // them to the user.
-    let win = RecentWindow.getMostRecentBrowserWindow();
-    AddonManager.getAllAddons(addons => {
-      for (let addon of addons) {
-        // If this add-on has already seen (or seen is undefined for non-XPI
-        // add-ons) then skip it.
-        if (addon.seen !== false) {
-          continue;
-        }
-
-        // If this add-on cannot be enabled (either already enabled or
-        // appDisabled) then skip it.
-        if (!(addon.permissions & AddonManager.PERM_CAN_ENABLE)) {
-          continue;
-        }
-
-        win.openUILinkIn("about:newaddon?id=" + addon.id, "tab");
-      }
-    });
+    let changedIDs = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_INSTALLED);
+    if (changedIDs.length > 0) {
+      let win = this.getMostRecentBrowserWindow();
+      AddonManager.getAddonsByIDs(changedIDs, function(aAddons) {
+        aAddons.forEach(function(aAddon) {
+          // If the add-on isn't user disabled or can't be enabled then skip it.
+          if (!aAddon.userDisabled || !(aAddon.permissions & AddonManager.PERM_CAN_ENABLE))
+            return;
+
+          win.openUILinkIn("about:newaddon?id=" + aAddon.id, "tab");
+        })
+      });
+    }
 
     let signingRequired;
     if (AppConstants.MOZ_REQUIRE_SIGNING) {
@@ -1110,6 +1105,11 @@ BrowserGlue.prototype = {
       let disabledAddons = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_DISABLED);
       AddonManager.getAddonsByIDs(disabledAddons, (addons) => {
         for (let addon of addons) {
+          // WEs return null, skip.
+          if (!addon) {
+            continue;
+          }
+          
           if (addon.type == "experiment")
             continue;
 
diff --git a/application/basilisk/components/preferences/connection.js b/application/basilisk/components/preferences/connection.js
index f6b395a2d..349139bed 100644
--- a/application/basilisk/components/preferences/connection.js
+++ b/application/basilisk/components/preferences/connection.js
@@ -76,7 +76,7 @@ var gConnectionsDialog = {
     var autologinProxyPref = document.getElementById("signon.autologin.proxy");
     autologinProxyPref.disabled = proxyTypePref.value == 0;
     var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
-    noProxiesPref.disabled = proxyTypePref.value != 1;
+    noProxiesPref.disabled = proxyTypePref.value == 0;
 
     var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
     autoconfigURLPref.disabled = proxyTypePref.value != 2;
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 62aa1a84f..cd18bdb94 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -55,7 +55,7 @@ MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBRTC=1
-MOZ_WEBEXTENSIONS=1
+MOZ_WEBEXTENSIONS=
 MOZ_DEVTOOLS=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_SYNC=1
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 485bc4917..cebcb6796 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -58,8 +58,8 @@
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
-#ifdef MOZ_UPDATER
 @RESPATH@/update.locale
+#ifdef MOZ_UPDATER
 @RESPATH@/updater.ini
 #endif
 
diff --git a/application/basilisk/modules/WindowsPreviewPerTab.jsm b/application/basilisk/modules/WindowsPreviewPerTab.jsm
index 6586b5d3b..81c2f229f 100644
--- a/application/basilisk/modules/WindowsPreviewPerTab.jsm
+++ b/application/basilisk/modules/WindowsPreviewPerTab.jsm
@@ -597,6 +597,7 @@ TabWindow.prototype = {
     "file", "chrome", "resource", "about"
   ]),
   onLinkIconAvailable: function (aBrowser, aIconURL) {
+    let self = this;
     let requestURL = null;
     if (aIconURL) {
       let shouldRequestFaviconURL = true;
@@ -613,15 +614,15 @@ TabWindow.prototype = {
     let isDefaultFavicon = !requestURL;
     getFaviconAsImage(
       requestURL,
-      PrivateBrowsingUtils.isWindowPrivate(this.win),
+      PrivateBrowsingUtils.isWindowPrivate(self.win),
       img => {
-        let index = this.tabbrowser.browsers.indexOf(aBrowser);
+        let index = self.tabbrowser.browsers.indexOf(aBrowser);
         // Only add it if we've found the index and the URI is still the same.
         // The tab could have closed, and there's no guarantee the icons
         // will have finished fetching 'in order'.
         if (index != -1) {
-          let tab = this.tabbrowser.tabs[index];
-          let preview = this.previews.get(tab);
+          let tab = self.tabbrowser.tabs[index];
+          let preview = self.previews.get(tab);
           if (tab.getAttribute("image") == aIconURL ||
               (!preview.icon && isDefaultFavicon)) {
             preview.icon = img;
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 1c6016f0f..9a6a9fdc9 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -1072,6 +1072,8 @@ pref("prompts.tab_modal.focusSwitch", true);
 
 // Defines the url to be used for new tabs.
 pref("browser.newtab.url", "about:logopage");
+pref("browser.newtab.choice", 1);
+
 // Activates preloading of the new tab url.
 pref("browser.newtab.preload", false);
 
@@ -1081,6 +1083,9 @@ pref("browser.newtabpage.enabled", true);
 // XXX: Remove this when "enhanced" tiles are dead
 pref("browser.newtabpage.enhanced", false);
 
+// Disables capturing of page thumbnails
+pref("browser.pagethumbnails.capturing_disabled", false);
+
 // enables showing basic placeholders for missing thumbnails
 pref("browser.newtabpage.thumbnailPlaceholder", false);
 
diff --git a/application/palemoon/base/content/browser-fullScreen.js b/application/palemoon/base/content/browser-fullScreen.js
index b1235a8d3..e816ce5c1 100644
--- a/application/palemoon/base/content/browser-fullScreen.js
+++ b/application/palemoon/base/content/browser-fullScreen.js
@@ -53,17 +53,9 @@ var FullScreen = {
       document.addEventListener("popupshown", this._setPopupOpen, false);
       document.addEventListener("popuphidden", this._setPopupOpen, false);
       this._shouldAnimate = true;
-      // If it is not safe to collapse, add the mouse position tracker or
-      // else it won't be possible to hide the navigation toolbox again
-      if (!this._safeToCollapse(document.mozFullScreen)) {
-        let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-        this._mouseTargetRect = {
-          top: rect.top + 50,
-          bottom: rect.bottom,
-          left: rect.left,
-          right: rect.right
-        };
-        MousePosTracker.addListener(this);
+      if (gPrefService.getBoolPref("browser.fullscreen.autohide")) {
+        gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                  this._collapseCallback, false);
       }
       // We don't animate the toolbar collapse if in DOM full-screen mode,
       // as the size of the content area would still be changing after the
@@ -149,7 +141,8 @@ var FullScreen = {
 
   cleanup: function () {
     if (!window.fullScreen) {
-      MousePosTracker.removeListener(this);
+      gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                   this._collapseCallback, false);
       document.removeEventListener("keypress", this._keyToggleCallback, false);
       document.removeEventListener("popupshown", this._setPopupOpen, false);
       document.removeEventListener("popuphidden", this._setPopupOpen, false);
@@ -164,17 +157,12 @@ var FullScreen = {
     }
   },
 
-  getMouseTargetRect: function()
-  {
-    return this._mouseTargetRect;
-  },
-
   // Event callbacks
   _expandCallback: function()
   {
     FullScreen.showNavToolbox();
   },
-  onMouseEnter: function()
+  _collapseCallback: function()
   {
     FullScreen.hideNavToolbox();
   },
@@ -328,14 +316,8 @@ var FullScreen = {
     // Track whether mouse is near the toolbox
     this._isChromeCollapsed = false;
     if (trackMouse) {
-      let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-      this._mouseTargetRect = {
-        top: rect.top + 50,
-        bottom: rect.bottom,
-        left: rect.left,
-        right: rect.right
-      };
-      MousePosTracker.addListener(this);
+      gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                this._collapseCallback, false);
     }
   },
 
@@ -378,7 +360,8 @@ var FullScreen = {
     gNavToolbox.style.marginTop =
       -gNavToolbox.getBoundingClientRect().height + "px";
     this._isChromeCollapsed = true;
-    MousePosTracker.removeListener(this);
+    gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                 this._collapseCallback, false);
   },
 
   showXULChrome: function(aTag, aShow)
diff --git a/application/palemoon/base/content/browser-title.css b/application/palemoon/base/content/browser-title.css
index 66b5e6731..5f7e77564 100644
--- a/application/palemoon/base/content/browser-title.css
+++ b/application/palemoon/base/content/browser-title.css
@@ -50,13 +50,6 @@
     right: -12px;
 }
 
-/* Lightweight Themes */
-
-#main-window:-moz-lwtheme::after {
-  color: inherit;
-  text-shadow: inherit;
-}
-
 /* Windows Classic theme */
 
 @media all and (-moz-windows-classic) {
@@ -192,6 +185,13 @@
   
 }
 
+/* Lightweight Themes */
+
+#main-window:-moz-lwtheme::after {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 
 /* Hide for small windows */
 
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 591d00fbb..eb4916e37 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -2456,7 +2456,7 @@ function BrowserOnAboutPageLoad(doc) {
       docElt.setAttribute("searchEnginePostData", engine.postDataString || "");
       docElt.setAttribute("searchEngineURL", engine.searchURL);
     }
-    updateSearchEngine();
+    Services.search.init(updateSearchEngine);
 
     // Listen for the event that's triggered when the user changes search engine.
     // At this point we simply reload about:home to reflect the change.
@@ -2481,7 +2481,7 @@ function BrowserOnAboutPageLoad(doc) {
       docElt.setAttribute("searchEnginePostData", engine.postDataString || "");
       docElt.setAttribute("searchEngineURL", engine.searchURL);
     }
-    updateSearchEngine();
+    Services.search.init(updateSearchEngine);
 
     // Listen for the event that's triggered when the user changes search engine.
     // At this point we simply reload about:newtab to reflect the change.
@@ -3046,7 +3046,9 @@ const DOMLinkHandler = {
                 /^(?:https?|ftp):/i.test(link.href) &&
                 !PrivateBrowsingUtils.isWindowPrivate(window)) {
               var engine = { title: link.title, href: link.href };
-              BrowserSearch.addEngine(engine, link.ownerDocument);
+              Services.search.init(function () {
+                BrowserSearch.addEngine(engine, link.ownerDocument);
+              });
               searchAdded = true;
             }
           }
diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm
index bd5d55a73..efe31ce05 100644
--- a/application/palemoon/components/downloads/DownloadsCommon.jsm
+++ b/application/palemoon/components/downloads/DownloadsCommon.jsm
@@ -21,15 +21,9 @@ this.EXPORTED_SYMBOLS = [
  *
  * DownloadsData
  * Retrieves the list of past and completed downloads from the underlying
- * Download Manager data, and provides asynchronous notifications allowing
+ * Downloads API data, and provides asynchronous notifications allowing
  * to build a consistent view of the available data.
  *
- * DownloadsDataItem
- * Represents a single item in the list of downloads.  This object either wraps
- * an existing nsIDownload from the Download Manager, or provides the same
- * information read directly from the downloads database, with the possibility
- * of querying the nsIDownload lazily, for performance reasons.
- *
  * DownloadsIndicatorData
  * This object registers itself with DownloadsData as a view, and transforms the
  * notifications it receives into overall status data, that is then broadcast to
@@ -57,6 +51,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "DownloadUIHelper",
                                   "resource://gre/modules/DownloadUIHelper.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
                                   "resource://gre/modules/DownloadUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+                                  "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm")
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
@@ -94,11 +90,6 @@ const kDownloadsStringsRequiringPluralForm = {
   otherDownloads2: true
 };
 
-XPCOMUtils.defineLazyGetter(this, "DownloadsLocalFileCtor", function () {
-  return Components.Constructor("@mozilla.org/file/local;1",
-                                "nsILocalFile", "initWithPath");
-});
-
 const kPartialDownloadSuffix = ".part";
 
 const kPrefBranch = Services.prefs.getBranch("browser.download.");
@@ -382,17 +373,27 @@ this.DownloadsCommon = {
   },
 
   /**
-   * Given an iterable collection of DownloadDataItems, generates and returns
+   * Helper function required because the Downloads Panel and the Downloads View
+   * don't share the controller yet.
+   */
+  removeAndFinalizeDownload(download) {
+    Downloads.getList(Downloads.ALL)
+             .then(list => list.remove(download))
+             .then(() => download.finalize(true))
+             .catch(Cu.reportError);
+  },
+
+  /**
+   * Given an iterable collection of Download objects, generates and returns
    * statistics about that collection.
    *
-   * @param aDataItems An iterable collection of DownloadDataItems.
+   * @param downloads An iterable collection of Download objects.
    *
    * @return Object whose properties are the generated statistics. Currently,
    *         we return the following properties:
    *
    *         numActive       : The total number of downloads.
    *         numPaused       : The total number of paused downloads.
-   *         numScanning     : The total number of downloads being scanned.
    *         numDownloading  : The total number of downloads being downloaded.
    *         totalSize       : The total size of all downloads once completed.
    *         totalTransferred: The total amount of transferred data for these
@@ -402,55 +403,48 @@ this.DownloadsCommon = {
    *                           complete.
    *         percentComplete : The percentage of bytes successfully downloaded.
    */
-  summarizeDownloads: function DC_summarizeDownloads(aDataItems)
-  {
+  summarizeDownloads(downloads) {
     let summary = {
       numActive: 0,
       numPaused: 0,
-      numScanning: 0,
       numDownloading: 0,
       totalSize: 0,
       totalTransferred: 0,
       // slowestSpeed is Infinity so that we can use Math.min to
       // find the slowest speed. We'll set this to 0 afterwards if
       // it's still at Infinity by the time we're done iterating all
-      // dataItems.
+      // download.
       slowestSpeed: Infinity,
       rawTimeLeft: -1,
       percentComplete: -1
     }
 
-    for (let dataItem of aDataItems) {
+    for (let download of downloads) {
       summary.numActive++;
-      switch (dataItem.state) {
-        case nsIDM.DOWNLOAD_PAUSED:
-          summary.numPaused++;
-          break;
-        case nsIDM.DOWNLOAD_SCANNING:
-          summary.numScanning++;
-          break;
-        case nsIDM.DOWNLOAD_DOWNLOADING:
-          summary.numDownloading++;
-          if (dataItem.maxBytes > 0 && dataItem.speed > 0) {
-            let sizeLeft = dataItem.maxBytes - dataItem.currBytes;
-            summary.rawTimeLeft = Math.max(summary.rawTimeLeft,
-                                           sizeLeft / dataItem.speed);
-            summary.slowestSpeed = Math.min(summary.slowestSpeed,
-                                            dataItem.speed);
-          }
-          break;
+
+      if (!download.stopped) {
+        summary.numDownloading++;
+        if (download.hasProgress && download.speed > 0) {
+          let sizeLeft = download.totalBytes - download.currentBytes;
+          summary.rawTimeLeft = Math.max(summary.rawTimeLeft,
+                                         sizeLeft / download.speed);
+          summary.slowestSpeed = Math.min(summary.slowestSpeed,
+                                          download.speed);
+        }
+      } else if (download.canceled && download.hasPartialData) {
+        summary.numPaused++;
       }
       // Only add to total values if we actually know the download size.
-      if (dataItem.maxBytes > 0 &&
-          dataItem.state != nsIDM.DOWNLOAD_CANCELED &&
-          dataItem.state != nsIDM.DOWNLOAD_FAILED) {
-        summary.totalSize += dataItem.maxBytes;
-        summary.totalTransferred += dataItem.currBytes;
+      if (download.succeeded) {
+        summary.totalSize += download.target.size;
+        summary.totalTransferred += download.target.size;
+      } else if (download.hasProgress) {
+        summary.totalSize += download.totalBytes;
+        summary.totalTransferred += download.currentBytes;
       }
     }
 
-    if (summary.numActive != 0 && summary.totalSize != 0 &&
-        summary.numActive != summary.numScanning) {
+    if (summary.totalSize != 0) {
       summary.percentComplete = (summary.totalTransferred /
                                  summary.totalSize) * 100;
     }
@@ -501,7 +495,7 @@ this.DownloadsCommon = {
 
   /**
    * Opens a downloaded file.
-   * If you've a dataItem, you should call dataItem.openLocalFile.
+   *
    * @param aFile
    *        the downloaded file to be opened.
    * @param aMimeInfo
@@ -574,7 +568,6 @@ this.DownloadsCommon = {
 
   /**
    * Show a downloaded file in the system file manager.
-   * If you have a dataItem, use dataItem.showLocalFile.
    *
    * @param aFile
    *        a downloaded file.
@@ -651,19 +644,12 @@ XPCOMUtils.defineLazyGetter(DownloadsCommon, "useJSTransfer", function () {
 function DownloadsDataCtor(aPrivate) {
   this._isPrivate = aPrivate;
 
-  // This Object contains all the available DownloadsDataItem objects, indexed by
-  // their globally unique identifier.  The identifiers of downloads that have
-  // been removed from the Download Manager data are still present, however the
-  // associated objects are replaced with the value "null".  This is required to
-  // prevent race conditions when populating the list asynchronously.
-  this.dataItems = {};
+  // Contains all the available Download objects and their integer state.
+  this.oldDownloadStates = new Map();
 
   // Array of view objects that should be notified when the available download
   // data changes.
   this._views = [];
-
-  // Maps Download objects to DownloadDataItem objects.
-  this._downloadToDataItemMap = new Map();
 }
 
 DownloadsDataCtor.prototype = {
@@ -690,12 +676,19 @@ DownloadsDataCtor.prototype = {
   },
 
   /**
+   * Iterator for all the available Download objects. This is empty until the
+   * data has been loaded using the JavaScript API for downloads.
+   */
+  get downloads() this.oldDownloadStates.keys(),
+
+  /**
    * True if there are finished downloads that can be removed from the list.
    */
   get canRemoveFinished()
   {
-    for (let [, dataItem] of Iterator(this.dataItems)) {
-      if (dataItem && !dataItem.inProgress) {
+    for (let download of this.downloads) {
+      // Stopped, paused, and failed downloads with partial data are removed.
+      if (download.stopped && !(download.canceled && download.hasPartialData)) {
         return true;
       }
     }
@@ -716,103 +709,87 @@ DownloadsDataCtor.prototype = {
   //////////////////////////////////////////////////////////////////////////////
   //// Integration with the asynchronous Downloads back-end
 
-  onDownloadAdded: function (aDownload)
-  {
-    let dataItem = new DownloadsDataItem(aDownload);
-    this._downloadToDataItemMap.set(aDownload, dataItem);
-    this.dataItems[dataItem.downloadGuid] = dataItem;
-
-    for (let view of this._views) {
-      view.onDataItemAdded(dataItem, true);
-    }
-
-    this._updateDataItemState(dataItem);
-  },
-
-  onDownloadChanged: function (aDownload)
-  {
-    let dataItem = this._downloadToDataItemMap.get(aDownload);
-    if (!dataItem) {
-      Cu.reportError("Download doesn't exist.");
-      return;
-    }
+  onDownloadAdded(download) {
+    // Download objects do not store the end time of downloads, as the Downloads
+    // API does not need to persist this information for all platforms. Once a
+    // download terminates on a Desktop browser, it becomes a history download,
+    // for which the end time is stored differently, as a Places annotation.
+    download.endTime = Date.now();
 
-    this._updateDataItemState(dataItem);
-  },
+    this.oldDownloadStates.set(download,
+                               DownloadsCommon.stateOfDownload(download));
 
-  onDownloadRemoved: function (aDownload)
-  {
-    let dataItem = this._downloadToDataItemMap.get(aDownload);
-    if (!dataItem) {
-      Cu.reportError("Download doesn't exist.");
-      return;
-    }
-
-    this._downloadToDataItemMap.delete(aDownload);
-    this.dataItems[dataItem.downloadGuid] = null;
     for (let view of this._views) {
-      view.onDataItemRemoved(dataItem);
-    }
-  },
-
-  /**
-   * Updates the given data item and sends related notifications.
-   */
-  _updateDataItemState: function (aDataItem)
-  {
-    let oldState = aDataItem.state;
-    let wasInProgress = aDataItem.inProgress;
-    let wasDone = aDataItem.done;
-
-    aDataItem.updateFromJSDownload();
-
-    if (wasInProgress && !aDataItem.inProgress) {
-      aDataItem.endTime = Date.now();
-    }
+      view.onDownloadAdded(download, true);
+    }
+  },
+
+  onDownloadChanged(download) {
+    let oldState = this.oldDownloadStates.get(download);
+    let newState = DownloadsCommon.stateOfDownload(download);
+    this.oldDownloadStates.set(download, newState);
+
+    if (oldState != newState) {
+      if (download.succeeded ||
+          (download.canceled && !download.hasPartialData) ||
+          download.error) {
+        // Store the end time that may be displayed by the views.
+        download.endTime = Date.now();
+
+        // This state transition code should actually be located in a Downloads
+        // API module (bug 941009).  Moreover, the fact that state is stored as
+        // annotations should be ideally hidden behind methods of
+        // nsIDownloadHistory (bug 830415).
+        if (!this._isPrivate) {
+          try {
+            let downloadMetaData = {
+              state: DownloadsCommon.stateOfDownload(download),
+              endTime: download.endTime,
+            };
+            if (download.succeeded) {
+              downloadMetaData.fileSize = download.target.size;
+            }
+  
+            PlacesUtils.annotations.setPageAnnotation(
+                          NetUtil.newURI(download.source.url),
+                          "downloads/metaData",
+                          JSON.stringify(downloadMetaData), 0,
+                          PlacesUtils.annotations.EXPIRE_WITH_HISTORY);
+          } catch (ex) {
+            Cu.reportError(ex);
+          }
+        }
+      }
 
-    if (oldState != aDataItem.state) {
       for (let view of this._views) {
         try {
-          view.getViewItem(aDataItem).onStateChange(oldState);
+          view.onDownloadStateChanged(download);
         } catch (ex) {
           Cu.reportError(ex);
         }
       }
 
-      // This state transition code should actually be located in a Downloads
-      // API module (bug 941009).  Moreover, the fact that state is stored as
-      // annotations should be ideally hidden behind methods of
-      // nsIDownloadHistory (bug 830415).
-      if (!this._isPrivate && !aDataItem.inProgress) {
-        try {
-          let downloadMetaData = { state: aDataItem.state,
-                                   endTime: aDataItem.endTime };
-          if (aDataItem.done) {
-            downloadMetaData.fileSize = aDataItem.maxBytes;
-          }
-
-          // RRR: Annotation service throws here. commented out for now.
-          /*PlacesUtils.annotations.setPageAnnotation(
-                        NetUtil.newURI(aDataItem.uri), "downloads/metaData",
-                        JSON.stringify(downloadMetaData), 0,
-                        PlacesUtils.annotations.EXPIRE_WITH_HISTORY);*/
-        } catch (ex) {
-          Cu.reportError(ex);
-        }
+      if (download.succeeded ||
+          (download.error && download.error.becauseBlocked)) {
+        this._notifyDownloadEvent("finish");
       }
     }
 
-    if (!aDataItem.newDownloadNotified) {
-      aDataItem.newDownloadNotified = true;
+    if (!download.newDownloadNotified) {
+      download.newDownloadNotified = true;
       this._notifyDownloadEvent("start");
     }
 
-    if (!wasDone && aDataItem.done) {
-      this._notifyDownloadEvent("finish");
+    for (let view of this._views) {
+      view.onDownloadChanged(download);
     }
+  },
+
+  onDownloadRemoved(download) {
+    this.oldDownloadStates.delete(download);
 
     for (let view of this._views) {
-      view.getViewItem(aDataItem).onProgressChange();
+      view.onDownloadRemoved(download);
     }
   },
 
@@ -864,19 +841,9 @@ DownloadsDataCtor.prototype = {
     //let loadedItemsArray = [dataItem
     //                        for each (dataItem in this.dataItems)
     //                        if (dataItem)];
-
-    let loadedItemsArray = [];
-
-    for each (let dataItem in this.dataItems) {
-      if (dataItem) {
-        loadedItemsArray.push(dataItem);
-      }
-    }
-
-    loadedItemsArray.sort(function(a, b) b.startTime - a.startTime);
-    loadedItemsArray.forEach(
-      function (dataItem) aView.onDataItemAdded(dataItem, false)
-    );
+    let downloadsArray = [...this.downloads];
+    downloadsArray.sort((a, b) => b.startTime - a.startTime);
+    downloadsArray.forEach(download => aView.onDownloadAdded(download, false));
 
     // Notify the view that all data is available unless loading is in progress.
     if (!this._pendingStatement) {
@@ -1328,410 +1295,6 @@ XPCOMUtils.defineLazyGetter(this, "DownloadsData", function() {
 });
 
 ////////////////////////////////////////////////////////////////////////////////
-//// DownloadsDataItem
-
-/**
- * Represents a single item in the list of downloads.  This object either wraps
- * an existing nsIDownload from the Download Manager, or provides the same
- * information read directly from the downloads database, with the possibility
- * of querying the nsIDownload lazily, for performance reasons.
- *
- * @param aSource
- *        Object containing the data with which the item should be initialized.
- *        This should implement either nsIDownload or mozIStorageRow.  If the
- *        JavaScript API for downloads is enabled, this is a Download object.
- */
-function DownloadsDataItem(aSource)
-{
-  this._initFromJSDownload(aSource);
-}
-
-DownloadsDataItem.prototype = {
-  /**
-   * The JavaScript API does not need identifiers for Download objects, so they
-   * are generated sequentially for the corresponding DownloadDataItem.
-   */
-  get _autoIncrementId() ++DownloadsDataItem.prototype.__lastId,
-  __lastId: 0,
-
-  /**
-   * Initializes this object from the JavaScript API for downloads.
-   *
-   * The endTime property is initialized to the current date and time.
-   *
-   * @param aDownload
-   *        The Download object with the current state.
-   */
-  _initFromJSDownload: function (aDownload)
-  {
-    this._download = aDownload;
-
-    this.downloadGuid = "id:" + this._autoIncrementId;
-    this.file = aDownload.target.path;
-    this.target = OS.Path.basename(aDownload.target.path);
-    this.uri = aDownload.source.url;
-    this.endTime = Date.now();
-
-    this.updateFromJSDownload();
-  },
-
-  /**
-   * Updates this object from the JavaScript API for downloads.
-   */
-  updateFromJSDownload: function ()
-  {
-    // Collapse state using the correct priority.
-    if (this._download.succeeded) {
-      this.state = nsIDM.DOWNLOAD_FINISHED;
-    } else if (this._download.error &&
-               this._download.error.becauseBlockedByParentalControls) {
-      this.state = nsIDM.DOWNLOAD_BLOCKED_PARENTAL;
-    } else if (this._download.error) {
-      this.state = nsIDM.DOWNLOAD_FAILED;
-    } else if (this._download.canceled && this._download.hasPartialData) {
-      this.state = nsIDM.DOWNLOAD_PAUSED;
-    } else if (this._download.canceled) {
-      this.state = nsIDM.DOWNLOAD_CANCELED;
-    } else if (this._download.stopped) {
-      this.state = nsIDM.DOWNLOAD_NOTSTARTED;
-    } else {
-      this.state = nsIDM.DOWNLOAD_DOWNLOADING;
-    }
-
-    this.referrer = this._download.source.referrer;
-    this.startTime = this._download.startTime;
-    this.currBytes = this._download.currentBytes;
-    this.resumable = this._download.hasPartialData;
-    this.speed = this._download.speed;
-
-    if (this._download.succeeded) {
-      // If the download succeeded, show the final size if available, otherwise
-      // use the last known number of bytes transferred.  The final size on disk
-      // will be available when bug 941063 is resolved.
-      this.maxBytes = this._download.hasProgress ?
-                             this._download.totalBytes :
-                             this._download.currentBytes;
-      this.percentComplete = 100;
-    } else if (this._download.hasProgress) {
-      // If the final size and progress are known, use them.
-      this.maxBytes = this._download.totalBytes;
-      this.percentComplete = this._download.progress;
-    } else {
-      // The download final size and progress percentage is unknown.
-      this.maxBytes = -1;
-      this.percentComplete = -1;
-    }
-  },
-
-  /**
-   * Initializes this object from a download object of the Download Manager.
-   *
-   * The endTime property is initialized to the current date and time.
-   *
-   * @param aDownload
-   *        The nsIDownload with the current state.
-   */
-  _initFromDownload: function DDI_initFromDownload(aDownload)
-  {
-    this._download = aDownload;
-
-    // Fetch all the download properties eagerly.
-    this.downloadGuid = aDownload.guid;
-    this.file = aDownload.target.spec;
-    this.target = aDownload.displayName;
-    this.uri = aDownload.source.spec;
-    this.referrer = aDownload.referrer && aDownload.referrer.spec;
-    this.state = aDownload.state;
-    this.startTime = Math.round(aDownload.startTime / 1000);
-    this.endTime = Date.now();
-    this.currBytes = aDownload.amountTransferred;
-    this.maxBytes = aDownload.size;
-    this.resumable = aDownload.resumable;
-    this.speed = aDownload.speed;
-    this.percentComplete = aDownload.percentComplete;
-  },
-
-  /**
-   * Initializes this object from a data row in the downloads database, without
-   * querying the associated nsIDownload object, to improve performance when
-   * loading the list of downloads asynchronously.
-   *
-   * When this object is initialized in this way, accessing the "download"
-   * property loads the underlying nsIDownload object synchronously, and should
-   * be avoided unless the object is really required.
-   *
-   * @param aStorageRow
-   *        The mozIStorageRow from the downloads database.
-   */
-  _initFromDataRow: function DDI_initFromDataRow(aStorageRow)
-  {
-    // Get the download properties from the data row.
-    this._download = null;
-    this.downloadGuid = aStorageRow.getResultByName("guid");
-    this.file = aStorageRow.getResultByName("target");
-    this.target = aStorageRow.getResultByName("name");
-    this.uri = aStorageRow.getResultByName("source");
-    this.referrer = aStorageRow.getResultByName("referrer");
-    this.state = aStorageRow.getResultByName("state");
-    this.startTime = Math.round(aStorageRow.getResultByName("startTime") / 1000);
-    this.endTime = Math.round(aStorageRow.getResultByName("endTime") / 1000);
-    this.currBytes = aStorageRow.getResultByName("currBytes");
-    this.maxBytes = aStorageRow.getResultByName("maxBytes");
-
-    // Now we have to determine if the download is resumable, but don't want to
-    // access the underlying download object unnecessarily.  The only case where
-    // the property is relevant is when we are currently downloading data, and
-    // in this case the download object is already loaded in memory or will be
-    // loaded very soon in any case.  In all the other cases, including a paused
-    // download, we assume that the download is resumable.  The property will be
-    // updated as soon as the underlying download state changes.
-
-    // We'll start by assuming we're resumable, and then if we're downloading,
-    // update resumable property in case we were wrong.
-    this.resumable = true;
-
-    if (this.state == nsIDM.DOWNLOAD_DOWNLOADING) {
-      this.getDownload(function(aDownload) {
-        this.resumable = aDownload.resumable;
-      }.bind(this));
-    }
-
-    // Compute the other properties without accessing the download object.
-    this.speed = 0;
-    this.percentComplete = this.maxBytes <= 0
-                           ? -1
-                           : Math.round(this.currBytes / this.maxBytes * 100);
-  },
-
-  /**
-   * Asynchronous getter for the download object corresponding to this data item.
-   *
-   * @param aCallback
-   *        A callback function which will be called when the download object is
-   *        available.  It should accept one argument which will be the download
-   *        object.
-   */
-  getDownload: function DDI_getDownload(aCallback) {
-    if (this._download) {
-      // Return the download object asynchronously to the caller
-      let download = this._download;
-      Services.tm.mainThread.dispatch(function () aCallback(download),
-                                      Ci.nsIThread.DISPATCH_NORMAL);
-    } else {
-      Services.downloads.getDownloadByGUID(this.downloadGuid,
-                                           function(aStatus, aResult) {
-        if (!Components.isSuccessCode(aStatus)) {
-          Cu.reportError(
-            new Components.Exception("Cannot retrieve download for GUID: " +
-                                     this.downloadGuid));
-        } else {
-          this._download = aResult;
-          aCallback(aResult);
-        }
-      }.bind(this));
-    }
-  },
-
-  /**
-   * Indicates whether the download is proceeding normally, and not finished
-   * yet.  This includes paused downloads.  When this property is true, the
-   * "progress" property represents the current progress of the download.
-   */
-  get inProgress()
-  {
-    return [
-      nsIDM.DOWNLOAD_NOTSTARTED,
-      nsIDM.DOWNLOAD_QUEUED,
-      nsIDM.DOWNLOAD_DOWNLOADING,
-      nsIDM.DOWNLOAD_PAUSED,
-      nsIDM.DOWNLOAD_SCANNING,
-    ].indexOf(this.state) != -1;
-  },
-
-  /**
-   * This is true during the initial phases of a download, before the actual
-   * download of data bytes starts.
-   */
-  get starting()
-  {
-    return this.state == nsIDM.DOWNLOAD_NOTSTARTED ||
-           this.state == nsIDM.DOWNLOAD_QUEUED;
-  },
-
-  /**
-   * Indicates whether the download is paused.
-   */
-  get paused()
-  {
-    return this.state == nsIDM.DOWNLOAD_PAUSED;
-  },
-
-  /**
-   * Indicates whether the download is in a final state, either because it
-   * completed successfully or because it was blocked.
-   */
-  get done()
-  {
-    return [
-      nsIDM.DOWNLOAD_FINISHED,
-      nsIDM.DOWNLOAD_BLOCKED_PARENTAL,
-      nsIDM.DOWNLOAD_BLOCKED_POLICY,
-      nsIDM.DOWNLOAD_DIRTY,
-    ].indexOf(this.state) != -1;
-  },
-
-  /**
-   * Indicates whether the download is finished and can be opened.
-   */
-  get openable()
-  {
-    return this.state == nsIDM.DOWNLOAD_FINISHED;
-  },
-
-  /**
-   * Indicates whether the download stopped because of an error, and can be
-   * resumed manually.
-   */
-  get canRetry()
-  {
-    return this.state == nsIDM.DOWNLOAD_CANCELED ||
-           this.state == nsIDM.DOWNLOAD_FAILED;
-  },
-
-  /**
-   * Returns the nsILocalFile for the download target.
-   *
-   * @throws if the native path is not valid.  This can happen if the same
-   *         profile is used on different platforms, for example if a native
-   *         Windows path is stored and then the item is accessed on a Mac.
-   */
-  get localFile()
-  {
-    return this._getFile(this.file);
-  },
-
-  /**
-   * Returns the nsILocalFile for the partially downloaded target.
-   *
-   * @throws if the native path is not valid.  This can happen if the same
-   *         profile is used on different platforms, for example if a native
-   *         Windows path is stored and then the item is accessed on a Mac.
-   */
-  get partFile()
-  {
-    return this._getFile(this.file + kPartialDownloadSuffix);
-  },
-
-  /**
-   * Returns an nsILocalFile for aFilename. aFilename might be a file URL or
-   * a native path.
-   *
-   * @param aFilename the filename of the file to retrieve.
-   * @return an nsILocalFile for the file.
-   * @throws if the native path is not valid.  This can happen if the same
-   *         profile is used on different platforms, for example if a native
-   *         Windows path is stored and then the item is accessed on a Mac.
-   * @note This function makes no guarantees about the file's existence -
-   *       callers should check that the returned file exists.
-   */
-  _getFile: function DDI__getFile(aFilename)
-  {
-    // The download database may contain targets stored as file URLs or native
-    // paths.  This can still be true for previously stored items, even if new
-    // items are stored using their file URL.  See also bug 239948 comment 12.
-    if (aFilename.startsWith("file:")) {
-      // Assume the file URL we obtained from the downloads database or from the
-      // "spec" property of the target has the UTF-8 charset.
-      let fileUrl = NetUtil.newURI(aFilename).QueryInterface(Ci.nsIFileURL);
-      return fileUrl.file.clone().QueryInterface(Ci.nsILocalFile);
-    } else {
-      // The downloads database contains a native path.  Try to create a local
-      // file, though this may throw an exception if the path is invalid.
-      return new DownloadsLocalFileCtor(aFilename);
-    }
-  },
-
-  /**
-   * Open the target file for this download.
-   *
-   * @param aOwnerWindow
-   *        The window with which the required action is associated.
-   * @throws if the file cannot be opened.
-   */
-  openLocalFile: function DDI_openLocalFile(aOwnerWindow) {
-    this._download.launch().then(null, Cu.reportError);
-    return;
-  },
-
-  /**
-   * Show the downloaded file in the system file manager.
-   */
-  showLocalFile: function DDI_showLocalFile() {
-    DownloadsCommon.showDownloadedFile(this.localFile);
-  },
-
-  /**
-   * Resumes the download if paused, pauses it if active.
-   * @throws if the download is not resumable or if has already done.
-   */
-  togglePauseResume: function DDI_togglePauseResume() {
-    if (this._download.stopped) {
-      this._download.start();
-    } else {
-      this._download.cancel();
-    }
-    return;
-  },
-
-  /**
-   * Attempts to retry the download.
-   * @throws if we cannot.
-   */
-  retry: function DDI_retry() {
-    this._download.start();
-    return;
-  },
-
-  /**
-   * Support function that deletes the local file for a download. This is
-   * used in cases where the Download Manager service doesn't delete the file
-   * from disk when cancelling. See bug 732924.
-   */
-  _ensureLocalFileRemoved: function DDI__ensureLocalFileRemoved()
-  {
-    try {
-      let localFile = this.localFile;
-      if (localFile.exists()) {
-        localFile.remove(false);
-      }
-    } catch (ex) { }
-  },
-
-  /**
-   * Cancels the download.
-   * @throws if the download is already done.
-   */
-  cancel: function() {
-    this._download.cancel();
-    this._download.removePartialData().then(null, Cu.reportError);
-    return;
-  },
-
-  /**
-   * Remove the download.
-   */
-  remove: function DDI_remove() {
-    let promiseList = this._download.source.isPrivate
-                        ? Downloads.getList(Downloads.PUBLIC)
-                        : Downloads.getList(Downloads.PRIVATE);
-    promiseList.then(list => list.remove(this._download))
-               .then(() => this._download.finalize(true))
-               .then(null, Cu.reportError);
-    return;
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
 //// DownloadsViewPrototype
 
 /**
@@ -1858,9 +1421,9 @@ const DownloadsViewPrototype = {
    * Called when a new download data item is available, either during the
    * asynchronous data load or when a new download is started.
    *
-   * @param aDataItem
-   *        DownloadsDataItem object that was just added.
-   * @param aNewest
+   * @param download
+   *        Download object that was just added.
+   * @param newest
    *        When true, indicates that this item is the most recent and should be
    *        added in the topmost position.  This happens when a new download is
    *        started.  When false, indicates that the item is the least recent
@@ -1869,37 +1432,46 @@ const DownloadsViewPrototype = {
    *
    * @note Subclasses should override this.
    */
-  onDataItemAdded: function DVP_onDataItemAdded(aDataItem, aNewest)
-  {
+  onDownloadAdded(download, newest) {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
   },
 
   /**
-   * Called when a data item is removed, ensures that the widget associated with
-   * the view item is removed from the user interface.
+   * Called when the overall state of a Download has changed. In particular,
+   * this is called only once when the download succeeds or is blocked
+   * permanently, and is never called if only the current progress changed.
    *
-   * @param aDataItem
-   *        DownloadsDataItem object that is being removed.
+   * The onDownloadChanged notification will always be sent afterwards.
    *
    * @note Subclasses should override this.
    */
-  onDataItemRemoved: function DVP_onDataItemRemoved(aDataItem)
-  {
+  onDownloadStateChanged(download) {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
   },
 
   /**
-   * Returns the view item associated with the provided data item for this view.
+   * Called every time any state property of a Download may have changed,
+   * including progress properties.
    *
-   * @param aDataItem
-   *        DownloadsDataItem object for which the view item is requested.
+   * Note that progress notification changes are throttled at the Downloads.jsm
+   * API level, and there is no throttling mechanism in the front-end.
+   *
+   * @note Subclasses should override this.
+   */
+  onDownloadChanged(download) {
+    throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+  },
+
+  /**
+   * Called when a data item is removed, ensures that the widget associated with
+   * the view item is removed from the user interface.
    *
-   * @return Object that can be used to notify item status events.
+   * @param download
+   *        Download object that is being removed.
    *
    * @note Subclasses should override this.
    */
-  getViewItem: function DID_getViewItem(aDataItem)
-  {
+  onDownloadRemoved(download) {
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
   },
 
@@ -1963,9 +1535,6 @@ DownloadsIndicatorDataCtor.prototype = {
   //////////////////////////////////////////////////////////////////////////////
   //// Callback functions from DownloadsData
 
-  /**
-   * Called after data loading finished.
-   */
   onDataLoadCompleted: function DID_onDataLoadCompleted()
   {
     DownloadsViewPrototype.onDataLoadCompleted.call(this);
@@ -1982,69 +1551,28 @@ DownloadsIndicatorDataCtor.prototype = {
     this._itemCount = 0;
   },
 
-  /**
-   * Called when a new download data item is available, either during the
-   * asynchronous data load or when a new download is started.
-   *
-   * @param aDataItem
-   *        DownloadsDataItem object that was just added.
-   * @param aNewest
-   *        When true, indicates that this item is the most recent and should be
-   *        added in the topmost position.  This happens when a new download is
-   *        started.  When false, indicates that the item is the least recent
-   *        with regard to the items that have been already added. The latter
-   *        generally happens during the asynchronous data load.
-   */
-  onDataItemAdded: function DID_onDataItemAdded(aDataItem, aNewest)
-  {
+  onDownloadAdded(download, newest) {
     this._itemCount++;
     this._updateViews();
   },
 
-  /**
-   * Called when a data item is removed, ensures that the widget associated with
-   * the view item is removed from the user interface.
-   *
-   * @param aDataItem
-   *        DownloadsDataItem object that is being removed.
-   */
-  onDataItemRemoved: function DID_onDataItemRemoved(aDataItem)
-  {
-    this._itemCount--;
-    this._updateViews();
-  },
+  onDownloadStateChanged(download) {
+    if (download.succeeded || download.error) {
+      this.attention = true;
+    }
 
-  /**
-   * Returns the view item associated with the provided data item for this view.
-   *
-   * @param aDataItem
-   *        DownloadsDataItem object for which the view item is requested.
-   *
-   * @return Object that can be used to notify item status events.
-   */
-  getViewItem: function DID_getViewItem(aDataItem)
-  {
-    let data = this._isPrivate ? PrivateDownloadsIndicatorData
-                               : DownloadsIndicatorData;
-    return Object.freeze({
-      onStateChange: function DIVI_onStateChange(aOldState)
-      {
-        if (aDataItem.state == nsIDM.DOWNLOAD_FINISHED ||
-            aDataItem.state == nsIDM.DOWNLOAD_FAILED) {
-          data.attention = true;
-        }
+    // Since the state of a download changed, reset the estimated time left.
+    this._lastRawTimeLeft = -1;
+    this._lastTimeLeft = -1;
+  },
 
-        // Since the state of a download changed, reset the estimated time left.
-        data._lastRawTimeLeft = -1;
-        data._lastTimeLeft = -1;
+  onDownloadChanged(download) {
+    this._updateViews();
+  },
 
-        data._updateViews();
-      },
-      onProgressChange: function DIVI_onProgressChange()
-      {
-        data._updateViews();
-      }
-    });
+  onDownloadRemoved(download) {
+    this._itemCount--;
+    this._updateViews();
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -2135,18 +1663,17 @@ DownloadsIndicatorDataCtor.prototype = {
   _lastTimeLeft: -1,
 
   /**
-   * A generator function for the dataItems that this summary is currently
+   * A generator function for the Download objects this summary is currently
    * interested in. This generator is passed off to summarizeDownloads in order
-   * to generate statistics about the dataItems we care about - in this case,
-   * it's all dataItems for active downloads.
-   */
-  _activeDataItems: function DID_activeDataItems()
-  {
-    let dataItems = this._isPrivate ? PrivateDownloadsData.dataItems
-                                    : DownloadsData.dataItems;
-    for each (let dataItem in dataItems) {
-      if (dataItem && dataItem.inProgress) {
-        yield dataItem;
+   * to generate statistics about the downloads we care about - in this case,
+   * it's all active downloads.
+   */
+  * _activeDownloads() {
+    let downloads = this._isPrivate ? PrivateDownloadsData.downloads
+                                    : DownloadsData.downloads;
+    for (let download of downloads) {
+      if (!download.stopped || (download.canceled && download.hasPartialData)) {
+        yield download;
       }
     }
   },
@@ -2157,7 +1684,7 @@ DownloadsIndicatorDataCtor.prototype = {
   _refreshProperties: function DID_refreshProperties()
   {
     let summary =
-      DownloadsCommon.summarizeDownloads(this._activeDataItems());
+      DownloadsCommon.summarizeDownloads(this._activeDownloads());
 
     // Determine if the indicator should be shown or get attention.
     this._hasDownloads = (this._itemCount > 0);
@@ -2218,7 +1745,7 @@ function DownloadsSummaryData(aIsPrivate, aNumToExclude) {
   // completely separated from one another.
   this._loading = false;
 
-  this._dataItems = [];
+  this._downloads = [];
 
   // Floating point value indicating the last number of seconds estimated until
   // the longest download will finish.  We need to store this value so that we
@@ -2258,9 +1785,9 @@ DownloadsSummaryData.prototype = {
     DownloadsViewPrototype.removeView.call(this, aView);
 
     if (this._views.length == 0) {
-      // Clear out our collection of DownloadDataItems. If we ever have
+      // Clear out our collection of Download objects. If we ever have
       // another view registered with us, this will get re-populated.
-      this._dataItems = [];
+      this._downloads = [];
     }
   },
 
@@ -2280,40 +1807,30 @@ DownloadsSummaryData.prototype = {
     this._dataItems = [];
   },
 
-  onDataItemAdded: function DSD_onDataItemAdded(aDataItem, aNewest)
-  {
-    if (aNewest) {
-      this._dataItems.unshift(aDataItem);
+  onDownloadAdded(download, newest) {
+    if (newest) {
+      this._downloads.unshift(download);
     } else {
-      this._dataItems.push(aDataItem);
+      this._downloads.push(download);
     }
 
     this._updateViews();
   },
 
-  onDataItemRemoved: function DSD_onDataItemRemoved(aDataItem)
-  {
-    let itemIndex = this._dataItems.indexOf(aDataItem);
-    this._dataItems.splice(itemIndex, 1);
+  onDownloadStateChanged() {
+    // Since the state of a download changed, reset the estimated time left.
+    this._lastRawTimeLeft = -1;
+    this._lastTimeLeft = -1;
+  },
+
+  onDownloadChanged() {
     this._updateViews();
   },
 
-  getViewItem: function DSD_getViewItem(aDataItem)
-  {
-    let self = this;
-    return Object.freeze({
-      onStateChange: function DIVI_onStateChange(aOldState)
-      {
-        // Since the state of a download changed, reset the estimated time left.
-        self._lastRawTimeLeft = -1;
-        self._lastTimeLeft = -1;
-        self._updateViews();
-      },
-      onProgressChange: function DIVI_onProgressChange()
-      {
-        self._updateViews();
-      }
-    });
+  onDownloadRemoved(download) {
+    let itemIndex = this._downloads.indexOf(download);
+    this._downloads.splice(itemIndex, 1);
+    this._updateViews();
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -2351,17 +1868,16 @@ DownloadsSummaryData.prototype = {
   //// Property updating based on current download status
 
   /**
-   * A generator function for the dataItems that this summary is currently
+   * A generator function for the Download objects this summary is currently
    * interested in. This generator is passed off to summarizeDownloads in order
-   * to generate statistics about the dataItems we care about - in this case,
-   * it's the dataItems in this._dataItems after the first few to exclude,
+   * to generate statistics about the downloads we care about - in this case,
+   * it's the downloads in this._downloads after the first few to exclude,
    * which was set when constructing this DownloadsSummaryData instance.
    */
-  _dataItemsForSummary: function DSD_dataItemsForSummary()
-  {
-    if (this._dataItems.length > 0) {
-      for (let i = this._numToExclude; i < this._dataItems.length; ++i) {
-        yield this._dataItems[i];
+  * _downloadsForSummary() {
+    if (this._downloads.length > 0) {
+      for (let i = this._numToExclude; i < this._downloads.length; ++i) {
+        yield this._downloads[i];
       }
     }
   },
@@ -2373,7 +1889,7 @@ DownloadsSummaryData.prototype = {
   {
     // Pre-load summary with default values.
     let summary =
-      DownloadsCommon.summarizeDownloads(this._dataItemsForSummary());
+      DownloadsCommon.summarizeDownloads(this._downloadsForSummary());
 
     this._description = DownloadsCommon.strings
                                        .otherDownloads2(summary.numActive);
diff --git a/application/palemoon/components/downloads/DownloadsViewUI.jsm b/application/palemoon/components/downloads/DownloadsViewUI.jsm
new file mode 100644
index 000000000..ede593e22
--- /dev/null
+++ b/application/palemoon/components/downloads/DownloadsViewUI.jsm
@@ -0,0 +1,250 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * This module is imported by code that uses the "download.xml" binding, and
+ * provides prototypes for objects that handle input and display information.
+ */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "DownloadsViewUI",
+];
+
+const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
+                                  "resource://gre/modules/DownloadUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
+                                  "resource:///modules/DownloadsCommon.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "OS",
+                                  "resource://gre/modules/osfile.jsm");
+
+this.DownloadsViewUI = {};
+
+/**
+ * A download element shell is responsible for handling the commands and the
+ * displayed data for a single element that uses the "download.xml" binding.
+ *
+ * The information to display is obtained through the associated Download object
+ * from the JavaScript API for downloads, and commands are executed using a
+ * combination of Download methods and DownloadsCommon.jsm helper functions.
+ *
+ * Specialized versions of this shell must be defined, and they are required to
+ * implement the "download" property or getter. Currently these objects are the
+ * HistoryDownloadElementShell and the DownloadsViewItem for the panel. The
+ * history view may use a HistoryDownload object in place of a Download object.
+ */
+this.DownloadsViewUI.DownloadElementShell = function () {}
+
+this.DownloadsViewUI.DownloadElementShell.prototype = {
+  /**
+   * The richlistitem for the download, initialized by the derived object.
+   */
+  element: null,
+
+  /**
+   * URI string for the file type icon displayed in the download element.
+   */
+  get image() {
+    if (!this.download.target.path) {
+      // Old history downloads may not have a target path.
+      return "moz-icon://.unknown?size=32";
+    }
+
+    // When a download that was previously in progress finishes successfully, it
+    // means that the target file now exists and we can extract its specific
+    // icon, for example from a Windows executable. To ensure that the icon is
+    // reloaded, however, we must change the URI used by the XUL image element,
+    // for example by adding a query parameter. This only works if we add one of
+    // the parameters explicitly supported by the nsIMozIconURI interface.
+    return "moz-icon://" + this.download.target.path + "?size=32" +
+           (this.download.succeeded ? "&state=normal" : "");
+  },
+
+  /**
+   * The user-facing label for the download. This is normally the leaf name of
+   * the download target file. In case this is a very old history download for
+   * which the target file is unknown, the download source URI is displayed.
+   */
+  get displayName() {
+    if (!this.download.target.path) {
+      return this.download.source.url;
+    }
+    return OS.Path.basename(this.download.target.path);
+  },
+
+  get extendedDisplayName() {
+    let s = DownloadsCommon.strings;
+    let referrer = this.download.source.referrer ||
+                   this.download.source.url;
+    let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
+    return s.statusSeparator(this.displayName, displayHost);
+  },
+  
+  get extendedDisplayNameTip() {
+    let s = DownloadsCommon.strings;
+    let referrer = this.download.source.referrer ||
+                   this.download.source.url;
+    let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
+    return s.statusSeparator(this.displayName, fullHost);
+  },
+
+  /**
+   * The progress element for the download, or undefined in case the XBL binding
+   * has not been applied yet.
+   */
+  get _progressElement() {
+    if (!this.__progressElement) {
+      // If the element is not available now, we will try again the next time.
+      this.__progressElement =
+           this.element.ownerDocument.getAnonymousElementByAttribute(
+                                         this.element, "anonid",
+                                         "progressmeter");
+    }
+    return this.__progressElement;
+  },
+
+  /**
+   * Processes a major state change in the user interface, then proceeds with
+   * the normal progress update. This function is not called for every progress
+   * update in order to improve performance.
+   */
+  _updateState() {
+    this.element.setAttribute("displayName", this.displayName);
+    this.element.setAttribute("extendedDisplayName", this.extendedDisplayName);
+    this.element.setAttribute("extendedDisplayNameTip", this.extendedDisplayNameTip);
+    this.element.setAttribute("image", this.image);
+    this.element.setAttribute("state",
+                              DownloadsCommon.stateOfDownload(this.download));
+
+    // Since state changed, reset the time left estimation.
+    this.lastEstimatedSecondsLeft = Infinity;
+
+    this._updateProgress();
+  },
+
+  /**
+   * Updates the elements that change regularly for in-progress downloads,
+   * namely the progress bar and the status line.
+   */
+  _updateProgress() {
+    if (this.download.succeeded) {
+      // We only need to add or remove this attribute for succeeded downloads.
+      if (this.download.target.exists) {
+       this.element.setAttribute("exists", "true");
+      } else {
+        this.element.removeAttribute("exists");
+      }
+    }
+
+    // The progress bar is only displayed for in-progress downloads.
+    if (this.download.hasProgress) {
+      this.element.setAttribute("progressmode", "normal");
+      this.element.setAttribute("progress", this.download.progress);
+    } else {
+      this.element.setAttribute("progressmode", "undetermined");
+    }
+
+    // Dispatch the ValueChange event for accessibility, if possible.
+    if (this._progressElement) {
+      let event = this.element.ownerDocument.createEvent("Events");
+      event.initEvent("ValueChange", true, true);
+      this._progressElement.dispatchEvent(event);
+    }
+
+    let status = this.statusTextAndTip;
+    this.element.setAttribute("status", status.text);
+    this.element.setAttribute("statusTip", status.tip);
+  },
+
+  lastEstimatedSecondsLeft: Infinity,
+
+  /**
+   * Returns the text for the status line and the associated tooltip. These are
+   * returned by a single property because they are computed together. The
+   * result may be overridden by derived objects.
+   */
+  get statusTextAndTip() this.rawStatusTextAndTip,
+
+  /**
+   * Derived objects may call this to get the status text.
+   */
+  get rawStatusTextAndTip() {
+    const nsIDM = Ci.nsIDownloadManager;
+    let s = DownloadsCommon.strings;
+
+    let text = "";
+    let tip = "";
+
+    if (!this.download.stopped) {
+      let totalBytes = this.download.hasProgress ? this.download.totalBytes
+                                                 : -1;
+      // By default, extended status information including the individual
+      // download rate is displayed in the tooltip. The history view overrides
+      // the getter and displays the datails in the main area instead.
+      [text] = DownloadUtils.getDownloadStatusNoRate(
+                                          this.download.currentBytes,
+                                          totalBytes,
+                                          this.download.speed,
+                                          this.lastEstimatedSecondsLeft);
+      let newEstimatedSecondsLeft;
+      [tip, newEstimatedSecondsLeft] = DownloadUtils.getDownloadStatus(
+                                          this.download.currentBytes,
+                                          totalBytes,
+                                          this.download.speed,
+                                          this.lastEstimatedSecondsLeft);
+      this.lastEstimatedSecondsLeft = newEstimatedSecondsLeft;
+    } else if (this.download.canceled && this.download.hasPartialData) {
+      let totalBytes = this.download.hasProgress ? this.download.totalBytes
+                                                 : -1;
+      let transfer = DownloadUtils.getTransferTotal(this.download.currentBytes,
+                                                    totalBytes);
+
+      // We use the same XUL label to display both the state and the amount
+      // transferred, for example "Paused -  1.1 MB".
+      text = s.statusSeparatorBeforeNumber(s.statePaused, transfer);
+    } else if (!this.download.succeeded && !this.download.canceled &&
+               !this.download.error) {
+      text = s.stateStarting;
+    } else {
+      let stateLabel;
+
+      if (this.download.succeeded) {
+        // For completed downloads, show the file size (e.g. "1.5 MB").
+        if (this.download.target.size !== undefined) {
+          let [size, unit] =
+            DownloadUtils.convertByteUnits(this.download.target.size);
+          stateLabel = s.sizeWithUnits(size, unit);
+        } else {
+          // History downloads may not have a size defined.
+          stateLabel = s.sizeUnknown;
+        }
+      } else if (this.download.canceled) {
+        stateLabel = s.stateCanceled;
+      } else if (this.download.error.becauseBlockedByParentalControls) {
+        stateLabel = s.stateBlockedParentalControls;
+      } else if (this.download.error.becauseBlockedByReputationCheck) {
+        stateLabel = s.stateDirty;
+      } else {
+        stateLabel = s.stateFailed;
+      }
+
+      let referrer = this.download.source.referrer || this.download.source.url;
+      let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
+
+      let date = new Date(this.download.endTime);
+      let [displayDate, fullDate] = DownloadUtils.getReadableDates(date);
+
+      let firstPart = s.statusSeparator(stateLabel, displayHost);
+      text = s.statusSeparator(firstPart, displayDate);
+      tip = s.statusSeparator(fullHost, fullDate);
+    }
+
+    return { text, tip: tip || text };
+  },
+};
diff --git a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
index 054f0405f..4830f2128 100644
--- a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
+++ b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
@@ -2,30 +2,32 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/**
- * THE PLACES VIEW IMPLEMENTED IN THIS FILE HAS A VERY PARTICULAR USE CASE.
- * IT IS HIGHLY RECOMMENDED NOT TO EXTEND IT FOR ANY OTHER USE CASES OR RELY
- * ON IT AS AN API.
- */
-
-var Cu = Components.utils;
-var Ci = Components.interfaces;
-var Cc = Components.classes;
+var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/NetUtil.jsm");
-Cu.import("resource://gre/modules/DownloadUtils.jsm");
-Cu.import("resource:///modules/DownloadsCommon.jsm");
-Cu.import("resource://gre/modules/PlacesUtils.jsm");
-Cu.import("resource://gre/modules/osfile.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-                                  "resource://gre/modules/PrivateBrowsingUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
-                                  "resource:///modules/RecentWindow.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
+                                  "resource://gre/modules/DownloadUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
+                                  "resource:///modules/DownloadsCommon.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadsViewUI",
+                                  "resource:///modules/DownloadsViewUI.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+                                  "resource://gre/modules/NetUtil.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "OS",
+                                  "resource://gre/modules/osfile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+                                  "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+                                  "resource://gre/modules/Promise.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
+                                  "resource:///modules/RecentWindow.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+                                  "resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
 
 const nsIDM = Ci.nsIDownloadManager;
 
@@ -38,549 +40,268 @@ const DOWNLOAD_VIEW_SUPPORTED_COMMANDS =
   "downloadsCmd_open", "downloadsCmd_show", "downloadsCmd_retry",
   "downloadsCmd_openReferrer", "downloadsCmd_clearDownloads"];
 
-const NOT_AVAILABLE = Number.MAX_VALUE;
-
 /**
- * A download element shell is responsible for handling the commands and the
- * displayed data for a single download view element. The download element
- * could represent either a past download (for which we get data from places)  or
- * a "session" download (using a data-item object. See DownloadsCommon.jsm), or both.
- *
- * Once initialized with either a data item or a places node, the created richlistitem
- * can be accessed through the |element| getter, and can then be inserted/removed from
- * a richlistbox.
- *
- * The shell doesn't take care of inserting the item, or removing it when it's no longer
- * valid. That's the caller (a DownloadsPlacesView object) responsibility.
+ * Represents a download from the browser history. It implements part of the
+ * interface of the Download object.
  *
- * The caller is also responsible for "passing over" notification from both the
- * download-view and the places-result-observer, in the following manner:
- *  - The DownloadsPlacesView object implements getViewItem of the download-view
- *    pseudo interface.  It returns this object (therefore we implement
- *    onStateChangea and onProgressChange here).
- *  - The DownloadsPlacesView object adds itself as a places result observer and
- *    calls this object's placesNodeIconChanged, placesNodeTitleChanged and
- *    placeNodeAnnotationChanged from its callbacks.
- *
- * @param [optional] aDataItem
- *        The data item of a the session download. Required if aPlacesNode is not set
- * @param [optional] aPlacesNode
- *        The places node for a past download. Required if aDataItem is not set.
- * @param [optional] aAnnotations
- *        Map containing annotations values, to speed up the initial loading.
+ * @param aPlacesNode
+ *        The Places node from which the history download should be initialized.
  */
-function DownloadElementShell(aDataItem, aPlacesNode, aAnnotations) {
-  this._element = document.createElement("richlistitem");
-  this._element._shell = this;
-
-  this._element.classList.add("download");
-  this._element.classList.add("download-state");
-
-  if (aAnnotations)
-    this._annotations = aAnnotations;
-  if (aDataItem)
-    this.dataItem = aDataItem;
-  if (aPlacesNode)
-    this.placesNode = aPlacesNode;
+function HistoryDownload(aPlacesNode) {
+  // TODO (bug 829201): history downloads should get the referrer from Places.
+  this.source = {
+    url: aPlacesNode.uri,
+  };
+  this.target = {
+    path: undefined,
+    exists: false,
+    size: undefined,
+  };
+
+  // In case this download cannot obtain its end time from the Places metadata,
+  // use the time from the Places node, that is the start time of the download.
+  this.endTime = aPlacesNode.time / 1000;
 }
 
-DownloadElementShell.prototype = {
-  // The richlistitem for the download
-  get element() this._element,
-
+HistoryDownload.prototype = {
   /**
-   * Manages the "active" state of the shell.  By default all the shells
-   * without a dataItem are inactive, thus their UI is not updated.  They must
-   * be activated when entering the visible area.  Session downloads are
-   * always active since they always have a dataItem.
+   * Pushes information from Places metadata into this object.
    */
-  ensureActive: function DES_ensureActive() {
-    if (!this._active) {
-      this._active = true;
-      this._element.setAttribute("active", true);
-      this._updateUI();
-    }
-  },
-  get active() !!this._active,
-
-  // The data item for the download
-  _dataItem: null,
-  get dataItem() this._dataItem,
-
-  set dataItem(aValue) {
-    if (this._dataItem != aValue) {
-      if (!aValue && !this._placesNode)
-        throw new Error("Should always have either a dataItem or a placesNode");
-
-      this._dataItem = aValue;
-      if (!this.active)
-        this.ensureActive();
-      else
-        this._updateUI();
+  updateFromMetaData(metaData) {
+    try {
+      this.target.path = Cc["@mozilla.org/network/protocol;1?name=file"]
+                           .getService(Ci.nsIFileProtocolHandler)
+                           .getFileFromURLSpec(metaData.targetFileSpec).path;
+    } catch (ex) {
+      this.target.path = undefined;
     }
-    return aValue;
-  },
-
-  _placesNode: null,
-  get placesNode() this._placesNode,
-  set placesNode(aValue) {
-    if (this._placesNode != aValue) {
-      if (!aValue && !this._dataItem)
-        throw new Error("Should always have either a dataItem or a placesNode");
-
-      // Preserve the annotations map if this is the first loading and we got
-      // cached values.
-      if (this._placesNode || !this._annotations) {
-        this._annotations = new Map();
-      }
-
-      this._placesNode = aValue;
 
-      // We don't need to update the UI if we had a data item, because
-      // the places information isn't used in this case.
-      if (!this._dataItem && this.active)
-        this._updateUI();
+    if ("state" in metaData) {
+      this.succeeded = metaData.state == nsIDM.DOWNLOAD_FINISHED;
+      this.error = metaData.state == nsIDM.DOWNLOAD_FAILED
+                   ? { message: "History download failed." }
+                   : metaData.state == nsIDM.DOWNLOAD_BLOCKED_PARENTAL
+                   ? { becauseBlockedByParentalControls: true }
+                   : metaData.state == nsIDM.DOWNLOAD_DIRTY
+                   ? { becauseBlockedByReputationCheck: true }
+                   : null;
+      this.canceled = metaData.state == nsIDM.DOWNLOAD_CANCELED ||
+                      metaData.state == nsIDM.DOWNLOAD_PAUSED;
+      this.endTime = metaData.endTime;
+
+      // Normal history downloads are assumed to exist until the user interface
+      // is refreshed, at which point these values may be updated.
+      this.target.exists = true;
+      this.target.size = metaData.fileSize;
+    } else {
+      // Metadata might be missing from a download that has started but hasn't
+      // stopped already. Normally, this state is overridden with the one from
+      // the corresponding in-progress session download. But if the browser is
+      // terminated abruptly and additionally the file with information about
+      // in-progress downloads is lost, we may end up using this state. We use
+      // the failed state to allow the download to be restarted.
+      //
+      // On the other hand, if the download is missing the target file
+      // annotation as well, it is just a very old one, and we can assume it
+      // succeeded.
+      this.succeeded = !this.target.path;
+      this.error = this.target.path ? { message: "Unstarted download." } : null;
+      this.canceled = false;
+
+      // These properties may be updated if the user interface is refreshed.
+      this.target.exists = false;
+      this.target.size = undefined;
     }
-    return aValue;
-  },
-
-  // The download uri (as a string)
-  get downloadURI() {
-    if (this._dataItem)
-     return this._dataItem.uri;
-    if (this._placesNode)
-      return this._placesNode.uri;
-    throw new Error("Unexpected download element state");
   },
 
-  get _downloadURIObj() {
-    if (!("__downloadURIObj" in this))
-      this.__downloadURIObj = NetUtil.newURI(this.downloadURI);
-    return this.__downloadURIObj;
-  },
-
-  _getIcon: function DES__getIcon() {
-    let metaData = this.getDownloadMetaData();
-    if ("filePath" in metaData)
-      return "moz-icon://" + metaData.filePath + "?size=32";
-
-    if (this._placesNode) {
-      // Try to extract an extension from the uri.
-      let ext = this._downloadURIObj.QueryInterface(Ci.nsIURL).fileExtension;
-      if (ext)
-        return "moz-icon://." + ext + "?size=32";
-      return this._placesNode.icon || "moz-icon://.unknown?size=32";
-    }
-    if (this._dataItem)
-      throw new Error("Session-download items should always have a target file uri");
+  /**
+   * History downloads are never in progress.
+   */
+  stopped: true,
 
-    throw new Error("Unexpected download element state");
-  },
+  /**
+   * No percentage indication is shown for history downloads.
+   */
+  hasProgress: false,
 
-  // Helper for getting a places annotation set for the download.
-  _getAnnotation: function DES__getAnnotation(aAnnotation, aDefaultValue) {
-    let value;
-    if (this._annotations.has(aAnnotation))
-      value = this._annotations.get(aAnnotation);
+  /**
+   * History downloads cannot be restarted using their partial data, even if
+   * they are indicated as paused in their Places metadata. The only way is to
+   * use the information from a persisted session download, that will be shown
+   * instead of the history download. In case this session download is not
+   * available, we show the history download as canceled, not paused.
+   */
+  hasPartialData: false,
 
-    // If the value is cached, or we know it doesn't exist, avoid a database
-    // lookup.
-    if (value === undefined) {
-      try {
-        value = PlacesUtils.annotations.getPageAnnotation(
-          this._downloadURIObj, aAnnotation);
-      }
-      catch(ex) {
-        value = NOT_AVAILABLE;
-      }
-    }
+  /**
+   * This method mimicks the "start" method of session downloads, and is called
+   * when the user retries a history download.
+   *
+   * At present, we always ask the user for a new target path when retrying a
+   * history download. In the future we may consider reusing the known target
+   * path if the folder still exists and the file name is not already used,
+   * except when the user preferences indicate that the target path should be
+   * requested every time a new download is started.
+   */
+  start() {
+    let browserWin = RecentWindow.getMostRecentBrowserWindow();
+    let initiatingDoc = browserWin ? browserWin.document : document;
 
-    if (value === NOT_AVAILABLE) {
-      if (aDefaultValue === undefined) {
-        throw new Error("Could not get required annotation '" + aAnnotation +
-                        "' for download with url '" + this.downloadURI + "'");
-      }
-      value = aDefaultValue;
-    }
+    // Do not suggest a file name if we don't know the original target.
+    let leafName = this.target.path ? OS.Path.basename(this.target.path) : null;
+    DownloadURL(this.source.url, leafName, initiatingDoc);
 
-    this._annotations.set(aAnnotation, value);
-    return value;
+    return Promise.resolve();
   },
 
-  _fetchTargetFileInfo: function DES__fetchTargetFileInfo(aUpdateMetaDataAndStatusUI = false) {
-    if (this._targetFileInfoFetched)
-      throw new Error("_fetchTargetFileInfo should not be called if the information was already fetched");
-    if (!this.active)
-      throw new Error("Trying to _fetchTargetFileInfo on an inactive download shell");
-
-    let path = this.getDownloadMetaData().filePath;
-
-    // In previous version, the target file annotations were not set,
-    // so we cannot tell where is the file.
-    if (path === undefined) {
-      this._targetFileInfoFetched = true;
-      this._targetFileExists = false;
-      if (aUpdateMetaDataAndStatusUI) {
-        this._metaData = null;
-        this._updateDownloadStatusUI();
-      }
-      // Here we don't need to update the download commands,
-      // as the state is unknown as it was.
-      return;
+  /**
+   * This method mimicks the "refresh" method of session downloads, except that
+   * it cannot notify that the data changed to the Downloads View.
+   */
+  refresh: Task.async(function* () {
+    try {
+      this.target.size = (yield OS.File.stat(this.target.path)).size;
+      this.target.exists = true;
+    } catch (ex) {
+      // We keep the known file size from the metadata, if any.
+      this.target.exists = false;
     }
+  }),
+};
 
-    OS.File.stat(path).then(
-      function onSuccess(fileInfo) {
-        this._targetFileInfoFetched = true;
-        this._targetFileExists = true;
-        this._targetFileSize = fileInfo.size;
-        if (aUpdateMetaDataAndStatusUI) {
-          this._metaData = null;
-          this._updateDownloadStatusUI();
-        }
-        if (this._element.selected)
-          goUpdateDownloadCommands();
-      }.bind(this),
-
-      function onFailure(reason) {
-        if (reason instanceof OS.File.Error && reason.becauseNoSuchFile) {
-          this._targetFileInfoFetched = true;
-          this._targetFileExists = false;
-        }
-        else {
-          Cu.reportError("Could not fetch info for target file (reason: " +
-                         reason + ")");
-        }
+/**
+ * A download element shell is responsible for handling the commands and the
+ * displayed data for a single download view element.
+ *
+ * The shell may contain a session download, a history download, or both.  When
+ * both a history and a session download are present, the session download gets
+ * priority and its information is displayed.
+ *
+ * On construction, a new richlistitem is created, and can be accessed through
+ * the |element| getter. The shell doesn't insert the item in a richlistbox, the
+ * caller must do it and remove the element when it's no longer needed.
+ *
+ * The caller is also responsible for forwarding status notifications for
+ * session downloads, calling the onStateChanged and onChanged methods.
+ *
+ * @param [optional] aSessionDownload
+ *        The session download, required if aHistoryDownload is not set.
+ * @param [optional] aHistoryDownload
+ *        The history download, required if aSessionDownload is not set.
+ */
+function HistoryDownloadElementShell(aSessionDownload, aHistoryDownload) {
+  this.element = document.createElement("richlistitem");
+  this.element._shell = this;
 
-        if (aUpdateMetaDataAndStatusUI) {
-          this._metaData = null;
-          this._updateDownloadStatusUI();
-        }
+  this.element.classList.add("download");
+  this.element.classList.add("download-state");
 
-        if (this._element.selected)
-          goUpdateDownloadCommands();
-      }.bind(this)
-    );
-  },
+  if (aSessionDownload) {
+    this.sessionDownload = aSessionDownload;
+  }
+  if (aHistoryDownload) {
+    this.historyDownload = aHistoryDownload;
+  }
+}
 
-  _getAnnotatedMetaData: function DES__getAnnotatedMetaData()
-    JSON.parse(this._getAnnotation(DOWNLOAD_META_DATA_ANNO)),
+HistoryDownloadElementShell.prototype = {
+  __proto__: DownloadsViewUI.DownloadElementShell.prototype,
 
-  _extractFilePathAndNameFromFileURI:
-  function DES__extractFilePathAndNameFromFileURI(aFileURI) {
-    let file = Cc["@mozilla.org/network/protocol;1?name=file"]
-                .getService(Ci.nsIFileProtocolHandler)
-                .getFileFromURLSpec(aFileURI);
-    return [file.path, file.leafName];
+  /**
+   * Manages the "active" state of the shell.  By default all the shells without
+   * a session download are inactive, thus their UI is not updated.  They must
+   * be activated when entering the visible area.  Session downloads are always
+   * active.
+   */
+  ensureActive: function DES_ensureActive() {
+    if (!this._active) {
+      this._active = true;
+      this.element.setAttribute("active", true);
+      this._updateUI();
+    }
   },
+  get active() !!this._active,
 
   /**
-   * Retrieve the meta data object for the download.  The following fields
-   * may be set.
-   *
-   * - state - any download state defined in nsIDownloadManager.  If this field
-   *   is not set, the download state is unknown.
-   * - endTime: the end time of the download.
-   * - filePath: the downloaded file path on the file system, when it
-   *   was downloaded.  The file may not exist.  This is set for session
-   *   downloads that have a local file set, and for history downloads done
-   *   after the landing of bug 591289.
-   * - fileName: the downloaded file name on the file system.  Set if filePath
-   *   is set.
-   * - displayName: the user-facing label for the download.  This is always
-   *   set.  If available, it's set to the downloaded file name.  If not,
-   *   the places title for the download uri is used.  As a last resort,
-   *   we fallback to the download uri.
-   * - fileSize (only set for downloads which completed successfully):
-   *   the downloaded file size.  For downloads done after the landing of
-   *   bug 826991, this value is "static" - that is, it does not necessarily
-   *   mean that the file is in place and has this size.
+   * Overrides the base getter to return the Download or HistoryDownload object
+   * for displaying information and executing commands in the user interface.
    */
-  getDownloadMetaData: function DES_getDownloadMetaData() {
-    if (!this._metaData) {
-      if (this._dataItem) {
-        let s = DownloadsCommon.strings;
-        let referrer = this._dataItem.referrer || this._dataItem.uri;
-        let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
-        this._metaData = {
-          state:                  this._dataItem.state,
-          endTime:                this._dataItem.endTime,
-          fileName:               this._dataItem.target,
-          displayName:            this._dataItem.target,
-          extendedDisplayName:    s.statusSeparator(this._dataItem.target, displayHost),
-          extendedDisplayNameTip: s.statusSeparator(this._dataItem.target, fullHost)
-        };
-        if (this._dataItem.done)
-          this._metaData.fileSize = this._dataItem.maxBytes;
-        if (this._dataItem.localFile)
-          this._metaData.filePath = this._dataItem.localFile.path;
+  get download() this._sessionDownload || this._historyDownload,
+
+  _sessionDownload: null,
+  get sessionDownload() this._sessionDownload,
+  set sessionDownload(aValue) {
+    if (this._sessionDownload != aValue) {
+      if (!aValue && !this._historyDownload) {
+        throw new Error("Should always have either a Download or a HistoryDownload");
       }
-      else {
-        try {
-          this._metaData = this._getAnnotatedMetaData();
-        }
-        catch(ex) {
-          this._metaData = { };
-          if (this._targetFileInfoFetched && this._targetFileExists) {
-            this._metaData.state = this._targetFileSize > 0 ?
-              nsIDM.DOWNLOAD_FINISHED : nsIDM.DOWNLOAD_FAILED;
-            this._metaData.fileSize = this._targetFileSize;
-          }
 
-          // This is actually the start-time, but it's the best we can get.
-          this._metaData.endTime = this._placesNode.time / 1000;
-        }
+      this._sessionDownload = aValue;
 
-        try {
-          let targetFileURI = this._getAnnotation(DESTINATION_FILE_URI_ANNO);
-          [this._metaData.filePath, this._metaData.fileName] =
-            this._extractFilePathAndNameFromFileURI(targetFileURI);
-          this._metaData.displayName = this._metaData.fileName;
-        }
-        catch(ex) {
-          this._metaData.displayName = this._placesNode.title || this.downloadURI;
-        }
-      }
+      this.ensureActive();
+      this._updateUI();
     }
-    return this._metaData;
+    return aValue;
   },
 
-  // The status text for the download
-  _getStatusText: function DES__getStatusText() {
-    let s = DownloadsCommon.strings;
-    if (this._dataItem && this._dataItem.inProgress) {
-      if (this._dataItem.paused) {
-        let transfer =
-          DownloadUtils.getTransferTotal(this._dataItem.currBytes,
-                                         this._dataItem.maxBytes);
-
-        // We use the same XUL label to display both the state and the amount
-        // transferred, for example "Paused -  1.1 MB".
-        return s.statusSeparatorBeforeNumber(s.statePaused, transfer);
-      }
-      if (this._dataItem.state == nsIDM.DOWNLOAD_DOWNLOADING) {
-        let [status, newEstimatedSecondsLeft] =
-          DownloadUtils.getDownloadStatus(this.dataItem.currBytes,
-                                          this.dataItem.maxBytes,
-                                          this.dataItem.speed,
-                                          this._lastEstimatedSecondsLeft || Infinity);
-        this._lastEstimatedSecondsLeft = newEstimatedSecondsLeft;
-        return status;
-      }
-      if (this._dataItem.starting) {
-        return s.stateStarting;
-      }
-      if (this._dataItem.state == nsIDM.DOWNLOAD_SCANNING) {
-        return s.stateScanning;
+  _historyDownload: null,
+  get historyDownload() this._historyDownload,
+  set historyDownload(aValue) {
+    if (this._historyDownload != aValue) {
+      if (!aValue && !this._sessionDownload) {
+        throw new Error("Should always have either a Download or a HistoryDownload");
       }
 
-      throw new Error("_getStatusText called with a bogus download state");
-    }
+      this._historyDownload = aValue;
 
-    // This is a not-in-progress or history download.
-    let stateLabel = "";
-    let state = this.getDownloadMetaData().state;
-    switch (state) {
-      case nsIDM.DOWNLOAD_FAILED:
-        stateLabel = s.stateFailed;
-        break;
-      case nsIDM.DOWNLOAD_CANCELED:
-        stateLabel = s.stateCanceled;
-        break;
-      case nsIDM.DOWNLOAD_BLOCKED_PARENTAL:
-        stateLabel = s.stateBlockedParentalControls;
-        break;
-      case nsIDM.DOWNLOAD_BLOCKED_POLICY:
-        stateLabel = s.stateBlockedPolicy;
-        break;
-      case nsIDM.DOWNLOAD_DIRTY:
-        stateLabel = s.stateDirty;
-        break;
-      case nsIDM.DOWNLOAD_FINISHED:{
-        // For completed downloads, show the file size (e.g. "1.5 MB")
-        let metaData = this.getDownloadMetaData();
-        if ("fileSize" in metaData) {
-          let [size, unit] = DownloadUtils.convertByteUnits(metaData.fileSize);
-          stateLabel = s.sizeWithUnits(size, unit);
-          break;
-        }
-        // Fallback to default unknown state.
+      // We don't need to update the UI if we had a session data item, because
+      // the places information isn't used in this case.
+      if (!this._sessionDownload) {
+        this._updateUI();
       }
-      default:
-        stateLabel = s.sizeUnknown;
-        break;
-    }
-
-    // TODO (bug 829201): history downloads should get the referrer from Places.
-    let referrer = this._dataItem && this._dataItem.referrer ||
-                   this.downloadURI;
-    let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
-
-    let date = new Date(this.getDownloadMetaData().endTime);
-    let [displayDate, fullDate] = DownloadUtils.getReadableDates(date);
-
-    // We use the same XUL label to display the state, the host name, and the
-    // end time.
-    let firstPart = s.statusSeparator(stateLabel, displayHost);
-    return s.statusSeparator(firstPart, displayDate);
-  },
-
-  // The progressmeter element for the download
-  get _progressElement() {
-    if (!("__progressElement" in this)) {
-      this.__progressElement =
-        document.getAnonymousElementByAttribute(this._element, "anonid",
-                                                "progressmeter");
     }
-    return this.__progressElement;
+    return aValue;
   },
 
-  // Updates the download state attribute (and by that hide/unhide the
-  // appropriate buttons and context menu items), the status text label,
-  // and the progress meter.
-  _updateDownloadStatusUI: function  DES__updateDownloadStatusUI() {
-    if (!this.active)
-      throw new Error("_updateDownloadStatusUI called for an inactive item.");
-
-    let state = this.getDownloadMetaData().state;
-    if (state !== undefined)
-      this._element.setAttribute("state", state);
-
-    this._element.setAttribute("status", this._getStatusText());
-
-    // For past-downloads, we're done. For session-downloads, we may also need
-    // to update the progress-meter.
-    if (!this._dataItem)
+  _updateUI() {
+    // There is nothing to do if the item has always been invisible.
+    if (!this.active) {
       return;
-
-    // Copied from updateProgress in downloads.js.
-    if (this._dataItem.starting) {
-      // Before the download starts, the progress meter has its initial value.
-      this._element.setAttribute("progressmode", "normal");
-      this._element.setAttribute("progress", "0");
-    }
-    else if (this._dataItem.state == nsIDM.DOWNLOAD_SCANNING ||
-             this._dataItem.percentComplete == -1) {
-      // We might not know the progress of a running download, and we don't know
-      // the remaining time during the malware scanning phase.
-      this._element.setAttribute("progressmode", "undetermined");
     }
-    else {
-      // This is a running download of which we know the progress.
-      this._element.setAttribute("progressmode", "normal");
-      this._element.setAttribute("progress", this._dataItem.percentComplete);
-    }
-
-    // Dispatch the ValueChange event for accessibility, if possible.
-    if (this._progressElement) {
-      let event = document.createEvent("Events");
-      event.initEvent("ValueChange", true, true);
-      this._progressElement.dispatchEvent(event);
-    }
-  },
-
-  _updateDisplayNameAndIcon: function DES__updateDisplayNameAndIcon() {
-    let metaData = this.getDownloadMetaData();
-    this._element.setAttribute("displayName", metaData.displayName);
-    if ("extendedDisplayName" in metaData)
-      this._element.setAttribute("extendedDisplayName", metaData.extendedDisplayName);
-    if ("extendedDisplayNameTip" in metaData)
-      this._element.setAttribute("extendedDisplayNameTip", metaData.extendedDisplayNameTip);
-    this._element.setAttribute("image", this._getIcon());
-  },
-
-  _updateUI: function DES__updateUI() {
-    if (!this.active)
-      throw new Error("Trying to _updateUI on an inactive download shell");
-
-    this._metaData = null;
-    this._targetFileInfoFetched = false;
 
-    this._updateDisplayNameAndIcon();
+    // Since the state changed, we may need to check the target file again.
+    this._targetFileChecked = false;
 
-    // For history downloads done in past releases, the downloads/metaData
-    // annotation is not set, and therefore we cannot tell the download
-    // state without the target file information.
-    if (this._dataItem || this.getDownloadMetaData().state !== undefined)
-      this._updateDownloadStatusUI();
-    else
-      this._fetchTargetFileInfo(true);
+    this._updateState();
   },
 
-  placesNodeIconChanged: function DES_placesNodeIconChanged() {
-    if (!this._dataItem)
-      this._element.setAttribute("image", this._getIcon());
-  },
+  get statusTextAndTip() {
+    let status = this.rawStatusTextAndTip;
 
-  placesNodeTitleChanged: function DES_placesNodeTitleChanged() {
-    // If there's a file path, we use the leaf name for the title.
-    if (!this._dataItem && this.active && !this.getDownloadMetaData().filePath) {
-      this._metaData = null;
-      this._updateDisplayNameAndIcon();
+    // The base object would show extended progress information in the tooltip,
+    // but we move this to the main view and never display a tooltip.
+    if (!this.download.stopped) {
+      status.text = status.tip;
     }
-  },
+    status.tip = "";
 
-  placesNodeAnnotationChanged: function DES_placesNodeAnnotationChanged(aAnnoName) {
-    this._annotations.delete(aAnnoName);
-    if (!this._dataItem && this.active) {
-      if (aAnnoName == DOWNLOAD_META_DATA_ANNO) {
-        let metaData = this.getDownloadMetaData();
-        let annotatedMetaData = this._getAnnotatedMetaData();
-        metaData.endTime = annotatedMetaData.endTime;
-        if ("fileSize" in annotatedMetaData)
-          metaData.fileSize = annotatedMetaData.fileSize;
-        else
-          delete metaData.fileSize;
-
-        if (metaData.state != annotatedMetaData.state) {
-          metaData.state = annotatedMetaData.state;
-          if (this._element.selected)
-            goUpdateDownloadCommands();
-        }
-
-        this._updateDownloadStatusUI();
-      }
-      else if (aAnnoName == DESTINATION_FILE_URI_ANNO) {
-        let metaData = this.getDownloadMetaData();
-        let targetFileURI = this._getAnnotation(DESTINATION_FILE_URI_ANNO);
-        [metaData.filePath, metaData.fileName] =
-            this._extractFilePathAndNameFromFileURI(targetFileURI);
-        metaData.displayName = metaData.fileName;
-        this._updateDisplayNameAndIcon();
-
-        if (this._targetFileInfoFetched) {
-          // This will also update the download commands if necessary.
-          this._targetFileInfoFetched = false;
-          this._fetchTargetFileInfo();
-        }
-      }
-    }
+    return status;
   },
 
-  /* DownloadView */
-  onStateChange: function DES_onStateChange(aOldState) {
-    let metaData = this.getDownloadMetaData();
-    metaData.state = this.dataItem.state;
-    if (aOldState != nsIDM.DOWNLOAD_FINISHED && aOldState != metaData.state) {
-      // See comment in DVI_onStateChange in downloads.js (the panel-view)
-      this._element.setAttribute("image", this._getIcon() + "&state=normal");
-      metaData.fileSize = this._dataItem.maxBytes;
-      if (this._targetFileInfoFetched) {
-        this._targetFileInfoFetched = false;
-        this._fetchTargetFileInfo();
-      }
-    }
+  onStateChanged() {
+    this.element.setAttribute("image", this.image);
+    this.element.setAttribute("state",
+                              DownloadsCommon.stateOfDownload(this.download));
 
-    this._updateDownloadStatusUI();
-    if (this._element.selected)
+    if (this.element.selected) {
       goUpdateDownloadCommands();
-    else
+    } else {
       goUpdateCommand("downloadsCmd_clearDownloads");
+    }
   },
 
-  /* DownloadView */
-  onProgressChange: function DES_onProgressChange() {
-    this._updateDownloadStatusUI();
+  onChanged() {
+    this._updateProgress();
   },
 
   /* nsIController */
@@ -589,109 +310,79 @@ DownloadElementShell.prototype = {
     if (!this.active && aCommand != "cmd_delete")
       return false;
     switch (aCommand) {
-      case "downloadsCmd_open": {
-        // We cannot open a session download file unless it's done ("openable").
-        // If it's finished, we need to make sure the file was not removed,
-        // as we do for past downloads.
-        if (this._dataItem && !this._dataItem.openable)
-          return false;
-
-        if (this._targetFileInfoFetched)
-          return this._targetFileExists;
-
-        // If the target file information is not yet fetched,
-        // temporarily assume that the file is in place.
-        return this.getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
-      }
-      case "downloadsCmd_show": {
+      case "downloadsCmd_open":
+        // This property is false if the download did not succeed.
+        return this.download.target.exists;
+      case "downloadsCmd_show":
         // TODO: Bug 827010 - Handle part-file asynchronously.
-        if (this._dataItem &&
-            this._dataItem.partFile && this._dataItem.partFile.exists())
-          return true;
-
-        if (this._targetFileInfoFetched)
-          return this._targetFileExists;
+        if (this._sessionDownload && this.download.target.partFilePath) {
+          let partFile = new FileUtils.File(this.download.target.partFilePath);
+          if (partFile.exists()) {
+            return true;
+          }
+        }
 
-        // If the target file information is not yet fetched,
-        // temporarily assume that the file is in place.
-        return this.getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
-      }
+        // This property is false if the download did not succeed.
+        return this.download.target.exists;
       case "downloadsCmd_pauseResume":
-        return this._dataItem && this._dataItem.inProgress && this._dataItem.resumable;
+        return this.download.hasPartialData && !this.download.error;
       case "downloadsCmd_retry":
-        // An history download can always be retried.
-        return !this._dataItem || this._dataItem.canRetry;
+        return this.download.canceled || this.download.error;
       case "downloadsCmd_openReferrer":
-        return this._dataItem && !!this._dataItem.referrer;
+        return !!this.download.source.referrer;
       case "cmd_delete":
-        // The behavior in this case is somewhat unexpected, so we disallow that.
-        if (this._placesNode && this._dataItem && this._dataItem.inProgress)
-          return false;
-        return true;
+        // We don't want in-progress downloads to be removed accidentally.
+        return this.download.stopped;
       case "downloadsCmd_cancel":
-        return this._dataItem != null;
+        return !!this._sessionDownload;
     }
     return false;
   },
 
-  _retryAsHistoryDownload: function DES__retryAsHistoryDownload() {
-    // In future we may try to download into the same original target uri, when
-    // we have it.  Though that requires verifying the path is still valid and
-    // may surprise the user if he wants to be requested every time.
-    let browserWin = RecentWindow.getMostRecentBrowserWindow();
-    let initiatingDoc = browserWin ? browserWin.document : document;
-    DownloadURL(this.downloadURI, this.getDownloadMetaData().fileName,
-                initiatingDoc);
-  },
-
   /* nsIController */
   doCommand: function DES_doCommand(aCommand) {
     switch (aCommand) {
       case "downloadsCmd_open": {
-        let file = this._dataItem ?
-          this.dataItem.localFile :
-          new FileUtils.File(this.getDownloadMetaData().filePath);
-
+        let file = new FileUtils.File(this.download.target.path);
         DownloadsCommon.openDownloadedFile(file, null, window);
         break;
       }
       case "downloadsCmd_show": {
-        if (this._dataItem) {
-          this._dataItem.showLocalFile();
-        }
-        else {
-          let file = new FileUtils.File(this.getDownloadMetaData().filePath);
-          DownloadsCommon.showDownloadedFile(file);
-        }
+        let file = new FileUtils.File(this.download.target.path);
+        DownloadsCommon.showDownloadedFile(file);
         break;
       }
       case "downloadsCmd_openReferrer": {
-        openURL(this._dataItem.referrer);
+        openURL(this.download.source.referrer);
         break;
       }
       case "downloadsCmd_cancel": {
-        this._dataItem.cancel();
+        this.download.cancel().catch(() => {});
+        this.download.removePartialData().catch(Cu.reportError);
         break;
       }
       case "cmd_delete": {
-        if (this._dataItem)
-          Downloads.getList(Downloads.ALL)
-                   .then(list => list.remove(this._dataItem._download))
-                   .then(() => this._dataItem._download.finalize(true))
-                   .catch(Cu.reportError);
-        if (this._placesNode)
-          PlacesUtils.bhistory.removePage(this._downloadURIObj);
+        if (this._sessionDownload) {
+          DownloadsCommon.removeAndFinalizeDownload(this.download);
+        }
+        if (this._historyDownload) {
+          let uri = NetUtil.newURI(this.download.source.url);
+          PlacesUtils.bhistory.removePage(uri);
+        }
         break;
-       }
+      }
       case "downloadsCmd_retry": {
-        if (this._dataItem)
-          this._dataItem.retry();
-        else
-          this._retryAsHistoryDownload();
+        // Errors when retrying are already reported as download failures.
+        this.download.start().catch(() => {});
         break;
       }
       case "downloadsCmd_pauseResume": {
-        this._dataItem.togglePauseResume();
+        // This command is only enabled for session downloads.
+        if (this.download.stopped) {
+          this.download.start();
+        } else {
+          this.download.cancel();
+        }
         break;
       }
     }
@@ -704,8 +395,8 @@ DownloadElementShell.prototype = {
     if (!aTerm)
       return true;
     aTerm = aTerm.toLowerCase();
-    return this.getDownloadMetaData().displayName.toLowerCase().includes(aTerm) ||
-           this.downloadURI.toLowerCase().includes(aTerm);
+    return this.displayName.toLowerCase().contains(aTerm) ||
+           this.download.source.url.toLowerCase().contains(aTerm);
   },
 
   // Handles return keypress on the element (the keypress listener is
@@ -732,30 +423,57 @@ DownloadElementShell.prototype = {
       }
       return "";
     }
-    let command = getDefaultCommandForState(this.getDownloadMetaData().state);
+    let state = DownloadsCommon.stateOfDownload(this.download);
+    let command = getDefaultCommandForState(state);
     if (command && this.isCommandEnabled(command))
       this.doCommand(command);
   },
 
   /**
-   * At the first time an item is selected, we don't yet have
-   * the target file information.  Thus the call to goUpdateDownloadCommands
-   * in DPV_onSelect would result in best-guess enabled/disabled result.
-   * That way we let the user perform command immediately. However, once
-   * we have the target file information, we can update the commands
-   * appropriately (_fetchTargetFileInfo() calls goUpdateDownloadCommands).
+   * This method is called by the outer download view, after the controller
+   * commands have already been updated. In case we did not check for the
+   * existence of the target file already, we can do it now and then update
+   * the commands as needed.
    */
   onSelect: function DES_onSelect() {
     if (!this.active)
       return;
-    if (!this._targetFileInfoFetched)
-      this._fetchTargetFileInfo();
-  }
+
+    // If this is a history download for which no target file information is
+    // available, we cannot retrieve information about the target file.
+    if (!this.download.target.path) {
+      return;
+    }
+
+    // Start checking for existence.  This may be done twice if onSelect is
+    // called again before the information is collected.
+    if (!this._targetFileChecked) {
+      this._checkTargetFileOnSelect().catch(Cu.reportError);
+    }
+  },
+
+  _checkTargetFileOnSelect: Task.async(function* () {
+    try {
+      yield this.download.refresh();
+    } finally {
+      // Do not try to check for existence again if this failed once.
+      this._targetFileChecked = true;
+    }
+
+    // Update the commands only if the element is still selected.
+    if (this.element.selected) {
+      goUpdateDownloadCommands();
+    }
+
+    // Ensure the interface has been updated based on the new values. We need to
+    // do this because history downloads can't trigger update notifications.
+    this._updateProgress();
+  }),
 };
 
 /**
  * A Downloads Places View is a places view designed to show a places query
- * for history downloads alongside the current "session"-downloads.
+ * for history downloads alongside the session downloads.
  *
  * As we don't use the places controller, some methods implemented by other
  * places views are not implemented by this view.
@@ -774,7 +492,7 @@ function DownloadsPlacesView(aRichListBox, aActive = true) {
   this._downloadElementsShellsForURI = new Map();
 
   // Map download data items to their element shells.
-  this._viewItemsForDataItems = new WeakMap();
+  this._viewItemsForDownloads = new WeakMap();
 
   // Points to the last session download element. We keep track of this
   // in order to keep all session downloads above past downloads.
@@ -817,44 +535,83 @@ DownloadsPlacesView.prototype = {
     return this._active;
   },
 
-  _forEachDownloadElementShellForURI:
-  function DPV__forEachDownloadElementShellForURI(aURI, aCallback) {
-    if (this._downloadElementsShellsForURI.has(aURI)) {
-      let downloadElementShells = this._downloadElementsShellsForURI.get(aURI);
-      for (let des of downloadElementShells) {
-        aCallback(des);
+  /**
+   * This cache exists in order to optimize the load of the Downloads View, when
+   * Places annotations for history downloads must be read. In fact, annotations
+   * are stored in a single table, and reading all of them at once is much more
+   * efficient than an individual query.
+   *
+   * When this property is first requested, it reads the annotations for all the
+   * history downloads and stores them indefinitely.
+   *
+   * The historical annotations are not expected to change for the duration of
+   * the session, except in the case where a session download is running for the
+   * same URI as a history download. To ensure we don't use stale data, URIs
+   * corresponding to session downloads are permanently removed from the cache.
+   * This is a very small mumber compared to history downloads.
+   *
+   * This property returns a Map from each download source URI found in Places
+   * annotations to an object with the format:
+   *
+   * { targetFileSpec, state, endTime, fileSize, ... }
+   *
+   * The targetFileSpec property is the value of "downloads/destinationFileURI",
+   * while the other properties are taken from "downloads/metaData". Any of the
+   * properties may be missing from the object.
+   */
+  get _cachedPlacesMetaData() {
+    if (!this.__cachedPlacesMetaData) {
+      this.__cachedPlacesMetaData = new Map();
+
+      // Read the metadata annotations first, but ignore invalid JSON.
+      for (let result of PlacesUtils.annotations.getAnnotationsWithName(
+                                                 DOWNLOAD_META_DATA_ANNO)) {
+        try {
+          this.__cachedPlacesMetaData.set(result.uri.spec,
+                                          JSON.parse(result.annotationValue));
+        } catch (ex) {}
       }
-    }
-  },
 
-  _getAnnotationsFor: function DPV_getAnnotationsFor(aURI) {
-    if (!this._cachedAnnotations) {
-      this._cachedAnnotations = new Map();
-      for (let name of [ DESTINATION_FILE_URI_ANNO,
-                         DOWNLOAD_META_DATA_ANNO ]) {
-        let results = PlacesUtils.annotations.getAnnotationsWithName(name);
-        for (let result of results) {
-          let url = result.uri.spec;
-          if (!this._cachedAnnotations.has(url))
-            this._cachedAnnotations.set(url, new Map());
-          let m = this._cachedAnnotations.get(url);
-          m.set(result.annotationName, result.annotationValue);
+      // Add the target file annotations to the metadata.
+      for (let result of PlacesUtils.annotations.getAnnotationsWithName(
+                                                 DESTINATION_FILE_URI_ANNO)) {
+        let metaData = this.__cachedPlacesMetaData.get(result.uri.spec);
+        if (!metaData) {
+          metaData = {};
+          this.__cachedPlacesMetaData.set(result.uri.spec, metaData);
         }
+        metaData.targetFileSpec = result.annotationValue;
       }
     }
 
-    let annotations = this._cachedAnnotations.get(aURI);
-    if (!annotations) {
-      // There are no annotations for this entry, that means it is quite old.
-      // Make up a fake annotations entry with default values.
-      annotations = new Map();
-      annotations.set(DESTINATION_FILE_URI_ANNO, NOT_AVAILABLE);
-    }
-    // The meta-data annotation has been added recently, so it's likely missing.
-    if (!annotations.has(DOWNLOAD_META_DATA_ANNO)) {
-      annotations.set(DOWNLOAD_META_DATA_ANNO, NOT_AVAILABLE);
-    }
-    return annotations;
+    return this.__cachedPlacesMetaData;
+  },
+  __cachedPlacesMetaData: null,
+
+  /**
+   * Reads current metadata from Places annotations for the specified URI, and
+   * returns an object with the format:
+   *
+   * { targetFileSpec, state, endTime, fileSize, ... }
+   *
+   * The targetFileSpec property is the value of "downloads/destinationFileURI",
+   * while the other properties are taken from "downloads/metaData". Any of the
+   * properties may be missing from the object.
+   */
+  _getPlacesMetaDataFor(spec) {
+    let metaData = {};
+
+    try {
+      let uri = NetUtil.newURI(spec);
+      try {
+        metaData = JSON.parse(PlacesUtils.annotations.getPageAnnotation(
+                                          uri, DOWNLOAD_META_DATA_ANNO));
+      } catch (ex) {}
+      metaData.targetFileSpec = PlacesUtils.annotations.getPageAnnotation(
+                                            uri, DESTINATION_FILE_URI_ANNO);
+    } catch (ex) {}
+
+    return metaData;
   },
 
   /**
@@ -869,14 +626,12 @@ DownloadsPlacesView.prototype = {
    *     alongside the other session downloads. If we don't, then we go ahead
    *     and create a new element for the download.
    *
-   * @param aDataItem
-   *        The data item of a session download. Set to null for history
-   *        downloads data.
+   * @param [optional] sessionDownload
+   *        A Download object, or null for history downloads.
    * @param [optional] aPlacesNode
-   *        The places node for a history download. Required if there's no data
-   *        item.
+   *        The Places node for a history download, or null for session downloads.
    * @param [optional] aNewest
-   *        @see onDataItemAdded. Ignored for history downloads.
+   *        @see onDownloadAdded. Ignored for history downloads.
    * @param [optional] aDocumentFragment
    *        To speed up the appending of multiple elements to the end of the
    *        list which are coming in a single batch (i.e. invalidateContainer),
@@ -884,16 +639,28 @@ DownloadsPlacesView.prototype = {
    *        be appended. It's the caller's job to ensure the fragment is merged
    *        to the richlistbox at the end.
    */
-  _addDownloadData:
-  function DPV_addDownloadData(aDataItem, aPlacesNode, aNewest = false,
+  _addDownloadData(sessionDownload, aPlacesNode, aNewest = false,
                                aDocumentFragment = null) {
-    let downloadURI = aPlacesNode ? aPlacesNode.uri : aDataItem.uri;
+    let downloadURI = aPlacesNode ? aPlacesNode.uri
+                                  : sessionDownload.source.url;
     let shellsForURI = this._downloadElementsShellsForURI.get(downloadURI);
     if (!shellsForURI) {
       shellsForURI = new Set();
       this._downloadElementsShellsForURI.set(downloadURI, shellsForURI);
     }
 
+    // When a session download is attached to a shell, we ensure not to keep
+    // stale metadata around for the corresponding history download. This
+    // prevents stale state from being used if the view is rebuilt.
+    //
+    // Note that we will eagerly load the data in the cache at this point, even
+    // if we have seen no history download. The case where no history download
+    // will appear at all is rare enough in normal usage, so we can apply this
+    // simpler solution rather than keeping a list of cache items to ignore.
+    if (sessionDownload) {
+      this._cachedPlacesMetaData.delete(sessionDownload.source.url);
+    }
+
     let newOrUpdatedShell = null;
 
     // Trivial: if there are no shells for this download URI, we always
@@ -911,44 +678,64 @@ DownloadsPlacesView.prototype = {
     //    item).
     //
     // Note: If a cancelled session download is already in the list, and the
-    // download is retired, onDataItemAdded is called again for the same
+    // download is retried, onDownloadAdded is called again for the same
     // data item. Thus, we also check that we make sure we don't have a view item
     // already.
     if (!shouldCreateShell &&
-        aDataItem && this.getViewItem(aDataItem) == null) {
+        sessionDownload && !this._viewItemsForDownloads.has(sessionDownload)) {
       // If there's a past-download-only shell for this download-uri with no
       // associated data item, use it for the new data item. Otherwise, go ahead
       // and create another shell.
       shouldCreateShell = true;
       for (let shell of shellsForURI) {
-        if (!shell.dataItem) {
+        if (!shell.sessionDownload) {
           shouldCreateShell = false;
-          shell.dataItem = aDataItem;
+          shell.sessionDownload = sessionDownload;
           newOrUpdatedShell = shell;
-          this._viewItemsForDataItems.set(aDataItem, shell);
+          this._viewItemsForDownloads.set(sessionDownload, shell);
           break;
         }
       }
     }
 
     if (shouldCreateShell) {
-      // Bug 836271: The annotations for a url should be cached only when the
-      // places node is available, i.e. when we know we we'd be notified for
-      // annotation changes. 
-      // Otherwise we may cache NOT_AVILABLE values first for a given session
-      // download, and later use these NOT_AVILABLE values when a history
-      // download for the same URL is added.
-      let cachedAnnotations = aPlacesNode ? this._getAnnotationsFor(downloadURI) : null;
-      let shell = new DownloadElementShell(aDataItem, aPlacesNode, cachedAnnotations);
+      // If we are adding a new history download here, it means there is no
+      // associated session download, thus we must read the Places metadata,
+      // because it will not be obscured by the session download.
+      let historyDownload = null;
+      if (aPlacesNode) {
+        let metaData = this._cachedPlacesMetaData.get(aPlacesNode.uri) ||
+                       this._getPlacesMetaDataFor(aPlacesNode.uri);
+        historyDownload = new HistoryDownload(aPlacesNode);
+        historyDownload.updateFromMetaData(metaData);
+      }
+      let shell = new HistoryDownloadElementShell(sessionDownload,
+                                                  historyDownload);
+      shell.element._placesNode = aPlacesNode;
       newOrUpdatedShell = shell;
       shellsForURI.add(shell);
-      if (aDataItem)
-        this._viewItemsForDataItems.set(aDataItem, shell);
+      if (sessionDownload) {
+        this._viewItemsForDownloads.set(sessionDownload, shell);
+      }
     }
     else if (aPlacesNode) {
+      // We are updating information for a history download for which we have
+      // at least one download element shell already. There are two cases:
+      // 1) There are one or more download element shells for this source URI,
+      //    each with an associated session download. We update the Places node
+      //    because we may need it later, but we don't need to read the Places
+      //    metadata until the last session download is removed.
+      // 2) Occasionally, we may receive a duplicate notification for a history
+      //    download with no associated session download. We have exactly one
+      //    download element shell in this case, but the metdata cannot have
+      //    changed, just the reference to the Places node object is different.
+      // So, we update all the node references and keep the metadata intact.
       for (let shell of shellsForURI) {
-        if (shell.placesNode != aPlacesNode)
-          shell.placesNode = aPlacesNode;
+        if (!shell.historyDownload) {
+          // Create the element to host the metadata when needed.
+          shell.historyDownload = new HistoryDownload(aPlacesNode);
+        }
+        shell.element._placesNode = aPlacesNode;
       }
     }
 
@@ -963,8 +750,7 @@ DownloadsPlacesView.prototype = {
         // the top of the richlistbox, along with other session downloads.
         // More generally, if a new download is added, should be made visible.
         this._richlistbox.ensureElementIsVisible(newOrUpdatedShell.element);
-      }
-      else if (aDataItem) {
+      } else if (sessionDownload) {
         let before = this._lastSessionDownloadElement ?
           this._lastSessionDownloadElement.nextSibling : this._richlistbox.firstChild;
         this._richlistbox.insertBefore(newOrUpdatedShell.element, before);
@@ -1015,8 +801,8 @@ DownloadsPlacesView.prototype = {
     let shellsForURI = this._downloadElementsShellsForURI.get(downloadURI);
     if (shellsForURI) {
       for (let shell of shellsForURI) {
-        if (shell.dataItem) {
-          shell.placesNode = null;
+        if (shell.sessionDownload) {
+          shell.historyDownload = null;
         }
         else {
           this._removeElement(shell.element);
@@ -1028,13 +814,13 @@ DownloadsPlacesView.prototype = {
     }
   },
 
-  _removeSessionDownloadFromView:
-  function DPV__removeSessionDownloadFromView(aDataItem) {
-    let shells = this._downloadElementsShellsForURI.get(aDataItem.uri);
+  _removeSessionDownloadFromView(download) {
+    let shells = this._downloadElementsShellsForURI
+                     .get(download.source.url);
     if (shells.size == 0)
       throw new Error("Should have had at leaat one shell for this uri");
 
-    let shell = this.getViewItem(aDataItem);
+    let shell = this._viewItemsForDownloads.get(download);
     if (!shells.has(shell))
       throw new Error("Missing download element shell in shells list for url");
 
@@ -1042,14 +828,22 @@ DownloadsPlacesView.prototype = {
     // view item for this this particular data item go away.
     // If there's only one item for this download uri, we should only
     // keep it if it is associated with a history download.
-    if (shells.size > 1 || !shell.placesNode) {
+    if (shells.size > 1 || !shell.historyDownload) {
       this._removeElement(shell.element);
       shells.delete(shell);
       if (shells.size == 0)
-        this._downloadElementsShellsForURI.delete(aDataItem.uri);
+        this._downloadElementsShellsForURI.delete(download.source.url);
     }
     else {
-      shell.dataItem = null;
+      // We have one download element shell containing both a session download
+      // and a history download, and we are now removing the session download.
+      // Previously, we did not use the Places metadata because it was obscured
+      // by the session download. Since this is no longer the case, we have to
+      // read the latest metadata before removing the session download.
+      let url = shell.historyDownload.source.url;
+      let metaData = this._getPlacesMetaDataFor(url);
+      shell.historyDownload.updateFromMetaData(metaData);
+      shell.sessionDownload = null;
       // Move it below the session-download items;
       if (this._lastSessionDownloadElement == shell.element) {
         this._lastSessionDownloadElement = shell.element.previousSibling;
@@ -1157,13 +951,9 @@ DownloadsPlacesView.prototype = {
   },
 
   get selectedNodes() {
-    let placesNodes = [];
-    let selectedElements = this._richlistbox.selectedItems;
-    for (let elt of selectedElements) {
-      if (elt._shell.placesNode)
-        placesNodes.push(elt._shell.placesNode);
-    }
-    return placesNodes;
+    return [for (element of this._richlistbox.selectedItems)
+            if (element._placesNode)
+            element._placesNode];
   },
 
   get selectedNode() {
@@ -1193,8 +983,9 @@ DownloadsPlacesView.prototype = {
       // Loop backwards since _removeHistoryDownloadFromView may removeChild().
       for (let i = this._richlistbox.childNodes.length - 1; i >= 0; --i) {
         let element = this._richlistbox.childNodes[i];
-        if (element._shell.placesNode)
-          this._removeHistoryDownloadFromView(element._shell.placesNode);
+        if (element._placesNode) {
+          this._removeHistoryDownloadFromView(element._placesNode);
+        }
       }
     }
     finally {
@@ -1254,24 +1045,9 @@ DownloadsPlacesView.prototype = {
     this._removeHistoryDownloadFromView(aPlacesNode);
   },
 
-  nodeIconChanged: function DPV_nodeIconChanged(aNode) {
-    this._forEachDownloadElementShellForURI(aNode.uri, function(aDownloadElementShell) {
-      aDownloadElementShell.placesNodeIconChanged();
-    });
-  },
-
-  nodeAnnotationChanged: function DPV_nodeAnnotationChanged(aNode, aAnnoName) {
-    this._forEachDownloadElementShellForURI(aNode.uri, function(aDownloadElementShell) {
-      aDownloadElementShell.placesNodeAnnotationChanged(aAnnoName);
-    });
-  },
-
-  nodeTitleChanged: function DPV_nodeTitleChanged(aNode, aNewTitle) {
-    this._forEachDownloadElementShellForURI(aNode.uri, function(aDownloadElementShell) {
-      aDownloadElementShell.placesNodeTitleChanged();
-    });
-  },
-
+  nodeAnnotationChanged() {},
+  nodeIconChanged() {},
+  nodeTitleChanged() {},
   nodeKeywordChanged: function() {},
   nodeDateAddedChanged: function() {},
   nodeLastModifiedChanged: function() {},
@@ -1334,16 +1110,21 @@ DownloadsPlacesView.prototype = {
     this._ensureInitialSelection();
   },
 
-  onDataItemAdded: function DPV_onDataItemAdded(aDataItem, aNewest) {
-    this._addDownloadData(aDataItem, null, aNewest);
+  onDownloadAdded(download, newest) {
+    this._addDownloadData(download, null, newest);
   },
 
-  onDataItemRemoved: function DPV_onDataItemRemoved(aDataItem) {
-    this._removeSessionDownloadFromView(aDataItem);
+  onDownloadStateChanged(download) {
+    this._viewItemsForDownloads.get(download).onStateChanged();
   },
 
-  getViewItem: function(aDataItem)
-    this._viewItemsForDataItems.get(aDataItem, null),
+  onDownloadChanged(download) {
+    this._viewItemsForDownloads.get(download).onChanged();
+  },
+
+  onDownloadRemoved(download) {
+    this._removeSessionDownloadFromView(download);
+  },
 
   supportsCommand: function DPV_supportsCommand(aCommand) {
     if (DOWNLOAD_VIEW_SUPPORTED_COMMANDS.indexOf(aCommand) != -1) {
@@ -1386,8 +1167,11 @@ DownloadsPlacesView.prototype = {
     // Because history downloads are always removable and are listed after the
     // session downloads, check from bottom to top.
     for (let elt = this._richlistbox.lastChild; elt; elt = elt.previousSibling) {
-      if (elt._shell.placesNode || !elt._shell.dataItem.inProgress)
+      // Stopped, paused, and failed downloads with partial data are removed.
+      let download = elt._shell.download;
+      if (download.stopped && !(download.canceled && download.hasPartialData)) {
         return true;
+      }
     }
     return false;
   },
@@ -1395,10 +1179,11 @@ DownloadsPlacesView.prototype = {
   _copySelectedDownloadsToClipboard:
   function DPV__copySelectedDownloadsToClipboard() {
     let urls = [for (element of this._richlistbox.selectedItems)
-                     element._shell.downloadURI];
+                element._shell.download.source.url];
 
-    Cc["@mozilla.org/widget/clipboardhelper;1"].
-    getService(Ci.nsIClipboardHelper).copyString(urls.join("\n"));
+    Cc["@mozilla.org/widget/clipboardhelper;1"]
+      .getService(Ci.nsIClipboardHelper)
+      .copyString(urls.join("\n"), document);
   },
 
   _getURLFromClipboardData: function DPV__getURLFromClipboardData() {
@@ -1486,15 +1271,13 @@ DownloadsPlacesView.prototype = {
 
     // Set the state attribute so that only the appropriate items are displayed.
     let contextMenu = document.getElementById("downloadsContextMenu");
-    let state = element._shell.getDownloadMetaData().state;
-    if (state !== undefined)
-      contextMenu.setAttribute("state", state);
-    else
-      contextMenu.removeAttribute("state");
-
-    if (state == nsIDM.DOWNLOAD_DOWNLOADING) {
-      // The resumable property of a download may change at any time, so
-      // ensure we update the related command now.
+    let download = element._shell.download;
+    contextMenu.setAttribute("state",
+                             DownloadsCommon.stateOfDownload(download));
+
+    if (!download.stopped) {
+      // The hasPartialData property of a download may change at any time after
+      // it has started, so ensure we update the related command now.
       goUpdateCommand("downloadsCmd_pauseResume");
     }
     return true;
@@ -1555,10 +1338,13 @@ DownloadsPlacesView.prototype = {
     if (!selectedItem)
       return;
 
-    let metaData = selectedItem._shell.getDownloadMetaData();
-    if (!("filePath" in metaData))
+    let targetPath = selectedItem._shell.download.target.path;
+    if (!targetPath) {
       return;
-    let file = new FileUtils.File(metaData.filePath);
+    }
+
+    // We must check for existence synchronously because this is a DOM event.
+    let file = new FileUtils.File(targetPath);
     if (!file.exists())
       return;
 
diff --git a/application/palemoon/components/downloads/content/downloads.js b/application/palemoon/components/downloads/content/downloads.js
index 833d7d72f..ee1c6902e 100644
--- a/application/palemoon/components/downloads/content/downloads.js
+++ b/application/palemoon/components/downloads/content/downloads.js
@@ -4,6 +4,23 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
+                                  "resource:///modules/DownloadsCommon.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadsViewUI",
+                                  "resource:///modules/DownloadsViewUI.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+                                  "resource://gre/modules/FileUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+                                  "resource://gre/modules/NetUtil.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+                                  "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+                                  "resource://gre/modules/Services.jsm");
+
 /**
  * Handles the Downloads panel user interface for each browser window.
  *
@@ -65,22 +82,6 @@
 "use strict";
 
 ////////////////////////////////////////////////////////////////////////////////
-//// Globals
-
-XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
-                                  "resource://gre/modules/DownloadUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
-                                  "resource:///modules/DownloadsCommon.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "OS",
-                                  "resource://gre/modules/osfile.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-                                  "resource://gre/modules/PrivateBrowsingUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-
-////////////////////////////////////////////////////////////////////////////////
 //// DownloadsPanel
 
 /**
@@ -570,8 +571,8 @@ const DownloadsPanel = {
       // still exist, and update the allowed items interactions accordingly.  We
       // do these checks on a background thread, and don't prevent the panel to
       // be displayed while these checks are being performed.
-      for each (let viewItem in DownloadsView._viewItems) {
-        viewItem.verifyTargetExists();
+      for (let viewItem of DownloadsView._visibleViewItems.values()) {
+        viewItem.download.refresh().catch(Cu.reportError);
       }
 
       if (aAnchor) {
@@ -703,19 +704,19 @@ const DownloadsView = {
   loading: false,
 
   /**
-   * Ordered array of all DownloadsDataItem objects.  We need to keep this array
-   * because only a limited number of items are shown at once, and if an item
-   * that is currently visible is removed from the list, we might need to take
-   * another item from the array and make it appear at the bottom.
+   * Ordered array of all Download objects.  We need to keep this array because
+   * only a limited number of items are shown at once, and if an item that is
+   * currently visible is removed from the list, we might need to take another
+   * item from the array and make it appear at the bottom.
    */
-  _dataItems: [],
+  _downloads: [],
 
   /**
-   * Object containing the available DownloadsViewItem objects, indexed by their
-   * numeric download identifier.  There is a limited number of view items in
-   * the panel at any given time.
+   * Associates the visible Download objects with their corresponding
+   * DownloadsViewItem object.  There is a limited number of view items in the
+   * panel at any given time.
    */
-  _viewItems: {},
+  _visibleViewItems: new Map(),
 
   /**
    * Called when the number of items in the list changes.
@@ -723,8 +724,8 @@ const DownloadsView = {
   _itemCountChanged: function DV_itemCountChanged()
   {
     DownloadsCommon.log("The downloads item count has changed - we are tracking",
-                        this._dataItems.length, "downloads in total.");
-    let count = this._dataItems.length;
+                        this._downloads.length, "downloads in total.");
+    let count = this._downloads.length;
     let hiddenCount = count - this.kItemCountLimit;
 
     if (count > 0) {
@@ -813,8 +814,8 @@ const DownloadsView = {
    * Called when a new download data item is available, either during the
    * asynchronous data load or when a new download is started.
    *
-   * @param aDataItem
-   *        DownloadsDataItem object that was just added.
+   * @param aDownload
+   *        Download object that was just added.
    * @param aNewest
    *        When true, indicates that this item is the most recent and should be
    *        added in the topmost position.  This happens when a new download is
@@ -822,28 +823,27 @@ const DownloadsView = {
    *        and should be appended.  The latter generally happens during the
    *        asynchronous data load.
    */
-  onDataItemAdded: function DV_onDataItemAdded(aDataItem, aNewest)
-  {
+  onDownloadAdded(download, aNewest) {
     DownloadsCommon.log("A new download data item was added - aNewest =",
                         aNewest);
 
     if (aNewest) {
-      this._dataItems.unshift(aDataItem);
+      this._downloads.unshift(download);
     } else {
-      this._dataItems.push(aDataItem);
+      this._downloads.push(download);
     }
 
-    let itemsNowOverflow = this._dataItems.length > this.kItemCountLimit;
+    let itemsNowOverflow = this._downloads.length > this.kItemCountLimit;
     if (aNewest || !itemsNowOverflow) {
       // The newly added item is visible in the panel and we must add the
       // corresponding element.  This is either because it is the first item, or
       // because it was added at the bottom but the list still doesn't overflow.
-      this._addViewItem(aDataItem, aNewest);
+      this._addViewItem(download, aNewest);
     }
     if (aNewest && itemsNowOverflow) {
       // If the list overflows, remove the last item from the panel to make room
       // for the new one that we just added at the top.
-      this._removeViewItem(this._dataItems[this.kItemCountLimit]);
+      this._removeViewItem(this._downloads[this.kItemCountLimit]);
     }
 
     // For better performance during batch loads, don't update the count for
@@ -853,26 +853,39 @@ const DownloadsView = {
     }
   },
 
+  onDownloadStateChanged(download) {
+    let viewItem = this._visibleViewItems.get(download);
+    if (viewItem) {
+      viewItem.onStateChanged();
+    }
+  },
+
+  onDownloadChanged(download) {
+    let viewItem = this._visibleViewItems.get(download);
+    if (viewItem) {
+      viewItem.onChanged();
+    }
+  },
+
   /**
    * Called when a data item is removed.  Ensures that the widget associated
    * with the view item is removed from the user interface.
    *
-   * @param aDataItem
-   *        DownloadsDataItem object that is being removed.
+   * @param download
+   *        Download object that is being removed.
    */
-  onDataItemRemoved: function DV_onDataItemRemoved(aDataItem)
-  {
+  onDownloadRemoved(download) {
     DownloadsCommon.log("A download data item was removed.");
 
-    let itemIndex = this._dataItems.indexOf(aDataItem);
-    this._dataItems.splice(itemIndex, 1);
+    let itemIndex = this._downloads.indexOf(download);
+    this._downloads.splice(itemIndex, 1);
 
     if (itemIndex < this.kItemCountLimit) {
       // The item to remove is visible in the panel.
-      this._removeViewItem(aDataItem);
-      if (this._dataItems.length >= this.kItemCountLimit) {
+      this._removeViewItem(download);
+      if (this._downloads.length >= this.kItemCountLimit) {
         // Reinsert the next item into the panel.
-        this._addViewItem(this._dataItems[this.kItemCountLimit - 1], false);
+        this._addViewItem(this._downloads[this.kItemCountLimit - 1], false);
       }
     }
 
@@ -880,43 +893,29 @@ const DownloadsView = {
   },
 
   /**
-   * Returns the view item associated with the provided data item for this view.
-   *
-   * @param aDataItem
-   *        DownloadsDataItem object for which the view item is requested.
-   *
-   * @return Object that can be used to notify item status events.
+   * Associates each richlistitem for a download with its corresponding
+   * DownloadsViewItemController object.
    */
-  getViewItem: function DV_getViewItem(aDataItem)
-  {
-    // If the item is visible, just return it, otherwise return a mock object
-    // that doesn't react to notifications.
-    if (aDataItem.downloadGuid in this._viewItems) {
-      return this._viewItems[aDataItem.downloadGuid];
-    }
-    return this._invisibleViewItem;
-  },
+  _controllersForElements: new Map(),
 
-  /**
-   * Mock DownloadsDataItem object that doesn't react to notifications.
-   */
-  _invisibleViewItem: Object.freeze({
-    onStateChange: function () { },
-    onProgressChange: function () { }
-  }),
+  controllerForElement(element) {
+    return this._controllersForElements.get(element);
+  },
 
   /**
    * Creates a new view item associated with the specified data item, and adds
    * it to the top or the bottom of the list.
    */
-  _addViewItem: function DV_addViewItem(aDataItem, aNewest)
+  _addViewItem(download, aNewest)
   {
     DownloadsCommon.log("Adding a new DownloadsViewItem to the downloads list.",
                         "aNewest =", aNewest);
 
     let element = document.createElement("richlistitem");
-    let viewItem = new DownloadsViewItem(aDataItem, element);
-    this._viewItems[aDataItem.downloadGuid] = viewItem;
+    let viewItem = new DownloadsViewItem(download, element);
+    this._visibleViewItems.set(download, viewItem);
+    let viewItemController = new DownloadsViewItemController(download);
+    this._controllersForElements.set(element, viewItemController);
     if (aNewest) {
       this.richListBox.insertBefore(element, this.richListBox.firstChild);
     } else {
@@ -927,17 +926,17 @@ const DownloadsView = {
   /**
    * Removes the view item associated with the specified data item.
    */
-  _removeViewItem: function DV_removeViewItem(aDataItem)
-  {
+  _removeViewItem(download) {
     DownloadsCommon.log("Removing a DownloadsViewItem from the downloads list.");
-    let element = this.getViewItem(aDataItem)._element;
+    let element = this._visibleViewItems.get(download).element;
     let previousSelectedIndex = this.richListBox.selectedIndex;
     this.richListBox.removeChild(element);
     if (previousSelectedIndex != -1) {
       this.richListBox.selectedIndex = Math.min(previousSelectedIndex,
                                                 this.richListBox.itemCount - 1);
     }
-    delete this._viewItems[aDataItem.downloadGuid];
+    this._visibleViewItems.delete(download);
+    this._controllersForElements.delete(element);
   },
 
   //////////////////////////////////////////////////////////////////////////////
@@ -959,7 +958,7 @@ const DownloadsView = {
     while (target.nodeName != "richlistitem") {
       target = target.parentNode;
     }
-    new DownloadsViewItemController(target).doCommand(aCommand);
+    DownloadsView.controllerForElement(target).doCommand(aCommand);
   },
 
   onDownloadClick: function DV_onDownloadClick(aEvent)
@@ -1038,8 +1037,9 @@ const DownloadsView = {
       return;
     }
 
-    let controller = new DownloadsViewItemController(element);
-    let localFile = controller.dataItem.localFile;
+    // We must check for existence synchronously because this is a DOM event.
+    let localFile = new FileUtils.File(DownloadsView.controllerForElement(element)
+                                                    .download.target.path);
     if (!localFile.exists()) {
       return;
     }
@@ -1065,259 +1065,39 @@ XPCOMUtils.defineConstant(this, "DownloadsView", DownloadsView);
  * Builds and updates a single item in the downloads list widget, responding to
  * changes in the download state and real-time data.
  *
- * @param aDataItem
- *        DownloadsDataItem to be associated with the view item.
+ * @param download
+ *        Download object to be associated with the view item.
  * @param aElement
  *        XUL element corresponding to the single download item in the view.
  */
-function DownloadsViewItem(aDataItem, aElement)
-{
-  this._element = aElement;
-  this.dataItem = aDataItem;
-
-  this.lastEstimatedSecondsLeft = Infinity;
-
-  // Set the URI that represents the correct icon for the target file.  As soon
-  // as bug 239948 comment 12 is handled, the "file" property will be always a
-  // file URL rather than a file name.  At that point we should remove the "//"
-  // (double slash) from the icon URI specification (see test_moz_icon_uri.js).
-  this.image = "moz-icon://" + this.dataItem.file + "?size=32";
-
-  let s = DownloadsCommon.strings;
-  let [displayHost, fullHost] =
-    DownloadUtils.getURIHost(this.dataItem.referrer || this.dataItem.uri);
-
-  let attributes = {
-    "type": "download",
-    "class": "download-state",
-    "id": "downloadsItem_" + this.dataItem.downloadGuid,
-    "downloadGuid": this.dataItem.downloadGuid,
-    "state": this.dataItem.state,
-    "progress": this.dataItem.inProgress ? this.dataItem.percentComplete : 100,
-    "displayName": this.dataItem.target,
-    "extendedDisplayName": s.statusSeparator(this.dataItem.target, displayHost),
-    "extendedDisplayNameTip": s.statusSeparator(this.dataItem.target, fullHost),
-    "image": this.image
-  };
-
-  for (let attributeName in attributes) {
-    this._element.setAttribute(attributeName, attributes[attributeName]);
-  }
+function DownloadsViewItem(download, aElement) {
+  this.download = download;
+
+  this.element = aElement;
+  this.element._shell = this;
 
-  // Initialize more complex attributes.
-  this._updateProgress();
-  this._updateStatusLine();
-  this.verifyTargetExists();
+  this.element.setAttribute("type", "download");
+  this.element.classList.add("download-state");
+
+  this._updateState();
 }
 
 DownloadsViewItem.prototype = {
-  /**
-   * The DownloadDataItem associated with this view item.
-   */
-  dataItem: null,
+  __proto__: DownloadsViewUI.DownloadElementShell.prototype,
 
   /**
    * The XUL element corresponding to the associated richlistbox item.
    */
   _element: null,
 
-  /**
-   * The inner XUL element for the progress bar, or null if not available.
-   */
-  _progressElement: null,
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Callback functions from DownloadsData
-
-  /**
-   * Called when the download state might have changed.  Sometimes the state of
-   * the download might be the same as before, if the data layer received
-   * multiple events for the same download.
-   */
-  onStateChange: function DVI_onStateChange(aOldState)
-  {
-    // If a download just finished successfully, it means that the target file
-    // now exists and we can extract its specific icon.  To ensure that the icon
-    // is reloaded, we must change the URI used by the XUL image element, for
-    // example by adding a query parameter.  Since this URI has a "moz-icon"
-    // scheme, this only works if we add one of the parameters explicitly
-    // supported by the nsIMozIconURI interface.
-    if (aOldState != Ci.nsIDownloadManager.DOWNLOAD_FINISHED &&
-        aOldState != this.dataItem.state) {
-      this._element.setAttribute("image", this.image + "&state=normal");
-
-      // We assume the existence of the target of a download that just completed
-      // successfully, without checking the condition in the background.  If the
-      // panel is already open, this will take effect immediately.  If the panel
-      // is opened later, a new background existence check will be performed.
-      this._element.setAttribute("exists", "true");
-    }
-
-    // Update the user interface after switching states.
-    this._element.setAttribute("state", this.dataItem.state);
-    this._updateProgress();
-    this._updateStatusLine();
+  onStateChanged() {
+    this.element.setAttribute("image", this.image);
+    this.element.setAttribute("state",
+                              DownloadsCommon.stateOfDownload(this.download));
   },
 
-  /**
-   * Called when the download progress has changed.
-   */
-  onProgressChange: function DVI_onProgressChange() {
+  onChanged() {
     this._updateProgress();
-    this._updateStatusLine();
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Functions for updating the user interface
-
-  /**
-   * Updates the progress bar.
-   */
-  _updateProgress: function DVI_updateProgress() {
-    if (this.dataItem.starting) {
-      // Before the download starts, the progress meter has its initial value.
-      this._element.setAttribute("progressmode", "normal");
-      this._element.setAttribute("progress", "0");
-    } else if (this.dataItem.state == Ci.nsIDownloadManager.DOWNLOAD_SCANNING ||
-               this.dataItem.percentComplete == -1) {
-      // We might not know the progress of a running download, and we don't know
-      // the remaining time during the malware scanning phase.
-      this._element.setAttribute("progressmode", "undetermined");
-    } else {
-      // This is a running download of which we know the progress.
-      this._element.setAttribute("progressmode", "normal");
-      this._element.setAttribute("progress", this.dataItem.percentComplete);
-    }
-
-    // Find the progress element as soon as the download binding is accessible.
-    if (!this._progressElement) {
-      this._progressElement =
-           document.getAnonymousElementByAttribute(this._element, "anonid",
-                                                   "progressmeter");
-    }
-
-    // Dispatch the ValueChange event for accessibility, if possible.
-    if (this._progressElement) {
-      let event = document.createEvent("Events");
-      event.initEvent("ValueChange", true, true);
-      this._progressElement.dispatchEvent(event);
-    }
-  },
-
-  /**
-   * Updates the main status line, including bytes transferred, bytes total,
-   * download rate, and time remaining.
-   */
-  _updateStatusLine: function DVI_updateStatusLine() {
-    const nsIDM = Ci.nsIDownloadManager;
-
-    let status = "";
-    let statusTip = "";
-
-    if (this.dataItem.paused) {
-      let transfer = DownloadUtils.getTransferTotal(this.dataItem.currBytes,
-                                                    this.dataItem.maxBytes);
-
-      // We use the same XUL label to display both the state and the amount
-      // transferred, for example "Paused -  1.1 MB".
-      status = DownloadsCommon.strings.statusSeparatorBeforeNumber(
-                                            DownloadsCommon.strings.statePaused,
-                                            transfer);
-    } else if (this.dataItem.state == nsIDM.DOWNLOAD_DOWNLOADING) {
-      // We don't show the rate for each download in order to reduce clutter.
-      // The remaining time per download is likely enough information for the
-      // panel.
-      [status] =
-        DownloadUtils.getDownloadStatusNoRate(this.dataItem.currBytes,
-                                              this.dataItem.maxBytes,
-                                              this.dataItem.speed,
-                                              this.lastEstimatedSecondsLeft);
-
-      // We are, however, OK with displaying the rate in the tooltip.
-      let newEstimatedSecondsLeft;
-      [statusTip, newEstimatedSecondsLeft] =
-        DownloadUtils.getDownloadStatus(this.dataItem.currBytes,
-                                        this.dataItem.maxBytes,
-                                        this.dataItem.speed,
-                                        this.lastEstimatedSecondsLeft);
-      this.lastEstimatedSecondsLeft = newEstimatedSecondsLeft;
-    } else if (this.dataItem.starting) {
-      status = DownloadsCommon.strings.stateStarting;
-    } else if (this.dataItem.state == nsIDM.DOWNLOAD_SCANNING) {
-      status = DownloadsCommon.strings.stateScanning;
-    } else if (!this.dataItem.inProgress) {
-      let stateLabel = function () {
-        let s = DownloadsCommon.strings;
-        switch (this.dataItem.state) {
-          case nsIDM.DOWNLOAD_FAILED:           return s.stateFailed;
-          case nsIDM.DOWNLOAD_CANCELED:         return s.stateCanceled;
-          case nsIDM.DOWNLOAD_BLOCKED_PARENTAL: return s.stateBlockedParentalControls;
-          case nsIDM.DOWNLOAD_BLOCKED_POLICY:   return s.stateBlockedPolicy;
-          case nsIDM.DOWNLOAD_DIRTY:            return s.stateDirty;
-          case nsIDM.DOWNLOAD_FINISHED:         return this._fileSizeText;
-        }
-        return null;
-      }.apply(this);
-
-      let [displayHost, fullHost] =
-        DownloadUtils.getURIHost(this.dataItem.referrer || this.dataItem.uri);
-
-      let end = new Date(this.dataItem.endTime);
-      let [displayDate, fullDate] = DownloadUtils.getReadableDates(end);
-
-      // We use the same XUL label to display the state, the host name, and the
-      // end time, for example "Canceled - 222.net - 11:15" or "1.1 MB -
-      // website2.com - Yesterday".  We show the full host and the complete date
-      // in the tooltip.
-      let firstPart = DownloadsCommon.strings.statusSeparator(stateLabel,
-                                                              displayHost);
-      status = DownloadsCommon.strings.statusSeparator(firstPart, displayDate);
-      statusTip = DownloadsCommon.strings.statusSeparator(fullHost, fullDate);
-    }
-
-    this._element.setAttribute("status", status);
-    this._element.setAttribute("statusTip", statusTip || status);
-  },
-
-  /**
-   * Localized string representing the total size of completed downloads, for
-   * example "1.5 MB" or "Unknown size".
-   */
-  get _fileSizeText()
-  {
-    // Display the file size, but show "Unknown" for negative sizes.
-    let fileSize = this.dataItem.maxBytes;
-    if (fileSize < 0) {
-      return DownloadsCommon.strings.sizeUnknown;
-    }
-    let [size, unit] = DownloadUtils.convertByteUnits(fileSize);
-    return DownloadsCommon.strings.sizeWithUnits(size, unit);
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Functions called by the panel
-
-  /**
-   * Starts checking whether the target file of a finished download is still
-   * available on disk, and sets an attribute that controls how the item is
-   * presented visually.
-   *
-   * The existence check is executed on a background thread.
-   */
-  verifyTargetExists: function DVI_verifyTargetExists() {
-    // We don't need to check if the download is not finished successfully.
-    if (!this.dataItem.openable) {
-      return;
-    }
-
-    OS.File.exists(this.dataItem.localFile.path).then(
-      function DVI_RTE_onSuccess(aExists) {
-        if (aExists) {
-          this._element.setAttribute("exists", "true");
-        } else {
-          this._element.removeAttribute("exists");
-        }
-      }.bind(this), Cu.reportError);
   },
 };
 
@@ -1372,8 +1152,8 @@ const DownloadsViewController = {
 
     // Other commands are selection-specific.
     let element = DownloadsView.richListBox.selectedItem;
-    return element &&
-           new DownloadsViewItemController(element).isCommandEnabled(aCommand);
+    return element && DownloadsView.controllerForElement(element)
+                                   .isCommandEnabled(aCommand);
   },
 
   doCommand: function DVC_doCommand(aCommand)
@@ -1388,7 +1168,7 @@ const DownloadsViewController = {
     let element = DownloadsView.richListBox.selectedItem;
     if (element) {
       // The doCommand function also checks if the command is enabled.
-      new DownloadsViewItemController(element).doCommand(aCommand);
+      DownloadsView.controllerForElement(element).doCommand(aCommand);
     }
   },
 
@@ -1428,36 +1208,41 @@ XPCOMUtils.defineConstant(this, "DownloadsViewController", DownloadsViewControll
  * Handles all the user interaction events, in particular the "commands",
  * related to a single item in the downloads list widgets.
  */
-function DownloadsViewItemController(aElement) {
-  let downloadGuid = aElement.getAttribute("downloadGuid");
-  this.dataItem = DownloadsCommon.getData(window).dataItems[downloadGuid];
+function DownloadsViewItemController(download) {
+  this.download = download;
 }
 
 DownloadsViewItemController.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// Command dispatching
-
-  /**
-   * The DownloadDataItem controlled by this object.
-   */
-  dataItem: null,
-
   isCommandEnabled: function DVIC_isCommandEnabled(aCommand)
   {
     switch (aCommand) {
       case "downloadsCmd_open": {
-        return this.dataItem.openable && this.dataItem.localFile.exists();
+        if (!this.download.succeeded) {
+          return false;
+        }
+
+        let file = new FileUtils.File(this.download.target.path);
+        return file.exists();
       }
       case "downloadsCmd_show": {
-        return this.dataItem.localFile.exists() ||
-               this.dataItem.partFile.exists();
+        let file = new FileUtils.File(this.download.target.path);
+        if (file.exists()) {
+          return true;
+        }
+
+        if (!this.download.target.partFilePath) {
+          return false;
+        }
+
+        let partFile = new FileUtils.File(this.download.target.partFilePath);
+        return partFile.exists();
       }
       case "downloadsCmd_pauseResume":
-        return this.dataItem.inProgress && this.dataItem.resumable;
+        return this.download.hasPartialData && !this.download.error;
       case "downloadsCmd_retry":
-        return this.dataItem.canRetry;
+        return this.download.canceled || this.download.error;
       case "downloadsCmd_openReferrer":
-        return !!this.dataItem.referrer;
+        return !!this.download.source.referrer;
       case "cmd_delete":
       case "downloadsCmd_cancel":
       case "downloadsCmd_copyLocation":
@@ -1485,21 +1270,21 @@ DownloadsViewItemController.prototype = {
   commands: {
     cmd_delete: function DVIC_cmd_delete()
     {
-      Downloads.getList(Downloads.ALL)
-               .then(list => list.remove(this.dataItem._download))
-               .then(() => this.dataItem._download.finalize(true))
-               .catch(Cu.reportError);
-      PlacesUtils.bhistory.removePage(NetUtil.newURI(this.dataItem.uri));
+      DownloadsCommon.removeAndFinalizeDownload(this.download);
+      PlacesUtils.bhistory.removePage(
+                             NetUtil.newURI(this.download.source.url));
     },
 
     downloadsCmd_cancel: function DVIC_downloadsCmd_cancel()
     {
-      this.dataItem.cancel();
+      this.download.cancel().catch(() => {});
+      this.download.removePartialData().catch(Cu.reportError);
     },
 
     downloadsCmd_open: function DVIC_downloadsCmd_open()
     {
-      this.dataItem.openLocalFile(window);
+      this.download.launch().catch(Cu.reportError);
+
       // We explicitly close the panel here to give the user the feedback that
       // their click has been received, and we're handling the action.
       // Otherwise, we'd have to wait for the file-type handler to execute
@@ -1510,7 +1295,8 @@ DownloadsViewItemController.prototype = {
 
     downloadsCmd_show: function DVIC_downloadsCmd_show()
     {
-      this.dataItem.showLocalFile();
+      let file = new FileUtils.File(this.download.target.path);
+      DownloadsCommon.showDownloadedFile(file);
 
       // We explicitly close the panel here to give the user the feedback that
       // their click has been received, and we're handling the action.
@@ -1522,24 +1308,28 @@ DownloadsViewItemController.prototype = {
 
     downloadsCmd_pauseResume: function DVIC_downloadsCmd_pauseResume()
     {
-      this.dataItem.togglePauseResume();
+      if (this.download.stopped) {
+        this.download.start();
+      } else {
+        this.download.cancel();
+      }
     },
 
     downloadsCmd_retry: function DVIC_downloadsCmd_retry()
     {
-      this.dataItem.retry();
+      this.download.start().catch(() => {});
     },
 
     downloadsCmd_openReferrer: function DVIC_downloadsCmd_openReferrer()
     {
-      openURL(this.dataItem.referrer);
+      openURL(this.download.source.referrer);
     },
 
     downloadsCmd_copyLocation: function DVIC_downloadsCmd_copyLocation()
     {
       let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"]
                       .getService(Ci.nsIClipboardHelper);
-      clipboard.copyString(this.dataItem.uri, document);
+      clipboard.copyString(this.download.source.url, document);
     },
 
     downloadsCmd_doDefault: function DVIC_downloadsCmd_doDefault()
@@ -1548,7 +1338,7 @@ DownloadsViewItemController.prototype = {
 
       // Determine the default command for the current item.
       let defaultCommand = function () {
-        switch (this.dataItem.state) {
+        switch (DownloadsCommon.stateOfDownload(this.download)) {
           case nsIDM.DOWNLOAD_NOTSTARTED:       return "downloadsCmd_cancel";
           case nsIDM.DOWNLOAD_FINISHED:         return "downloadsCmd_open";
           case nsIDM.DOWNLOAD_FAILED:           return "downloadsCmd_retry";
diff --git a/application/palemoon/components/downloads/moz.build b/application/palemoon/components/downloads/moz.build
index 61d8c0f62..abfaab7df 100644
--- a/application/palemoon/components/downloads/moz.build
+++ b/application/palemoon/components/downloads/moz.build
@@ -15,6 +15,7 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'DownloadsLogger.jsm',
     'DownloadsTaskbar.jsm',
+    'DownloadsViewUI.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index f0a7aa22a..ad48dab29 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -552,14 +552,6 @@ BrowserGlue.prototype = {
       this._showPlacesLockedNotificationBox();
     }
 
-    // If there are plugins installed that are outdated, and the user hasn't
-    // been warned about them yet, open the plugins update page.
-    // Pale Moon: disable this functionality, people are already notified
-    // if they visit a page with an outdated plugin, and they can check
-    // properly from the plugins page as well.
-//    if (Services.prefs.getBoolPref(PREF_PLUGINS_NOTIFYUSER))
-//      this._showPluginUpdatePage();
-
     // For any add-ons that were installed disabled and can be enabled offer
     // them to the user.
     let changedIDs = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_INSTALLED);
diff --git a/application/palemoon/components/places/content/places.js b/application/palemoon/components/places/content/places.js
index a94193823..40dbcb9b8 100644
--- a/application/palemoon/components/places/content/places.js
+++ b/application/palemoon/components/places/content/places.js
@@ -491,7 +491,7 @@ var PlacesOrganizer = {
 
     Task.spawn(function() {
       try {
-        yield BookmarkJSONUtils.importFromFile(aFile, true);
+        yield BookmarkJSONUtils.importFromFile(aFile.path, true);
       } catch(ex) {
         PlacesOrganizer._showErrorAlert(PlacesUIUtils.getString("bookmarksRestoreParseError"));
       }
@@ -519,7 +519,7 @@ var PlacesOrganizer = {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     let fpCallback = function fpCallback_done(aResult) {
       if (aResult != Ci.nsIFilePicker.returnCancel) {
-        BookmarkJSONUtils.exportToFile(fp.file);
+        BookmarkJSONUtils.exportToFile(fp.file.path);
       }
     };
 
diff --git a/application/palemoon/components/preferences/advanced.xul b/application/palemoon/components/preferences/advanced.xul
index 3bd5becb3..34998c1b8 100644
--- a/application/palemoon/components/preferences/advanced.xul
+++ b/application/palemoon/components/preferences/advanced.xul
@@ -27,10 +27,7 @@
       <!--XXX button prefs -->
 
       <!-- General tab -->
-<!-- Pale Moon: remove accessibility features, they confuse people anyway  -->
-<!--      <preference id="accessibility.browsewithcaret"   name="accessibility.browsewithcaret"   type="bool"/> -->
       <preference id="accessibility.typeaheadfind"     name="accessibility.typeaheadfind"     type="bool"/>
-<!--      <preference id="accessibility.blockautorefresh"  name="accessibility.blockautorefresh"  type="bool"/> -->
 
       <preference id="general.autoScroll"              name="general.autoScroll"              type="bool"/>
       <preference id="general.smoothScroll"            name="general.smoothScroll"            type="bool"/>
@@ -51,8 +48,8 @@
                   type="bool"/>
 #endif
       <preference id="pref.general.compatmode" name="general.useragent.compatMode"        type="int"/>
-
-      <!-- Data Choices tab -->
+      
+      <preference id="pref.general.captiveportal" name="network.captive-portal-service.enabled" type="bool"/>
 
       <!-- Network tab -->
       <preference id="browser.cache.disk.capacity"     name="browser.cache.disk.capacity"     type="int"/>
@@ -136,22 +133,13 @@
         <tabpanel id="generalPanel" orient="vertical">
 
           <!-- Accessibility -->
-<!-- Pale Moon: remove accessibility features, they confuse people anyway  -->
           <groupbox id="accessibilityGroup" align="start">
             <caption label="&accessibility.label;"/>
 
-<!--            <checkbox id="useCursorNavigation"
-                      label="&useCursorNavigation.label;"
-                      accesskey="&useCursorNavigation.accesskey;"
-                      preference="accessibility.browsewithcaret"/> -->
             <checkbox id="searchStartTyping"
                       label="&searchStartTyping.label;"
                       accesskey="&searchStartTyping.accesskey;"
                       preference="accessibility.typeaheadfind"/>
-<!--            <checkbox id="blockAutoRefresh"
-                      label="&blockAutoRefresh.label;"
-                      accesskey="&blockAutoRefresh.accesskey;"
-                      preference="accessibility.blockautorefresh"/> -->
           </groupbox>
 
           <!-- Browsing -->
@@ -193,6 +181,7 @@
             </hbox>
           </groupbox>
 #endif
+          <!-- User Agent compatibility -->
           <groupbox id="UACompatGroup" orient="vertical">
             <caption label="&UACompatGroup.label;"/>
             <hbox align="center">
@@ -206,6 +195,15 @@
                 </menulist>
             </hbox>
           </groupbox>
+          
+          <!-- Captive portal detection -->
+          <groupbox id="captivePortalGroup" orient="vertical">
+            <caption label="&captivePortalGroup.label;"/>
+            <checkbox id="captivePortalDetect"
+                      label="&captivePortalDetect.label;"
+                      preference="pref.general.captiveportal"/>
+          </groupbox>
+          
         </tabpanel>
 
         <!-- Network -->
diff --git a/application/palemoon/components/preferences/connection.js b/application/palemoon/components/preferences/connection.js
index c1dd1bb6d..da038c925 100644
--- a/application/palemoon/components/preferences/connection.js
+++ b/application/palemoon/components/preferences/connection.js
@@ -63,7 +63,7 @@ var gConnectionsDialog = {
     autologinProxyPref.disabled = proxyTypePref.value == 0;
 
     var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
-    noProxiesPref.disabled = proxyTypePref.value != 1;
+    noProxiesPref.disabled = proxyTypePref.value == 0;
 
     var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
     autoconfigURLPref.disabled = proxyTypePref.value != 2;
diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index b12946f2a..bc1625275 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -43,8 +43,8 @@
 
       <!-- Security Protocols -->
       
-      <preference id="network.stricttransportsecurity.preloadlist"
-                  name="network.stricttransportsecurity.preloadlist"
+      <preference id="network.stricttransportsecurity.enabled"
+                  name="network.stricttransportsecurity.enabled"
                   type="bool"/>
       <preference id="security.cert_pinning.enforcement_level"
                   name="security.cert_pinning.enforcement_level"
@@ -146,7 +146,7 @@
         <checkbox id="enableHSTS"
                   label="&enableHSTS.label;"
                   accesskey="&enableHSTS.accesskey;"
-                  preference="network.stricttransportsecurity.preloadlist" />
+                  preference="network.stricttransportsecurity.enabled" />
         <checkbox id="enableHPKP"
                   label="&enableHPKP.label;"
                   accesskey="&enableHPKP.accesskey;"
diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt
index 4efefb316..136b56ea8 100644
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@@ -1 +1 @@
-28.3.0a1
\ No newline at end of file
+28.4.0a1
\ No newline at end of file
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index a218a3487..1247d3171 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -59,8 +59,8 @@
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
-#ifdef MOZ_UPDATER
 @RESPATH@/update.locale
+#ifdef MOZ_UPDATER
 @RESPATH@/updater.ini
 #endif
 
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
index 6ef29c680..dcb7b0e90 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -33,6 +33,15 @@
 <!ENTITY setDefault.accesskey            "d">
 <!ENTITY isDefault.label                 "&brandShortName; is currently your default browser">
 
+<!ENTITY UACompatGroup.label             "Compatibility">
+<!ENTITY UACompat.label                  "User Agent Mode:">
+<!ENTITY UACompat.Native                 "Native">
+<!ENTITY UACompat.Gecko                  "Gecko Compatibility">
+<!ENTITY UACompat.Firefox                "Firefox Compatibility">
+
+<!ENTITY captivePortalGroup.label        "Captive portals">
+<!ENTITY captivePortalDetect.label       "Detect restricted network access">
+
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
 <!ENTITY crashReporterSection.label      "Crash Reporter">
@@ -126,12 +135,6 @@
 <!ENTITY viewSecurityDevices.label       "Security Devices">
 <!ENTITY viewSecurityDevices.accesskey   "y">
 
-<!ENTITY UACompatGroup.label    "Compatibility">
-<!ENTITY UACompat.label         "User Agent Mode:">
-<!ENTITY UACompat.Native        "Native">
-<!ENTITY UACompat.Gecko         "Gecko Compatibility">
-<!ENTITY UACompat.Firefox       "Firefox Compatibility">
-
 <!ENTITY scrollparamTab.label               "Scrolling">
 <!ENTITY smoothscroll.explain.label         "The parameters below only have an effect if smooth scrolling is enabled overall with the checkbox above.">
 <!ENTITY smoothscroll.to                    "to">
diff --git a/application/palemoon/modules/FormSubmitObserver.jsm b/application/palemoon/modules/FormSubmitObserver.jsm
index e4d3e765e..6b2ea3c84 100644
--- a/application/palemoon/modules/FormSubmitObserver.jsm
+++ b/application/palemoon/modules/FormSubmitObserver.jsm
@@ -42,10 +42,10 @@ FormSubmitObserver.prototype =
   {
     this._content = aWindow;
     this._tab = aTabChildGlobal;
-    this._mm = 

-      this._content.QueryInterface(Ci.nsIInterfaceRequestor)

-                   .getInterface(Ci.nsIDocShell)

-                   .sameTypeRootTreeItem

+    this._mm = 
+      this._content.QueryInterface(Ci.nsIInterfaceRequestor)
+                   .getInterface(Ci.nsIDocShell)
+                   .sameTypeRootTreeItem
                    .QueryInterface(Ci.nsIDocShell)
                    .QueryInterface(Ci.nsIInterfaceRequestor)
                    .getInterface(Ci.nsIContentFrameMessageManager);
@@ -104,13 +104,13 @@ FormSubmitObserver.prototype =
       return;
     }
     
-    // Insure that this is the FormSubmitObserver associated with the form
+    // Ensure that this is the FormSubmitObserver associated with the
     // element / window this notification is about.
-    if (this._content != aFormElement.ownerDocument.defaultView.top.document.defaultView) {
+    let element = aInvalidElements.queryElementAt(0, Ci.nsISupports);
+    if (this._content != element.ownerGlobal.top.document.defaultView) {
       return;
     }
 
-    let element = aInvalidElements.queryElementAt(0, Ci.nsISupports);
     if (!(element instanceof HTMLInputElement ||
           element instanceof HTMLTextAreaElement ||
           element instanceof HTMLSelectElement ||
@@ -118,6 +118,9 @@ FormSubmitObserver.prototype =
       return;
     }
 
+    // Update validation message before showing notification
+    this._validationMessage = element.validationMessage;
+
     // Don't connect up to the same element more than once.
     if (this._element == element) {
       this._showPopup(element);
@@ -127,8 +130,6 @@ FormSubmitObserver.prototype =
 
     element.focus();
 
-    this._validationMessage = element.validationMessage;
-
     // Watch for input changes which may change the validation message.
     element.addEventListener("input", this, false);
 
@@ -142,7 +143,7 @@ FormSubmitObserver.prototype =
   /*
    * Internal
    */
-  

+  
   /*
    * Handles input changes on the form element we've associated a popup
    * with. Updates the validation message or closes the popup if form data
@@ -189,18 +190,17 @@ FormSubmitObserver.prototype =
 
     // Note, this is relative to the browser and needs to be translated
     // in chrome.
-    panelData.contentRect = this._msgRect(aElement);
+    panelData.contentRect = BrowserUtils.getElementBoundingRect(aElement);
 
     // We want to show the popup at the middle of checkbox and radio buttons
     // and where the content begin for the other elements.
     let offset = 0;
-    let position = "";
 
     if (aElement.tagName == 'INPUT' &&
         (aElement.type == 'radio' || aElement.type == 'checkbox')) {
       panelData.position = "bottomcenter topleft";
     } else {
-      let win = aElement.ownerDocument.defaultView;
+      let win = aElement.ownerGlobal;
       let style = win.getComputedStyle(aElement, null);
       if (style.direction == 'rtl') {
         offset = parseInt(style.paddingRight) + parseInt(style.borderRightWidth);
@@ -218,8 +218,8 @@ FormSubmitObserver.prototype =
     this._mm.sendAsyncMessage("FormValidation:HidePopup", {});
   },
 
-  _getWindowUtils: function () {

-    return this._content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);

+  _getWindowUtils: function () {
+    return this._content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
   },
 
   _isRootDocumentEvent: function (aEvent) {
@@ -231,21 +231,5 @@ FormSubmitObserver.prototype =
             (target.ownerDocument && target.ownerDocument == this._content.document));
   },
 
-  /*
-   * Return a message manager rect for the element's bounding client rect
-   * in top level browser coords.
-   */
-  _msgRect: function (aElement) {
-    let domRect = aElement.getBoundingClientRect();
-    let zoomFactor = this._getWindowUtils().fullZoom;
-    let { offsetX, offsetY } = BrowserUtils.offsetToTopLevelWindow(this._content, aElement);
-    return {
-      left: (domRect.left + offsetX) * zoomFactor,
-      top: (domRect.top + offsetY) * zoomFactor,
-      width: domRect.width * zoomFactor,
-      height: domRect.height * zoomFactor
-    };
-  },
-
   QueryInterface : XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver])
 };
diff --git a/application/palemoon/modules/WindowsPreviewPerTab.jsm b/application/palemoon/modules/WindowsPreviewPerTab.jsm
index 243a00aae..4b5030ad4 100644
--- a/application/palemoon/modules/WindowsPreviewPerTab.jsm
+++ b/application/palemoon/modules/WindowsPreviewPerTab.jsm
@@ -595,6 +595,7 @@ TabWindow.prototype = {
     "file", "chrome", "resource", "about"
   ]),
   onLinkIconAvailable: function (aBrowser, aIconURL) {
+    let self = this;
     let requestURL = null;
     if (aIconURL) {
       let shouldRequestFaviconURL = true;
@@ -611,15 +612,15 @@ TabWindow.prototype = {
     let isDefaultFavicon = !requestURL;
     getFaviconAsImage(
       requestURL,
-      PrivateBrowsingUtils.isWindowPrivate(this.win),
+      PrivateBrowsingUtils.isWindowPrivate(self.win),
       img => {
-        let index = this.tabbrowser.browsers.indexOf(aBrowser);
+        let index = self.tabbrowser.browsers.indexOf(aBrowser);
         // Only add it if we've found the index and the URI is still the same.
         // The tab could have closed, and there's no guarantee the icons
         // will have finished fetching 'in order'.
         if (index != -1) {
-          let tab = this.tabbrowser.tabs[index];
-          let preview = this.previews.get(tab);
+          let tab = self.tabbrowser.tabs[index];
+          let preview = self.previews.get(tab);
           if (tab.getAttribute("image") == aIconURL ||
               (!preview.icon && isDefaultFavicon)) {
             preview.icon = img;
diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css
index 516677fe6..b545b06cb 100644
--- a/application/palemoon/themes/linux/browser.css
+++ b/application/palemoon/themes/linux/browser.css
@@ -1781,9 +1781,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-sound[soundplaying],
-#TabsToolbar[brighttext] .tab-icon-sound[blocked],
-#TabsToolbar[brighttext] .tab-icon-sound[muted] {
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] {
   filter: invert(1);
 }
 
@@ -1827,17 +1827,17 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
 .tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked");
 }
diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index a7bd683bd..ddf050785 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -1844,9 +1844,9 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-sound[soundplaying],
-#TabsToolbar[brighttext] .tab-icon-sound[blocked],
-#TabsToolbar[brighttext] .tab-icon-sound[muted] {
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] {
   filter: invert(1);
 }
 
@@ -1890,17 +1890,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
 .tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked");
 }
diff --git a/application/palemoon/themes/windows/Toolbar-glass.png b/application/palemoon/themes/windows/Toolbar-glass.png
new file mode 100644
index 000000000..f8aac2467
--- /dev/null
+++ b/application/palemoon/themes/windows/Toolbar-glass.png
diff --git a/application/palemoon/themes/windows/Toolbar-glass.svg b/application/palemoon/themes/windows/Toolbar-glass.svg
index 5212e45e7..9feaac251 100644
--- a/application/palemoon/themes/windows/Toolbar-glass.svg
+++ b/application/palemoon/themes/windows/Toolbar-glass.svg
@@ -6,14 +6,14 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   enable-background="new 0 0 378 38"
-   viewBox="0 0 378 38"
-   height="38"
-   width="378"
-   y="0px"
-   x="0px"
+   version="1.1"
    id="PaleMoonToolbarSVG"
-   version="1.1">
+   x="0px"
+   y="0px"
+   width="378"
+   height="38"
+   viewBox="0 0 378 38"
+   enable-background="new 0 0 378 38">
   <metadata
      id="metadata146">
     <rdf:RDF>
@@ -29,1972 +29,3016 @@
   <defs
      id="defs144">
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
-       r="7.1399999"
-       fy="14.778796"
-       fx="10.529827"
-       cy="14.778796"
-       cx="10.529827"
+       xlink:href="#linearGradient4635"
        id="radialGradient4669"
-       xlink:href="#linearGradient4635" />
+       cx="10.529827"
+       cy="14.778796"
+       fx="10.529827"
+       fy="14.778796"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4635">
       <stop
-         id="stop4631"
+         style="stop-color:#6198cb;stop-opacity:1"
          offset="0"
-         style="stop-color:#6198cb;stop-opacity:1" />
+         id="stop4631" />
       <stop
-         id="stop4633"
+         style="stop-color:#3a78b2;stop-opacity:1"
          offset="1"
-         style="stop-color:#3a78b2;stop-opacity:1" />
+         id="stop4633" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
-       r="8.7600002"
-       fy="38.79744"
-       fx="11.063469"
-       cy="38.79744"
-       cx="11.063469"
+       xlink:href="#linearGradient4635"
        id="radialGradient4637"
-       xlink:href="#linearGradient4635" />
+       cx="11.063469"
+       cy="38.79744"
+       fx="11.063469"
+       fy="38.79744"
+       r="8.7600002"
+       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
-       r="7.1399999"
-       fy="14.552581"
-       fx="34.841751"
-       cy="14.552581"
-       cx="34.841751"
+       xlink:href="#linearGradient4635"
        id="radialGradient4677"
-       xlink:href="#linearGradient4635" />
+       cx="34.841751"
+       cy="14.552581"
+       fx="34.841751"
+       fy="14.552581"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
-       r="7.6799994"
-       fy="12.761739"
-       fx="58.062626"
-       cy="12.761739"
-       cx="58.062626"
+       xlink:href="#linearGradient4603"
        id="radialGradient4605"
-       xlink:href="#linearGradient4603" />
+       cx="58.062626"
+       cy="12.761739"
+       fx="58.062626"
+       fy="12.761739"
+       r="7.6799994"
+       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4603">
       <stop
-         id="stop4599"
+         style="stop-color:#e72b1d;stop-opacity:1"
          offset="0"
-         style="stop-color:#e72b1d;stop-opacity:1" />
+         id="stop4599" />
       <stop
-         id="stop4601"
+         style="stop-color:#cc4338;stop-opacity:1"
          offset="1"
-         style="stop-color:#cc4338;stop-opacity:1" />
+         id="stop4601" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
-       r="7.8000002"
-       fy="13.939252"
-       fx="79.305222"
-       cy="13.939252"
-       cx="79.305222"
+       xlink:href="#linearGradient4523-3"
        id="radialGradient4525"
-       xlink:href="#linearGradient4523-3" />
+       cx="79.305222"
+       cy="13.939252"
+       fx="79.305222"
+       fy="13.939252"
+       r="7.8000002"
+       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4523-3">
       <stop
-         id="stop4519"
+         style="stop-color:#4fb55d;stop-opacity:1"
          offset="0"
-         style="stop-color:#4fb55d;stop-opacity:1" />
+         id="stop4519" />
       <stop
-         id="stop4521"
+         style="stop-color:#2d8539;stop-opacity:1"
          offset="1"
-         style="stop-color:#2d8539;stop-opacity:1" />
+         id="stop4521" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
-       r="9.5995998"
-       fy="12.664675"
-       fx="103.23091"
-       cy="12.664675"
-       cx="103.23091"
+       xlink:href="#linearGradient4527"
        id="radialGradient4529"
-       xlink:href="#linearGradient4527" />
+       cx="103.23091"
+       cy="12.664675"
+       fx="103.23091"
+       fy="12.664675"
+       r="9.5995998"
+       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4527">
       <stop
-         id="stop4523"
+         style="stop-color:#3f6bbd;stop-opacity:1"
          offset="0"
-         style="stop-color:#3f6bbd;stop-opacity:1" />
+         id="stop4523" />
       <stop
-         id="stop4525"
+         style="stop-color:#29467b;stop-opacity:1"
          offset="1"
-         style="stop-color:#29467b;stop-opacity:1" />
+         id="stop4525" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
-       r="8.3726959"
-       fy="16.659737"
-       fx="125.30523"
-       cy="16.659737"
-       cx="125.30523"
+       xlink:href="#linearGradient4707"
        id="radialGradient4709"
-       xlink:href="#linearGradient4707" />
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4707">
       <stop
-         id="stop4703"
+         style="stop-color:#8c9ba5;stop-opacity:1"
          offset="0"
-         style="stop-color:#8c9ba5;stop-opacity:1" />
+         id="stop4703" />
       <stop
-         id="stop4705"
+         style="stop-color:#607480;stop-opacity:1"
          offset="1"
-         style="stop-color:#607480;stop-opacity:1" />
+         id="stop4705" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
-       r="8.6400051"
-       fy="12.784631"
-       fx="149.26262"
-       cy="12.784631"
-       cx="149.26262"
+       xlink:href="#linearGradient4727"
        id="radialGradient4729"
-       xlink:href="#linearGradient4727" />
+       cx="149.26262"
+       cy="12.784631"
+       fx="149.26262"
+       fy="12.784631"
+       r="8.6400051"
+       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4727">
       <stop
-         id="stop4723"
+         style="stop-color:#3eb796;stop-opacity:1"
          offset="0"
-         style="stop-color:#3eb796;stop-opacity:1" />
+         id="stop4723" />
       <stop
-         id="stop4725"
+         style="stop-color:#31a886;stop-opacity:1"
          offset="1"
-         style="stop-color:#31a886;stop-opacity:1" />
+         id="stop4725" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
-       r="9.6007004"
-       fy="12.037849"
-       fx="466.94476"
-       cy="12.037849"
-       cx="466.94476"
+       xlink:href="#linearGradient5023"
        id="radialGradient5017"
-       xlink:href="#linearGradient5023" />
+       cx="466.94476"
+       cy="12.037849"
+       fx="466.94476"
+       fy="12.037849"
+       r="9.6007004"
+       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5023">
       <stop
-         style="stop-color:#c6cdd2;stop-opacity:1"
+         id="stop5019"
          offset="0"
-         id="stop5019" />
+         style="stop-color:#c6cdd2;stop-opacity:1" />
       <stop
-         style="stop-color:#9cabb4;stop-opacity:1"
+         id="stop5021"
          offset="1"
-         id="stop5021" />
+         style="stop-color:#9cabb4;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
-       r="9.5999947"
-       fy="13.746766"
-       fx="194.44176"
-       cy="13.746766"
-       cx="194.44176"
+       xlink:href="#linearGradient4707"
        id="radialGradient4793"
-       xlink:href="#linearGradient4707" />
+       cx="194.44176"
+       cy="13.746766"
+       fx="194.44176"
+       fy="13.746766"
+       r="9.5999947"
+       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
-       r="9.6000004"
-       fy="11.101265"
-       fx="239.2"
-       cy="11.101265"
-       cx="239.2"
+       xlink:href="#linearGradient4707"
        id="radialGradient4833"
-       xlink:href="#linearGradient4707" />
+       cx="239.2"
+       cy="11.101265"
+       fx="239.2"
+       fy="11.101265"
+       r="9.6000004"
+       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79274533,0,0,0.78327978,-0.14435628,0.11758726)"
-       r="3.5288758"
-       fy="12.418613"
-       fx="242.0894"
-       cy="12.418613"
-       cx="242.0894"
+       xlink:href="#linearGradient4707"
        id="radialGradient4841"
-       xlink:href="#linearGradient4707" />
+       cx="242.0894"
+       cy="12.418613"
+       fx="242.0894"
+       fy="12.418613"
+       r="3.5288758"
+       gradientTransform="matrix(0.79274533,0,0,0.78327978,-0.14435628,0.11758726)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
-       r="9.7507105"
-       fy="31.105829"
-       fx="466.39926"
-       cy="31.105829"
-       cx="466.39926"
+       xlink:href="#linearGradient5037"
        id="radialGradient5031"
-       xlink:href="#linearGradient5037" />
+       cx="466.39926"
+       cy="31.105829"
+       fx="466.39926"
+       fy="31.105829"
+       r="9.7507105"
+       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5037">
       <stop
-         style="stop-color:#e8e1a1;stop-opacity:1"
+         id="stop5033"
          offset="0"
-         id="stop5033" />
+         style="stop-color:#e8e1a1;stop-opacity:1" />
       <stop
-         style="stop-color:#baad3e;stop-opacity:1"
+         id="stop5035"
          offset="1"
-         id="stop5035" />
+         style="stop-color:#baad3e;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
-       r="10.35937"
-       fy="16.56296"
-       fx="217.95329"
-       cy="16.56296"
-       cx="217.95329"
+       xlink:href="#linearGradient4707"
        id="radialGradient4813"
-       xlink:href="#linearGradient4707" />
+       cx="217.95329"
+       cy="16.56296"
+       fx="217.95329"
+       fy="16.56296"
+       r="10.35937"
+       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
-       r="8.5577164"
-       fy="15.840806"
-       fx="262.79288"
-       cy="15.840806"
-       cx="262.79288"
+       xlink:href="#linearGradient4707"
        id="radialGradient4861"
-       xlink:href="#linearGradient4707" />
+       cx="262.79288"
+       cy="15.840806"
+       fx="262.79288"
+       fy="15.840806"
+       r="8.5577164"
+       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="8.53125"
-       fy="14.171478"
-       fx="286.58698"
-       cy="14.171478"
-       cx="286.58698"
+       xlink:href="#linearGradient4707"
        id="radialGradient4881"
-       xlink:href="#linearGradient4707" />
+       cx="286.58698"
+       cy="14.171478"
+       fx="286.58698"
+       fy="14.171478"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
-       r="6.09375"
-       fy="14.457072"
-       fx="308.97141"
-       cy="14.457072"
-       cx="308.97141"
+       xlink:href="#linearGradient4707"
        id="radialGradient4901"
-       xlink:href="#linearGradient4707" />
+       cx="308.97141"
+       cy="14.457072"
+       fx="308.97141"
+       fy="14.457072"
+       r="6.09375"
+       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="8.53125"
-       fy="13.119289"
-       fx="331.15933"
-       cy="13.119289"
-       cx="331.15933"
+       xlink:href="#linearGradient4707"
        id="radialGradient4921"
-       xlink:href="#linearGradient4707" />
+       cx="331.15933"
+       cy="13.119289"
+       fx="331.15933"
+       fy="13.119289"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
-       r="6.09375"
-       fy="11.316628"
-       fx="353.15076"
-       cy="11.316628"
-       cx="353.15076"
+       xlink:href="#linearGradient4707"
        id="radialGradient4941"
-       xlink:href="#linearGradient4707" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
+       cx="353.15076"
+       cy="11.316628"
+       fx="353.15076"
+       fy="11.316628"
        r="6.09375"
-       fy="11.407905"
-       fx="375.97003"
-       cy="11.407905"
-       cx="375.97003"
-       id="radialGradient4949"
+       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)"
        xlink:href="#linearGradient4707"
-       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)" />
+       id="radialGradient4949"
+       cx="375.97003"
+       cy="11.407905"
+       fx="375.97003"
+       fy="11.407905"
+       r="6.09375"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
-       r="8.5350475"
-       fy="13.518586"
-       fx="400.5007"
-       cy="13.518586"
-       cx="400.5007"
+       xlink:href="#linearGradient4707"
        id="radialGradient4957"
-       xlink:href="#linearGradient4707" />
+       cx="400.5007"
+       cy="13.518586"
+       fx="400.5007"
+       fy="13.518586"
+       r="8.5350475"
+       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
-       r="8.53125"
-       fy="15.742972"
-       fx="417.02075"
-       cy="15.742972"
-       cx="417.02075"
+       xlink:href="#linearGradient4975"
        id="radialGradient4977"
-       xlink:href="#linearGradient4975" />
+       cx="417.02075"
+       cy="15.742972"
+       fx="417.02075"
+       fy="15.742972"
+       r="8.53125"
+       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4975">
       <stop
-         id="stop4971"
+         style="stop-color:#f79729;stop-opacity:1"
          offset="0"
-         style="stop-color:#f79729;stop-opacity:1" />
+         id="stop4971" />
       <stop
-         id="stop4973"
+         style="stop-color:#d2831f;stop-opacity:1"
          offset="1"
-         style="stop-color:#d2831f;stop-opacity:1" />
+         id="stop4973" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
-       r="8.53125"
-       fy="11.316628"
-       fx="444.33652"
-       cy="11.316628"
-       cx="444.33652"
+       xlink:href="#linearGradient4707"
        id="radialGradient4997"
-       xlink:href="#linearGradient4707" />
+       cx="444.33652"
+       cy="11.316628"
+       fx="444.33652"
+       fy="11.316628"
+       r="8.53125"
+       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       r="7.9746099"
-       fy="9"
-       fx="134.97461"
-       cy="9"
-       cx="134.97461"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4747"
        id="radialGradient4710"
-       xlink:href="#linearGradient4747" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
     <linearGradient
        id="linearGradient4747">
       <stop
-         id="stop4743"
+         style="stop-color:#c5b631;stop-opacity:1"
          offset="0"
-         style="stop-color:#c5b631;stop-opacity:1" />
+         id="stop4743" />
       <stop
-         id="stop4745"
+         style="stop-color:#baad3e;stop-opacity:1"
          offset="1"
-         style="stop-color:#baad3e;stop-opacity:1" />
+         id="stop4745" />
     </linearGradient>
     <radialGradient
-       r="7.9746099"
-       fy="9.0947113"
-       fx="132.6468"
-       cy="9.0947113"
-       cx="132.6468"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5037"
        id="radialGradient4712"
-       xlink:href="#linearGradient5037" />
-    <radialGradient
-       r="7.9746099"
-       fy="9"
-       fx="134.97461"
-       cy="9"
-       cx="134.97461"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4714"
-       xlink:href="#linearGradient4747" />
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="132.6468"
+       cy="9.0947113"
+       fx="132.6468"
+       fy="9.0947113"
+       r="7.9746099" />
     <radialGradient
+       xlink:href="#linearGradient4747"
+       id="radialGradient4714"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,28.000001,0,-310.09784)"
-       r="0.31640625"
-       fy="11.485105"
-       fx="166.37157"
-       cy="11.485105"
-       cx="166.37157"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
        id="radialGradient4750"
-       xlink:href="#linearGradient4707" />
+       cx="166.37157"
+       cy="11.485105"
+       fx="166.37157"
+       fy="11.485105"
+       r="0.31640625"
+       gradientTransform="matrix(1,0,0,28.000001,0,-310.09784)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
-       r="8.3726959"
-       fy="16.659737"
-       fx="125.30523"
-       cy="16.659737"
-       cx="125.30523"
+       xlink:href="#linearGradient4832"
        id="radialGradient4709-1"
-       xlink:href="#linearGradient4832" />
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4832">
       <stop
-         style="stop-color:#22e23d;stop-opacity:1"
+         id="stop5029"
          offset="0"
-         id="stop5029" />
+         style="stop-color:#22e23d;stop-opacity:1" />
       <stop
-         style="stop-color:#38a748;stop-opacity:1"
+         id="stop4830"
          offset="1"
-         id="stop4830" />
+         style="stop-color:#38a748;stop-opacity:1" />
     </linearGradient>
     <filter
-       id="filter4883"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4883">
       <feFlood
-         id="feFlood4873"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4873" />
       <feComposite
-         id="feComposite4875"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4875" />
       <feGaussianBlur
-         id="feGaussianBlur4877"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4877" />
       <feOffset
-         id="feOffset4879"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4879" />
       <feComposite
-         id="feComposite4881"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4881" />
       <feColorMatrix
-         id="feColorMatrix6673"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6673" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6675"
          flood-opacity="1"
-         id="feFlood6675" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6677"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6679"
          in="composite1"
-         id="feGaussianBlur6679" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6681"
          dx="2.77556e-017"
-         id="feOffset6681" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6683"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4895"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4895">
       <feFlood
-         id="feFlood4885"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4885" />
       <feComposite
-         id="feComposite4887"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4887" />
       <feGaussianBlur
-         id="feGaussianBlur4889"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4889" />
       <feOffset
-         id="feOffset4891"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4891" />
       <feComposite
-         id="feComposite4893"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4893" />
       <feColorMatrix
-         id="feColorMatrix6685"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6685" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6687"
          flood-opacity="1"
-         id="feFlood6687" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6689"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6691"
          in="composite1"
-         id="feGaussianBlur6691" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6693"
          dx="2.77556e-017"
-         id="feOffset6693" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6695"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4907"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4907">
       <feFlood
-         id="feFlood4897"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4897" />
       <feComposite
-         id="feComposite4899"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4899" />
       <feGaussianBlur
-         id="feGaussianBlur4901"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4901" />
       <feOffset
-         id="feOffset4903"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4903" />
       <feComposite
-         id="feComposite4905"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4905" />
       <feColorMatrix
-         id="feColorMatrix6697"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6697" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6699"
          flood-opacity="1"
-         id="feFlood6699" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6701"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6703"
          in="composite1"
-         id="feGaussianBlur6703" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6705"
          dx="2.77556e-017"
-         id="feOffset6705" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6707"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4919"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4919">
       <feFlood
-         id="feFlood4909"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4909" />
       <feComposite
-         id="feComposite4911"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4911" />
       <feGaussianBlur
-         id="feGaussianBlur4913"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4913" />
       <feOffset
-         id="feOffset4915"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4915" />
       <feComposite
-         id="feComposite4917"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4917" />
       <feColorMatrix
-         id="feColorMatrix6709"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6709" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6711"
          flood-opacity="1"
-         id="feFlood6711" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6713"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6715"
          in="composite1"
-         id="feGaussianBlur6715" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6717"
          dx="2.77556e-017"
-         id="feOffset6717" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6719"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4931"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4931">
       <feFlood
-         id="feFlood4921"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4921" />
       <feComposite
-         id="feComposite4923"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4923" />
       <feGaussianBlur
-         id="feGaussianBlur4925"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4925" />
       <feOffset
-         id="feOffset4927"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4927" />
       <feComposite
-         id="feComposite4929"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4929" />
       <feColorMatrix
-         id="feColorMatrix6721"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6721" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6723"
          flood-opacity="1"
-         id="feFlood6723" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6725"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6727"
          in="composite1"
-         id="feGaussianBlur6727" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6729"
          dx="2.77556e-017"
-         id="feOffset6729" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6731"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4943"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4943">
       <feFlood
-         id="feFlood4933"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4933" />
       <feComposite
-         id="feComposite4935"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4935" />
       <feGaussianBlur
-         id="feGaussianBlur4937"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4937" />
       <feOffset
-         id="feOffset4939"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4939" />
       <feComposite
-         id="feComposite4941"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4941" />
       <feColorMatrix
-         id="feColorMatrix6733"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6733" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6735"
          flood-opacity="1"
-         id="feFlood6735" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6737"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6739"
          in="composite1"
-         id="feGaussianBlur6739" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6741"
          dx="2.77556e-017"
-         id="feOffset6741" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6743"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4955"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4955">
       <feFlood
-         id="feFlood4945"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4945" />
       <feComposite
-         id="feComposite4947"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4947" />
       <feGaussianBlur
-         id="feGaussianBlur4949"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4949" />
       <feOffset
-         id="feOffset4951"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4951" />
       <feComposite
-         id="feComposite4953"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4953" />
       <feColorMatrix
-         id="feColorMatrix6745"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6745" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6747"
          flood-opacity="1"
-         id="feFlood6747" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6749"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6751"
          in="composite1"
-         id="feGaussianBlur6751" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6753"
          dx="2.77556e-017"
-         id="feOffset6753" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6755"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4967"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4967">
       <feFlood
-         id="feFlood4957"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4957" />
       <feComposite
-         id="feComposite4959"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4959" />
       <feGaussianBlur
-         id="feGaussianBlur4961"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4961" />
       <feOffset
-         id="feOffset4963"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4963" />
       <feComposite
-         id="feComposite4965"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4965" />
       <feColorMatrix
-         id="feColorMatrix6757"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6757" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6759"
          flood-opacity="1"
-         id="feFlood6759" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6761"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6763"
          in="composite1"
-         id="feGaussianBlur6763" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6765"
          dx="2.77556e-017"
-         id="feOffset6765" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6767"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4979"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4979">
       <feFlood
-         id="feFlood4969"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4969" />
       <feComposite
-         id="feComposite4971"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4971" />
       <feGaussianBlur
-         id="feGaussianBlur4973"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4973" />
       <feOffset
-         id="feOffset4975"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4975" />
       <feComposite
-         id="feComposite4977"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4977" />
       <feColorMatrix
-         id="feColorMatrix6769"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6769" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6771"
          flood-opacity="1"
-         id="feFlood6771" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6773"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6775"
          in="composite1"
-         id="feGaussianBlur6775" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6777"
          dx="2.77556e-017"
-         id="feOffset6777" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6779"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter4991"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter4991">
       <feFlood
-         id="feFlood4981"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4981" />
       <feComposite
-         id="feComposite4983"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4983" />
       <feGaussianBlur
-         id="feGaussianBlur4985"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4985" />
       <feOffset
-         id="feOffset4987"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4987" />
       <feComposite
-         id="feComposite4989"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite4989" />
       <feColorMatrix
-         id="feColorMatrix6781"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6781" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6783"
          flood-opacity="1"
-         id="feFlood6783" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6785"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6787"
          in="composite1"
-         id="feGaussianBlur6787" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6789"
          dx="2.77556e-017"
-         id="feOffset6789" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6791"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5003"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5003">
       <feFlood
-         id="feFlood4993"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4993" />
       <feComposite
-         id="feComposite4995"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4995" />
       <feGaussianBlur
-         id="feGaussianBlur4997"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4997" />
       <feOffset
-         id="feOffset4999"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4999" />
       <feComposite
-         id="feComposite5001"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5001" />
       <feColorMatrix
-         id="feColorMatrix6793"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6793" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6795"
          flood-opacity="1"
-         id="feFlood6795" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6797"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6799"
          in="composite1"
-         id="feGaussianBlur6799" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6801"
          dx="2.77556e-017"
-         id="feOffset6801" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6803"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5015"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5015">
       <feFlood
-         id="feFlood5005"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5005" />
       <feComposite
-         id="feComposite5007"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5007" />
       <feGaussianBlur
-         id="feGaussianBlur5009"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5009" />
       <feOffset
-         id="feOffset5011"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5011" />
       <feComposite
-         id="feComposite5013"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5013" />
       <feColorMatrix
-         id="feColorMatrix6805"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6805" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6807"
          flood-opacity="1"
-         id="feFlood6807" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6809"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6811"
          in="composite1"
-         id="feGaussianBlur6811" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6813"
          dx="2.77556e-017"
-         id="feOffset6813" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6815"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5027"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5027">
       <feFlood
-         id="feFlood5017"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5017" />
       <feComposite
-         id="feComposite5019"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5019" />
       <feGaussianBlur
-         id="feGaussianBlur5021"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5021" />
       <feOffset
-         id="feOffset5023"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5023" />
       <feComposite
-         id="feComposite5025"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5025" />
       <feColorMatrix
-         id="feColorMatrix6817"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6817" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6819"
          flood-opacity="1"
-         id="feFlood6819" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6821"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6823"
          in="composite1"
-         id="feGaussianBlur6823" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6825"
          dx="2.77556e-017"
-         id="feOffset6825" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6827"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5039"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5039">
       <feFlood
-         id="feFlood5029"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5029" />
       <feComposite
-         id="feComposite5031"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5031" />
       <feGaussianBlur
-         id="feGaussianBlur5033"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5033" />
       <feOffset
-         id="feOffset5035"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5035" />
       <feComposite
-         id="feComposite5037"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5037" />
       <feColorMatrix
-         id="feColorMatrix6829"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6829" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6831"
          flood-opacity="1"
-         id="feFlood6831" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6833"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6835"
          in="composite1"
-         id="feGaussianBlur6835" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6837"
          dx="2.77556e-017"
-         id="feOffset6837" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6839"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5051"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5051">
       <feFlood
-         id="feFlood5041"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5041" />
       <feComposite
-         id="feComposite5043"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5043" />
       <feGaussianBlur
-         id="feGaussianBlur5045"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5045" />
       <feOffset
-         id="feOffset5047"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5047" />
       <feComposite
-         id="feComposite5049"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5049" />
       <feColorMatrix
-         id="feColorMatrix6841"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6841" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6843"
          flood-opacity="1"
-         id="feFlood6843" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6845"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6847"
          in="composite1"
-         id="feGaussianBlur6847" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6849"
          dx="2.77556e-017"
-         id="feOffset6849" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6851"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5063"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5063">
       <feFlood
-         id="feFlood5053"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5053" />
       <feComposite
-         id="feComposite5055"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5055" />
       <feGaussianBlur
-         id="feGaussianBlur5057"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5057" />
       <feOffset
-         id="feOffset5059"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5059" />
       <feComposite
-         id="feComposite5061"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5061" />
       <feColorMatrix
-         id="feColorMatrix6853"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6853" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6855"
          flood-opacity="1"
-         id="feFlood6855" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6857"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6859"
          in="composite1"
-         id="feGaussianBlur6859" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6861"
          dx="2.77556e-017"
-         id="feOffset6861" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6863"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5075"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5075">
       <feFlood
-         id="feFlood5065"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5065" />
       <feComposite
-         id="feComposite5067"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5067" />
       <feGaussianBlur
-         id="feGaussianBlur5069"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5069" />
       <feOffset
-         id="feOffset5071"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5071" />
       <feComposite
-         id="feComposite5073"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5073" />
       <feColorMatrix
-         id="feColorMatrix6865"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6865" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6867"
          flood-opacity="1"
-         id="feFlood6867" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6869"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6871"
          in="composite1"
-         id="feGaussianBlur6871" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6873"
          dx="2.77556e-017"
-         id="feOffset6873" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6875"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5087"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5087">
       <feFlood
-         id="feFlood5077"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5077" />
       <feComposite
-         id="feComposite5079"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5079" />
       <feGaussianBlur
-         id="feGaussianBlur5081"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5081" />
       <feOffset
-         id="feOffset5083"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5083" />
       <feComposite
-         id="feComposite5085"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5085" />
       <feColorMatrix
-         id="feColorMatrix6877"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6877" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6879"
          flood-opacity="1"
-         id="feFlood6879" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6881"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6883"
          in="composite1"
-         id="feGaussianBlur6883" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6885"
          dx="2.77556e-017"
-         id="feOffset6885" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6887"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5099"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5099">
       <feFlood
-         id="feFlood5089"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5089" />
       <feComposite
-         id="feComposite5091"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5091" />
       <feGaussianBlur
-         id="feGaussianBlur5093"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5093" />
       <feOffset
-         id="feOffset5095"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5095" />
       <feComposite
-         id="feComposite5097"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5097" />
       <feColorMatrix
-         id="feColorMatrix6889"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6889" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6891"
          flood-opacity="1"
-         id="feFlood6891" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6893"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6895"
          in="composite1"
-         id="feGaussianBlur6895" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6897"
          dx="2.77556e-017"
-         id="feOffset6897" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6899"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5111"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5111">
       <feFlood
-         id="feFlood5101"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5101" />
       <feComposite
-         id="feComposite5103"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5103" />
       <feGaussianBlur
-         id="feGaussianBlur5105"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5105" />
       <feOffset
-         id="feOffset5107"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5107" />
       <feComposite
-         id="feComposite5109"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5109" />
       <feColorMatrix
-         id="feColorMatrix6901"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6901" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6903"
          flood-opacity="1"
-         id="feFlood6903" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6905"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6907"
          in="composite1"
-         id="feGaussianBlur6907" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6909"
          dx="2.77556e-017"
-         id="feOffset6909" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6911"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5123"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5123">
       <feFlood
-         id="feFlood5113"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5113" />
       <feComposite
-         id="feComposite5115"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5115" />
       <feGaussianBlur
-         id="feGaussianBlur5117"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5117" />
       <feOffset
-         id="feOffset5119"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5119" />
       <feComposite
-         id="feComposite5121"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5121" />
       <feColorMatrix
-         id="feColorMatrix6913"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6913" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(255,255,255)"
+         id="feFlood6915"
          flood-opacity="1"
-         id="feFlood6915" />
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
       <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
+         in2="fbSourceGraphic"
          id="feComposite6917"
-         in2="fbSourceGraphic" />
+         in="flood"
+         operator="in"
+         result="composite1" />
       <feGaussianBlur
-         result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur6919"
          in="composite1"
-         id="feGaussianBlur6919" />
+         stdDeviation="1"
+         result="blur" />
       <feOffset
-         result="offset"
-         dy="0"
+         id="feOffset6921"
          dx="2.77556e-017"
-         id="feOffset6921" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
+         in2="offset"
          id="feComposite6923"
-         in2="offset" />
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
     </filter>
     <filter
-       id="filter5135"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter5135">
       <feFlood
-         id="feFlood5125"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood5125" />
       <feComposite
-         id="feComposite5127"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5127" />
       <feGaussianBlur
-         id="feGaussianBlur5129"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5129" />
       <feOffset
-         id="feOffset5131"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset5131" />
       <feComposite
-         id="feComposite5133"
-         result="fbSourceGraphic"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5133" />
       <feColorMatrix
-         id="feColorMatrix6925"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         result="fbSourceGraphicAlpha"
          in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6925" />
       <feFlood
-         in="fbSourceGraphic"
-         result="flood"
+         id="feFlood6927"
+         flood-opacity="1"
          flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="fbSourceGraphic"
+         id="feComposite6929"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur6931"
+         in="composite1"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset6933"
+         dx="2.77556e-017"
+         dy="0"
+         result="offset" />
+      <feComposite
+         in2="offset"
+         id="feComposite6935"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       id="filter5147">
+      <feFlood
          flood-opacity="1"
-         id="feFlood6927" />
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5137" />
       <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
          result="composite1"
+         id="feComposite5139" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur5141" />
+      <feOffset
+         dx="2.77556e-017"
+         dy="0"
+         result="offset"
+         id="feOffset5143" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5145" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6937" />
+      <feFlood
+         id="feFlood6939"
+         flood-opacity="1"
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="fbSourceGraphic"
+         id="feComposite6941"
+         in="flood"
          operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur6943"
+         in="composite1"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset6945"
+         dx="2.77556e-017"
+         dy="0"
+         result="offset" />
+      <feComposite
+         in2="offset"
+         id="feComposite6947"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       id="filter5159">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5149" />
+      <feComposite
          in="flood"
-         id="feComposite6929"
-         in2="fbSourceGraphic" />
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5151" />
       <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
          result="blur"
+         id="feGaussianBlur5153" />
+      <feOffset
+         dx="2.77556e-017"
+         dy="0"
+         result="offset"
+         id="feOffset5155" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5157" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6949" />
+      <feFlood
+         id="feFlood6951"
+         flood-opacity="1"
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="fbSourceGraphic"
+         id="feComposite6953"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur6955"
+         in="composite1"
          stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset6957"
+         dx="2.77556e-017"
+         dy="0"
+         result="offset" />
+      <feComposite
+         in2="offset"
+         id="feComposite6959"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       id="filter5171">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5161" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5163" />
+      <feGaussianBlur
          in="composite1"
-         id="feGaussianBlur6931" />
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur5165" />
       <feOffset
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
+         result="offset"
+         id="feOffset5167" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="fbSourceGraphic"
+         id="feComposite5169" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix6961" />
+      <feFlood
+         id="feFlood6963"
+         flood-opacity="1"
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="fbSourceGraphic"
+         id="feComposite6965"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur6967"
+         in="composite1"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset6969"
          dx="2.77556e-017"
-         id="feOffset6933" />
+         dy="0"
+         result="offset" />
       <feComposite
-         result="composite2"
-         operator="over"
+         in2="offset"
+         id="feComposite6971"
          in="fbSourceGraphic"
-         id="feComposite6935"
-         in2="offset" />
+         operator="over"
+         result="composite2" />
     </filter>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4669-9"
+       cx="10.529827"
+       cy="14.778796"
+       fx="10.529827"
+       fy="14.778796"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter5147"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB"
+       id="filter4701">
       <feFlood
-         id="feFlood5137"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4691" />
       <feComposite
-         id="feComposite5139"
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
          result="composite1"
+         id="feComposite4693" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4695" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4697" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4699" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4637-5"
+       cx="11.063469"
+       cy="38.79744"
+       fx="11.063469"
+       fy="38.79744"
+       r="8.7600002"
+       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4661">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4651" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
          operator="out"
+         result="composite1"
+         id="feComposite4653" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4655" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4657" />
+      <feComposite
+         in="offset"
          in2="SourceGraphic"
-         in="flood" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4659" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4677-0"
+       cx="34.841751"
+       cy="14.552581"
+       fx="34.841751"
+       fy="14.552581"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4689">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4679" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4681" />
       <feGaussianBlur
-         id="feGaussianBlur5141"
+         in="composite1"
+         stdDeviation="1"
          result="blur"
-         stdDeviation="0.5"
-         in="composite1" />
+         id="feGaussianBlur4683" />
       <feOffset
-         id="feOffset5143"
+         dx="0"
+         dy="0"
          result="offset"
+         id="feOffset4685" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4687" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4603"
+       id="radialGradient4605-8"
+       cx="58.062626"
+       cy="12.761739"
+       fx="58.062626"
+       fy="12.761739"
+       r="7.6799994"
+       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4629">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4619" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4621" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4623" />
+      <feOffset
+         dx="0"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4625" />
       <feComposite
-         id="feComposite5145"
-         result="fbSourceGraphic"
+         in="offset"
+         in2="SourceGraphic"
          operator="atop"
+         result="composite2"
+         id="feComposite4627" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4523-3"
+       id="radialGradient4525-6"
+       cx="79.305222"
+       cy="13.939252"
+       fx="79.305222"
+       fy="13.939252"
+       r="7.8000002"
+       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4597">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4587" />
+      <feComposite
+         in="flood"
          in2="SourceGraphic"
-         in="offset" />
-      <feColorMatrix
-         id="feColorMatrix6937"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         operator="out"
+         result="composite1"
+         id="feComposite4589" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4591" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4593" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4595" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4527"
+       id="radialGradient4529-9"
+       cx="103.23091"
+       cy="12.664675"
+       fx="103.23091"
+       fy="12.664675"
+       r="9.5995998"
+       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4783">
       <feFlood
-         in="fbSourceGraphic"
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
          result="flood"
-         flood-color="rgb(255,255,255)"
-         flood-opacity="1"
-         id="feFlood6939" />
+         id="feFlood4773" />
       <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
          result="composite1"
-         operator="in"
+         id="feComposite4775" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4777" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4779" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4781" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4709-11"
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4721">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4711" />
+      <feComposite
          in="flood"
-         id="feComposite6941"
-         in2="fbSourceGraphic" />
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4713" />
       <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
          result="blur"
+         id="feGaussianBlur4715" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4717" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4719" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4727"
+       id="radialGradient4729-5"
+       cx="149.26262"
+       cy="12.784631"
+       fx="149.26262"
+       fy="12.784631"
+       r="8.6400051"
+       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4741">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4731" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4733" />
+      <feGaussianBlur
+         in="composite1"
          stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4735" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4737" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4739" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient5023"
+       id="radialGradient5017-9"
+       cx="466.94476"
+       cy="12.037849"
+       fx="466.94476"
+       fy="12.037849"
+       r="9.6007004"
+       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4793-8"
+       cx="194.44176"
+       cy="13.746766"
+       fx="194.44176"
+       fy="13.746766"
+       r="9.5999947"
+       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4805">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4795" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4797" />
+      <feGaussianBlur
          in="composite1"
-         id="feGaussianBlur6943" />
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4799" />
       <feOffset
+         dx="0"
+         dy="0"
          result="offset"
+         id="feOffset4801" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4803" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4833-4"
+       cx="239.2"
+       cy="11.101265"
+       fx="239.2"
+       fy="11.101265"
+       r="9.6000004"
+       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4853">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4843" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4845" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4847" />
+      <feOffset
+         dx="0"
          dy="0"
-         dx="2.77556e-017"
-         id="feOffset6945" />
+         result="offset"
+         id="feOffset4849" />
       <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
          result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite6947"
-         in2="offset" />
+         id="feComposite4851" />
     </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4841-0"
+       cx="242.26164"
+       cy="12.423289"
+       fx="242.26164"
+       fy="12.423289"
+       r="3.5288758"
+       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient8829"
+       cx="242.26164"
+       cy="12.423289"
+       fx="242.26164"
+       fy="12.423289"
+       r="3.5288758"
+       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient5037"
+       id="radialGradient5031-1"
+       cx="466.39926"
+       cy="31.105829"
+       fx="466.39926"
+       fy="31.105829"
+       r="9.7507105"
+       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter5159"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB"
+       id="filter5049">
       <feFlood
-         id="feFlood5149"
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
          result="flood"
+         id="feFlood5039" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5041" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur5043" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset5045" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite5047" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4813-2"
+       cx="217.95329"
+       cy="16.56296"
+       fx="217.95329"
+       fy="16.56296"
+       r="10.35937"
+       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4825">
+      <feFlood
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood4815" />
       <feComposite
-         id="feComposite5151"
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
          result="composite1"
+         id="feComposite4817" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4819" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4821" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4823" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4861-6"
+       cx="262.79288"
+       cy="15.840806"
+       fx="262.79288"
+       fy="15.840806"
+       r="8.5577164"
+       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4873">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4863" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
          operator="out"
+         result="composite1"
+         id="feComposite4865" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4867" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4869" />
+      <feComposite
+         in="offset"
          in2="SourceGraphic"
-         in="flood" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4871" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4881-9"
+       cx="286.58698"
+       cy="14.171478"
+       fx="286.58698"
+       fy="14.171478"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4893">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4883" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4885" />
       <feGaussianBlur
-         id="feGaussianBlur5153"
+         in="composite1"
+         stdDeviation="0.5"
          result="blur"
+         id="feGaussianBlur4887" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4889" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4891" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4901-6"
+       cx="308.97141"
+       cy="14.457072"
+       fx="308.97141"
+       fy="14.457072"
+       r="6.09375"
+       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4913">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4903" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4905-1" />
+      <feGaussianBlur
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4907" />
       <feOffset
-         id="feOffset5155"
+         dx="0"
+         dy="0"
          result="offset"
+         id="feOffset4909" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4911-2" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4921-8"
+       cx="331.15933"
+       cy="13.119289"
+       fx="331.15933"
+       fy="13.119289"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4933">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4923" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4925" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4927" />
+      <feOffset
+         dx="0"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4929" />
       <feComposite
-         id="feComposite5157"
-         result="fbSourceGraphic"
+         in="offset"
+         in2="SourceGraphic"
          operator="atop"
+         result="composite2"
+         id="feComposite4931" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4941-9"
+       cx="353.15076"
+       cy="11.316628"
+       fx="353.15076"
+       fy="11.316628"
+       r="6.09375"
+       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)"
+       xlink:href="#linearGradient4707"
+       id="radialGradient4949-5"
+       cx="375.97003"
+       cy="11.407905"
+       fx="375.97003"
+       fy="11.407905"
+       r="6.09375"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4957-2"
+       cx="400.5007"
+       cy="13.518586"
+       fx="400.5007"
+       fy="13.518586"
+       r="8.5350475"
+       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4969">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4959" />
+      <feComposite
+         in="flood"
          in2="SourceGraphic"
-         in="offset" />
-      <feColorMatrix
-         id="feColorMatrix6949"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
+         operator="out"
+         result="composite1"
+         id="feComposite4961" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4963" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4965" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4967" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4975"
+       id="radialGradient4977-4"
+       cx="417.02075"
+       cy="15.742972"
+       fx="417.02075"
+       fy="15.742972"
+       r="8.53125"
+       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4989">
       <feFlood
-         in="fbSourceGraphic"
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
          result="flood"
-         flood-color="rgb(255,255,255)"
-         flood-opacity="1"
-         id="feFlood6951" />
+         id="feFlood4979" />
       <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
          result="composite1"
-         operator="in"
+         id="feComposite4981" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4983" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4985" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4987" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4997-5"
+       cx="444.33652"
+       cy="11.316628"
+       fx="444.33652"
+       fy="11.316628"
+       r="8.53125"
+       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter5009">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4999" />
+      <feComposite
          in="flood"
-         id="feComposite6953"
-         in2="fbSourceGraphic" />
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5001-8" />
       <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
          result="blur"
-         stdDeviation="1"
+         id="feGaussianBlur5003" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset5005" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite5007-3" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4747"
+       id="radialGradient4710-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4729">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4719" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4721" />
+      <feGaussianBlur
          in="composite1"
-         id="feGaussianBlur6955" />
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4723" />
       <feOffset
+         dx="2.77556e-017"
+         dy="0"
          result="offset"
+         id="feOffset4725" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4727" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient5037"
+       id="radialGradient4712-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="132.6468"
+       cy="9.0947113"
+       fx="132.6468"
+       fy="9.0947113"
+       r="7.9746099" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4774">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4764" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4766" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4768" />
+      <feOffset
+         dx="2.77556e-017"
          dy="0"
+         result="offset"
+         id="feOffset4770" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4772" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4747"
+       id="radialGradient4714-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4750-3"
+       cx="166.37157"
+       cy="11.485105"
+       fx="166.37157"
+       fy="11.485105"
+       r="0.31640625"
+       gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4832"
+       id="radialGradient4709-1-2"
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4844">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4834" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4836" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4838" />
+      <feOffset
          dx="2.77556e-017"
-         id="feOffset6957" />
+         dy="0"
+         result="offset"
+         id="feOffset4840" />
       <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
          result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite6959"
-         in2="offset" />
+         id="feComposite4842" />
     </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient9039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
+       cx="242.26164"
+       cy="12.423289"
+       fx="242.26164"
+       fy="12.423289"
+       r="3.5288758" />
     <filter
-       id="filter5171"
+       id="filter10217"
        style="color-interpolation-filters:sRGB;">
       <feFlood
-         id="feFlood5161"
+         id="feFlood10207"
          result="flood"
          flood-color="rgb(0,0,0)"
          flood-opacity="1" />
       <feComposite
-         id="feComposite5163"
+         id="feComposite10209"
          result="composite1"
          operator="out"
          in2="SourceGraphic"
          in="flood" />
       <feGaussianBlur
-         id="feGaussianBlur5165"
+         id="feGaussianBlur10211"
          result="blur"
          stdDeviation="0.5"
          in="composite1" />
       <feOffset
-         id="feOffset5167"
+         id="feOffset10213"
          result="offset"
          dy="0"
          dx="2.77556e-017" />
       <feComposite
-         id="feComposite5169"
+         id="feComposite10215"
          result="fbSourceGraphic"
          operator="atop"
          in2="SourceGraphic"
          in="offset" />
       <feColorMatrix
-         id="feColorMatrix6961"
+         id="feColorMatrix10219"
          values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
          in="fbSourceGraphic"
          result="fbSourceGraphicAlpha" />
@@ -2003,172 +3047,172 @@
          result="flood"
          flood-color="rgb(255,255,255)"
          flood-opacity="1"
-         id="feFlood6963" />
+         id="feFlood10221" />
       <feComposite
          result="composite1"
          operator="in"
          in="flood"
-         id="feComposite6965"
+         id="feComposite10223"
          in2="fbSourceGraphic" />
       <feGaussianBlur
          result="blur"
          stdDeviation="1"
          in="composite1"
-         id="feGaussianBlur6967" />
+         id="feGaussianBlur10225" />
       <feOffset
          result="offset"
          dy="0"
          dx="2.77556e-017"
-         id="feOffset6969" />
+         id="feOffset10227" />
       <feComposite
          result="composite2"
          operator="over"
          in="fbSourceGraphic"
-         id="feComposite6971"
+         id="feComposite10229"
          in2="offset" />
     </filter>
   </defs>
   <g
-     id="layer1">
+     style="filter:url(#filter10217)"
+     id="g7757">
     <path
-       id="path4"
-       d="m 17.311578,13.702319 h -5.76 l 2.28,2.28 c 0.6,0.6 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 l -6.4800001,-6.6 c -0.12,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.16,2.1599999 h 5.76 c 0.72,0 1.2,0.48 1.2,1.2000001 v 2.399999 c 0,0.72 -0.48,1.2 -1.2,1.2 z"
-       style="display:inline;fill:url(#radialGradient4669);fill-opacity:1;stroke-width:1;filter:url(#filter4883)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4669-9);fill-opacity:1;stroke-width:1;filter:url(#filter4701)"
+       d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z"
+       id="path4" />
     <path
-       d="m 19.271765,37.987692 h -7.987059 l 3.607059,3.507571 c 0.515294,0.50108 0.644117,1.377974 0.257648,1.753785 l -1.545884,1.503245 C 13.217059,45.128104 12.315294,45.128104 11.8,44.501752 L 3.5552941,36.609718 c 0,0 -0.5152941,-0.626352 -0.5152941,-1.127434 0,-0.501081 0.5152941,-1.002163 0.5152941,-1.002163 L 11.8,26.462816 c 0.515294,-0.50108 1.417059,-0.626351 1.803529,-0.25054 l 1.545884,1.503245 c 0.386469,0.375811 0.386469,1.252704 -0.257648,1.753785 l -3.478236,3.50757 h 7.858236 c 0.772941,0 1.288236,0.501082 1.288236,1.252705 v 2.505407 c 0,0.751622 -0.515295,1.252704 -1.288236,1.252704 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4637-5);fill-opacity:1;stroke-width:1;filter:url(#filter4661)"
        id="path4154"
-       style="display:inline;fill:url(#radialGradient4637);fill-opacity:1;stroke-width:1;filter:url(#filter4895)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" />
     <path
-       d="m 26.86,12.501265 v -2.4 c 0,-0.7200003 0.48,-1.2000003 1.2,-1.2000003 h 5.76 L 31.66,6.7412646 c -0.6,-0.5999999 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 l 2.28,-2.16 h -5.76 c -0.72,0 -1.2,-0.48 -1.2,-1.2 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4677-0);fill-opacity:1;stroke-width:1;filter:url(#filter4689)"
        id="path4165"
-       style="display:inline;fill:url(#radialGradient4677);fill-opacity:1;stroke-width:1;filter:url(#filter4907)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" />
     <path
-       d="m 64.48,6.6012647 -5.039999,5.0400003 5.039999,5.04 -2.519999,2.52 -5.16,-4.92 -5.04,5.04 -2.52,-2.52 5.04,-5.16 -5.16,-5.0400003 2.52,-2.5200001 5.16,5.04 5.04,-5.04 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4605-8);fill-opacity:1;stroke-width:1;filter:url(#filter4629)"
        id="path4176"
-       style="display:inline;fill:url(#radialGradient4605);fill-opacity:1;stroke-width:1;filter:url(#filter4919)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" />
     <path
-       d="m 87.000001,11.301265 h -8.4 l 3.36,-3.3600004 c -0.84,-0.6 -1.68,-0.84 -2.76,-0.84 -2.64,0 -4.8,2.1600001 -4.8,4.8000004 0,2.64 2.16,4.8 4.8,4.8 1.68,0 3.24,-0.84 4.08,-2.28 l 2.76,1.2 c -1.32,2.4 -3.84,4.08 -6.84,4.08 -4.32,0 -7.8,-3.48 -7.8,-7.8 0,-4.3200004 3.48,-7.8000004 7.8,-7.8000004 1.8,0 3.48,0.6 4.92,1.6800001 l 2.88,-2.8800001 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4525-6);fill-opacity:1;stroke-width:1;filter:url(#filter4597)"
        id="path4187"
-       style="display:inline;fill:url(#radialGradient4525);fill-opacity:1;stroke-width:1;filter:url(#filter4931)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" />
     <path
-       id="path4209"
-       d="M 102.59961,2.7011715 93,11.101561 h 2.400391 l 1.242188,-0.03516 -0.04297,0.03516 v 8.400392 h 4.800781 v -6.000001 h 2.40039 v 6.000001 h 4.79884 v -8.400392 l -0.043,-0.03516 1.24415,0.03516 h 2.39843 z"
-       style="display:inline;fill:url(#radialGradient4529);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4943)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4529-9);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)"
+       d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z"
+       id="path4209" />
     <path
-       d="m 133.15407,12.421265 -6.72001,6.6 c -0.24,0.36 -0.72,0.48 -1.2,0.48 -0.48,0 -0.96,-0.12 -1.32,-0.48 l -6.72,-6.6 c -0.6,-0.72 -0.48,-1.32 0.48,-1.32 h 3.96 V 3.9012646 c 0,-0.72 0.48,-1.2 1.2,-1.2 h 4.8 c 0.72,0 1.2,0.48 1.2,1.2 v 7.2000004 h 3.84 c 0.96001,0 1.20001,0.6 0.48001,1.32 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4709-11);fill-opacity:1;stroke-width:1;filter:url(#filter4721)"
        id="path4214"
-       style="display:inline;fill:url(#radialGradient4709);fill-opacity:1;stroke-width:1;filter:url(#filter4955)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" />
     <path
-       d="m 148,19.881265 c -4.8,0 -8.64,-3.84 -8.64,-8.64 0,-4.6800004 3.84,-8.5200004 8.64,-8.5200004 4.8,0 8.64001,3.84 8.64001,8.6400004 0,4.68 -3.84001,8.52 -8.64001,8.52 z m 0,-14.5200003 c -3.36,0 -6,2.6399999 -6,6.0000003 0,3.24 2.64,6 6,6 3.36,0 6.00001,-2.64 6.00001,-6 0,-3.3600004 -2.64001,-6.0000003 -6.00001,-6.0000003 z m -0.36,7.0800003 c -0.48,-0.12 -0.84,-0.6 -0.84,-1.08 V 7.7612646 c 0,-0.72 0.48,-1.2 1.2,-1.2 0.72,0 1.2,0.48 1.2,1.2 v 3.3600004 c 1.32,1.32 2.4,3.84 2.4,3.84 0,0 -2.64,-1.2 -3.96,-2.52 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4729-5);fill-opacity:1;stroke-width:1;filter:url(#filter4741)"
        id="path4225"
-       style="display:inline;fill:url(#radialGradient4729);fill-opacity:1;stroke-width:1;filter:url(#filter4967)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" />
     <path
-       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z"
+       style="display:inline;fill:url(#radialGradient5017-9);fill-opacity:1;stroke-width:0.79274529"
        id="path4355"
-       style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529;filter:url(#filter4979)" />
+       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" />
     <path
-       d="m 202,17.101265 h -2.4 l 1.2,2.4 h -14.39999 l 1.2,-2.4 h -2.4 c -0.72,0 -1.2,-0.48 -1.2,-1.2 V 9.9012647 c 0,-0.7200001 0.48,-1.2000001 1.2,-1.2000001 h 1.2 V 6.3012647 c 0,-0.7200001 0.48,-1.2000001 1.2,-1.2000001 v -1.2 c 0,-0.72 0.48,-1.2 1.2,-1.2 H 198.4 c 0.72,0 1.2,0.48 1.2,1.2 v 1.2 c 0.72,0 1.2,0.48 1.2,1.2000001 v 2.3999999 h 1.2 c 0.72,0 1.2,0.48 1.2,1.2000001 v 6.0000003 c 0,0.72 -0.48,1.2 -1.2,1.2 z m -14.39999,0 0.6,-1.2 h -0.6 z m 0.6,-6 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z M 198.4,5.1012646 c 0,-0.72 -0.48,-1.2 -1.2,-1.2 h -7.19999 c -0.72,0 -1.2,0.48 -1.2,1.2 v 3.6 c 0,0.7200001 0.48,1.2000001 1.2,1.2000001 H 197.2 c 0.72,0 1.2,-0.48 1.2,-1.2000001 z m -1.08,10.8000004 h -7.43999 l -1.08,2.4 H 198.4 Z m 2.28,0 H 199 l 0.6,1.2 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4793-8);fill-opacity:1;stroke-width:1;filter:url(#filter4805)"
        id="path4366"
-       style="display:inline;fill:url(#radialGradient4793);fill-opacity:1;stroke-width:1;filter:url(#filter4991)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-1e-7 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" />
     <path
-       d="m 247,19.501265 h -15.6 c -0.96,0 -1.8,-0.84 -1.8,-1.8 V 4.5012646 c 0,-0.9599999 0.84,-1.8 1.8,-1.8 H 247 c 0.96,0 1.8,0.8400001 1.8,1.8 V 17.701265 c 0,0.96 -0.84,1.8 -1.8,1.8 z M 239.8,3.9012646 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.28,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.6,4.8 c 0,-0.72 -0.48,-1.1999999 -1.2,-1.1999999 h -12 c -0.72,0 -1.2,0.4799999 -1.2,1.1999999 v 7.2000004 c 0,0.72 0.48,1.2 1.2,1.2 h 12 c 0.72,0 1.2,-0.48 1.2,-1.2 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4833-4);fill-opacity:1;stroke-width:1;filter:url(#filter4853)"
        id="path4388"
-       style="display:inline;fill:url(#radialGradient4833);fill-opacity:1;stroke-width:1;filter:url(#filter5003)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
-    <text
-       transform="scale(0.98484982,1.0153832)"
-       id="text4409"
-       y="12.608931"
-       x="188.06316"
-       style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5015)"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient4841);fill-opacity:1;stroke-width:0.79274535px;"
-         y="12.608931"
-         x="188.06316"
-         id="tspan4411">+</tspan></text>
+       d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" />
+    <g
+       aria-label="+"
+       transform="scale(0.98484984,1.0153832)"
+       style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841-0);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4409">
+      <path
+         d="m 194.95358,9.8484986 h -2.03077 v 1.9696994 h -1.01538 V 9.8484986 h -2.03077 V 8.8636487 h 2.03077 V 6.893949 h 1.01538 v 1.9696997 h 2.03077 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient9039);fill-opacity:1;stroke-width:0.79274535px"
+         id="path7725" />
+    </g>
     <path
-       style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5027)"
-       id="path6182"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        d="m 467.25784,24.196945 c -0.36562,0 -0.73125,0.24375 -0.975,0.853125 l -2.4375,4.996876 -5.24062,0.853125 c -1.21875,0.24375 -1.4625,1.096875 -0.60938,1.95 l 3.77813,4.021875 -0.85313,5.60625 c -0.12181,0.73125 0.24375,1.21875 0.85313,1.21875 0.24375,0 0.4875,-0.121875 0.73125,-0.24375 l 4.75312,-2.559375 4.75313,2.559375 c 0.24375,0.121875 0.60937,0.24375 0.73125,0.24375 0.60937,0 0.975,-0.4875 0.85312,-1.340625 l -0.85312,-5.60625 3.77812,-4.021875 c 0.85313,-0.853125 0.4875,-1.70625 -0.60937,-1.95 l -5.24063,-0.853125 -2.4375,-4.996876 c -0.24375,-0.4875 -0.60937,-0.73125 -0.975,-0.73125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path6182"
+       style="display:inline;fill:url(#radialGradient5031-1);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" />
     <path
-       style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5039)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 226.66131,15.091518 -0.0388,3.707848 c -0.007,0.673061 -0.5177,1.245488 -1.19079,1.24654 l -17.77799,0.02779 c -0.6731,0.0011 -1.2416,-0.573462 -1.24671,-1.24654 l -0.028,-3.688049 c -0.005,-0.673078 0.6302,-1.305219 1.30331,-1.305219 1.26531,-1.257631 1.03718,-3.269047 1.26531,-5.0305225 0.4278,-2.8226251 0.0953,-6.2244545 3.80878,-6.2479747 l 7.52682,-0.047673 c 3.73297,-0.023644 3.4173,3.4730226 3.84751,6.2956477 0.41438,2.7153765 0,3.7728915 1.26526,5.0305225 0.70548,0 1.26526,0.515815 1.26526,1.25763 z m -7.68106,-4.410561 h -1.82811 V 8.8528316 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281254 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
        id="path7318"
-       d="m 226.73438,15.945016 v 2.437501 c 0,0.673097 -0.54566,1.21875 -1.21875,1.21875 h -18.28124 c -0.67311,0 -1.21875,-0.545653 -1.21875,-1.21875 v -2.437501 c 0,-0.673097 0.54564,-1.21875 1.21875,-1.21875 h -1.04571 c 2.80313,0 2.36053,-3.256168 2.77368,-5.9703239 0.4278,-2.8226251 0.1927,-6.1069689 3.90598,-6.0616014 l 7.47091,0.091277 c 3.73276,0.045605 3.22143,3.1476992 3.65164,5.9703243 0.41438,2.715376 -0.20346,5.970324 2.60942,5.970324 h -1.08468 c 0.67309,0 1.21875,0.545653 1.21875,1.21875 z m -7.92188,-4.874999 h -1.82811 V 9.2418912 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281258 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4813-2);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" />
     <path
-       style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5051)"
-       id="path7886"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        d="m 269.02823,19.939154 c -0.975,0 -1.82813,-0.24375 -2.80313,-1.584375 -0.975,-1.340625 -2.07187,-3.046875 -2.07187,-3.046875 0,0 -0.85313,-1.096875 -1.34063,-1.95 -0.60937,-0.853125 -1.34062,-0.609375 -1.34062,-0.609375 0,0 -3.53438,-5.7281239 -4.14375,-6.581249 -0.73125,-1.21875 0.73125,-3.290625 0.73125,-3.290625 l 5.3625,8.531249 c 0,0 1.70625,2.315625 2.31562,2.803125 0.60938,0.4875 1.70625,-0.4875 3.4125,1.096875 2.31563,2.19375 1.58438,4.63125 -0.12181,4.63125 z m -0.36563,-3.534375 c -1.09687,-1.21875 -2.07187,-1.096875 -2.31562,-0.73125 -0.24375,0.365625 0,1.4625 0.4875,2.071875 0.4875,0.609375 0.975,0.853125 1.70625,0.853125 0.73125,0.121875 1.34062,-0.853125 0.1218,-2.19375 z m -4.63125,-5.728124 -1.4625,-2.19375 3.53438,-5.60625 c 0,0 1.4625,2.071875 0.73125,3.290625 -0.36563,0.4875001 -1.70625,2.803125 -2.80313,4.509375 z m -5.60625,3.534374 c 0.36563,-0.365625 1.21875,-1.340625 1.70625,-2.071875 l 0.975,1.4625 c -0.4875,0.73125 -1.09687,1.70625 -1.09687,1.70625 0,0 -1.09688,1.70625 -2.07188,3.046875 -0.85312,1.340625 -1.70625,1.584375 -2.80312,1.584375 -1.70625,0 -2.55938,-2.4375 -0.12181,-4.63125 1.70625,-1.4625 2.80312,-0.609375 3.4125,-1.096875 z m -2.925,2.19375 c -1.09687,1.21875 -0.4875,2.19375 0.24375,2.19375 0.73125,0 1.21875,-0.24375 1.70625,-0.853125 0.4875,-0.609375 0.73125,-1.828125 0.4875,-2.071875 -0.36562,-0.365625 -1.34062,-0.4875 -2.4375,0.73125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path7886"
+       style="display:inline;fill:url(#radialGradient4861-6);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" />
     <path
-       style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5063)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 292.45286,20.11787 h -7.56413 c -0.73125,0 -1.32549,-0.515308 -1.33058,-1.24654 l -0.028,-4.017519 v -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 l 6.44059,0.00442 2.53052,2.5152613 0.0354,8.810334 c 0.003,0.731244 -0.57138,1.24654 -1.30263,1.24654 z M 289.62394,8.7600607 v 2.4375003 h 2.4375 z m -7.3125,-0.6736655 0.0213,0.7169703 v 2.5152615 3.772891 l -5.06403,0.04019 c -0.73123,0.0058 -1.21672,-0.598663 -1.21875,-1.32991 l -0.028,-10.0556901 c -0.002,-0.7312471 0.4875,-1.21875 1.21875,-1.21875 h 6.09375 l 2.79402,2.5031129 v 1.81343 h -2.53052 c -0.67317,-0.017075 -1.31624,0.241688 -1.28654,1.2424914 z m 0.0213,-4.7304016 v 2.4596813 l 2.53052,-0.02779 z"
        id="path8454"
-       d="m 292.00552,19.7566 h -7.3125 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 v -3.656249 -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 0,0 3.9,0 6.09375,0 0,0 2.4375,2.4375003 2.4375,2.4375003 0,2.68125 0,8.531249 0,8.531249 0,0.73125 -0.4875,1.21875 -1.21875,1.21875 z m -2.4375,-10.9687493 v 2.4375003 h 2.4375 z m -7.3125,-1.3406249 v 1.3406249 2.3156253 3.778125 h -4.875 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 V 3.9128507 c 0,-0.7312499 0.4875,-1.21875 1.21875,-1.21875 0,0 3.9,0 6.09375,0 0,0 2.4375,2.4375 2.4375,2.4375 0,0.4875 0,0.9750001 0,1.5843751 h -3.04688 c -0.36562,0.121875 -0.60937,0.365625 -0.60937,0.73125 z m 0,-3.5343751 v 2.4375001 h 2.4375 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4881-9);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" />
     <path
-       style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5075)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 312.76384,20.20124 -10.1808,-0.02779 c -0.75126,-0.0021 -1.21143,-0.547743 -1.21303,-1.272325 l -0.028,-12.6083588 c -0.002,-0.9749978 0.29395,-1.2762443 1.26895,-1.2723257 l 2.49639,0.010033 c 0,0 0.0587,-2.5309032 2.49616,-2.5309032 2.4375,0 2.56487,2.5309032 2.56487,2.5309032 l 2.48359,0.017757 c 0.97497,0.00697 1.35938,0.3251372 1.35283,1.3001156 l -0.0839,12.4971989 c -0.005,0.808245 -0.51762,1.35744 -1.15713,1.355695 z m -1.86968,-13.8508896 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.47079,1.1953846 h 7.59155 z m 0.53952,2.4530151 h -6.32629 l -2.53052,2.5152615 2.53052,5.030522 7.59155,-5.030522 z"
        id="path9022"
-       d="m 311.86917,19.7566 h -8.53125 c -0.97501,0 -1.82812,-0.853125 -1.82812,-1.828124 V 6.9597255 c 0,-0.9750001 0.85311,-1.8281251 1.82812,-1.8281251 h 1.82813 c 0,0 0,-2.4375 2.4375,-2.4375 2.4375,0 2.4375,2.4375 2.4375,2.4375 h 1.82812 c 0.975,0 1.82813,0.853125 1.82813,1.8281251 V 17.928476 c 0,0.974999 -0.85313,1.828124 -1.82813,1.828124 z m -0.97501,-13.4062496 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.60937,1.2187501 h 3.04687 3.9 0.975 z m 0.12182,2.071875 h -5.72812 l -3.65625,2.0718756 3.4125,5.971875 8.04375,-4.63125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4901-6);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" />
     <path
-       style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5087)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="M 335.47361,15.091518 V 7.545735 l 3.79578,3.772892 z m -8.85681,1.257631 h 7.59155 l -3.79578,3.772892 z m 6.32629,-1.257631 h -5.06103 c -0.73124,-0.0041 -1.26114,-0.526392 -1.26526,-1.25763 V 8.8033655 c -0.004,-0.7312386 0.53401,-1.2576305 1.26526,-1.2576305 h 5.06103 c 0.73125,0 1.26526,0.5263804 1.26526,1.2576305 v 5.0305225 c 0,0.609375 -0.53402,1.261705 -1.26526,1.25763 z m 0,-3.772891 c 0,-0.73125 -0.53401,-1.257631 -1.26526,-1.257631 h -2.53052 c -0.73125,0 -1.26525,0.526381 -1.26525,1.257631 v 1.25763 c 0,0.73125 0.534,1.257631 1.26525,1.257631 h 2.53052 c 0.73125,0 1.26526,-0.526381 1.26526,-1.257631 z m -2.53052,-8.8034143 3.79578,3.7728917 h -7.59155 z m -5.06103,5.0305223 v 7.545783 l -3.79578,-3.772891 z"
        id="path9590"
-       d="M 335.29779,14.881601 V 7.5691009 l 3.65625,3.6562501 z m -8.53125,1.21875 h 7.3125 l -3.65625,3.656249 z m 6.09375,-1.21875 h -4.875 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 v -4.875 c 0,-0.7312501 0.4875,-1.2187501 1.21875,-1.2187501 h 4.875 c 0.73125,0 1.21875,0.4875 1.21875,1.2187501 v 4.875 c 0,0.609375 -0.4875,1.21875 -1.21875,1.21875 z m 0,-3.65625 c 0,-0.73125 -0.4875,-1.21875 -1.21875,-1.21875 h -2.4375 c -0.73125,0 -1.21875,0.4875 -1.21875,1.21875 v 1.21875 c 0,0.73125 0.4875,1.21875 1.21875,1.21875 h 2.4375 c 0.73125,0 1.21875,-0.4875 1.21875,-1.21875 z m -2.4375,-8.5312501 3.65625,3.6562501 h -7.3125 z m -4.875,4.875 v 7.3125001 l -3.65625,-3.65625 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4921-8);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" />
     <path
-       style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839;filter:url(#filter5099)"
+       d="m 274,8 h 10 v 2 h -10 z"
        id="path10158"
-       d="m 274.15498,8.0293266 h 9.6324 v 1.9381685 h -9.6324 z" />
+       style="display:inline;fill:url(#radialGradient4941-9);fill-opacity:1;stroke-width:0.96615839" />
     <path
-       style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839;filter:url(#filter5111)"
+       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
        id="path10726"
-       d="m 301.82263,10.040073 h -3.85298 v 3.876338 h -1.92648 v -3.876338 h -3.85298 V 8.1019059 h 3.85298 V 4.2255681 h 1.92648 v 3.8763378 h 3.85298 z" />
+       style="display:inline;fill:url(#radialGradient4949-5);fill-opacity:1;stroke-width:0.96615839" />
     <path
-       style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5123)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 406.82037,12.583531 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 l -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.071875 -0.73125,-2.8031253 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437504 z m -8.53125,-2.4375 c 0,0 -1.34061,-1.8281254 -1.95,-2.4375004 -1.70625,0.853125 -2.68125,2.4375004 -2.68125,4.1437504 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531253 0.36561,-1.7062504 0.60936,-2.4375004 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250004 -1.4625,6.8250004 z"
        id="path11294"
-       d="m 407.09514,12.361211 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 0,0 -0.12181,-0.121875 -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.0718751 -0.73125,-2.8031251 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437502 z m -8.53125,-2.4375001 c 0,0 -1.34061,-1.8281251 -1.95,-2.4375001 -1.70625,0.853125 -2.68125,2.4375001 -2.68125,4.1437502 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531251 0.36561,-1.7062502 0.60936,-2.4375002 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250001 -1.4625,6.8250001 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4957-2);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" />
     <path
-       style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5135)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 429.73975,20.187746 -2.55504,0.05558 c -0.48738,0.0106 -0.61242,-0.769541 -0.61242,-1.378916 0,0 0.31966,-4.276424 -3.79578,-8.803414 -3.20233,-3.5225593 -8.85682,-3.7728916 -8.85682,-3.7728916 -0.60938,0 -1.26177,-0.171597 -1.25602,-0.6590635 l 0.028,-2.3732094 c 0.006,-0.4874666 0.61868,-0.7406188 1.22806,-0.7406188 0,0 7.05132,0.3003217 11.38734,5.0305223 3.72704,4.065871 5.06103,11.318675 5.06103,11.318675 0,0.4875 -0.0191,1.310083 -0.62831,1.323336 z M 413.91969,8.8033655 c 0,0 4.48239,0.7421569 7.0114,3.0905195 2.59016,2.40515 3.11068,6.970525 3.11068,6.970525 0,0.4875 -0.7448,1.278471 -1.23236,1.278471 h -1.35283 c -0.4875,0 -1.21059,-0.669096 -1.21059,-1.278471 0,0 0.4472,-2.304652 -1.91012,-4.45401 -1.78736,-1.629677 -4.41618,-1.834143 -4.41618,-1.834143 -0.60938,0 -1.23946,-0.793663 -1.22806,-1.281032 l 0.028,-1.195314 c 0.0114,-0.4873685 0.59073,-1.2965455 1.20011,-1.2965455 z m 1.20944,6.3426395 c 1.34062,0 2.54933,1.124665 2.54933,2.46529 0,1.340626 -1.09688,2.576451 -2.4375,2.576451 -1.34063,0 -2.54933,-1.208035 -2.54933,-2.548661 0,-1.340625 1.09687,-2.49308 2.4375,-2.49308 z"
        id="path11862"
-       d="m 429.01283,20.243326 h -1.82812 c -0.4875,0 -0.975,-0.365625 -0.975,-0.975 0,0 0.36562,-4.387501 -3.9,-8.775 -3.04688,-3.6562503 -8.53125,-3.9000003 -8.53125,-3.9000003 -0.60938,0 -0.975,-0.365625 -0.975,-0.8531249 V 4.0339507 c 0,-0.4875 0.36562,-0.853125 0.975,-0.853125 0,0 7.67812,0.4875 11.7,5.4843751 4.02187,3.7781242 4.3875,10.7250002 4.3875,10.7250002 0,0.4875 -0.24375,0.853125 -0.85313,0.853125 z M 413.77846,9.2745758 c 0,0 4.50937,0.609375 7.06875,2.9249992 2.55937,2.4375 3.04687,7.190626 3.04687,7.190626 0,0.4875 -0.12181,0.975 -0.60937,0.975 h -1.82813 c -0.4875,0 -0.73125,-0.365625 -0.73125,-0.975 0,0 0.12181,-2.925001 -2.19375,-5.118751 -1.82812,-1.584375 -4.75312,-1.70625 -4.75312,-1.70625 -0.60938,0 -0.975,-0.365625 -0.975,-0.853125 v -1.584374 c 0,-0.4875002 0.36562,-0.8531252 0.975,-0.8531252 z m 1.4625,6.0937492 c 1.34062,0 2.4375,1.096875 2.4375,2.4375 0,1.340626 -1.09688,2.437501 -2.4375,2.437501 -1.34063,0 -2.4375,-1.096875 -2.4375,-2.437501 0,-1.340625 1.09687,-2.4375 2.4375,-2.4375 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4977-4);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" />
     <path
-       style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5147)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 448.08169,13.833888 v 2.515261 c 0,0.975 -0.41214,1.257631 -1.26525,1.257631 h -10.12208 c -0.85314,0 -1.26526,-0.282631 -1.26526,-1.257631 V 6.2881044 c 0,-0.9750001 0.41212,-1.2576306 1.26526,-1.2576306 h 10.12208 c 0.85311,0 1.26525,0.2826305 1.26525,1.2576306 v 2.5152611 l 5.06104,-2.5152611 V 16.349149 Z"
        id="path12430"
-       d="m 451.64901,16.435377 -3.65625,-3.290625 v 2.559375 c 0,0.975 -0.73125,1.70625 -1.58436,1.70625 h -9.01875 c -0.85314,0 -1.58439,-0.73125 -1.58439,-1.70625 V 6.9291285 c 0,-0.9750001 0.73125,-1.7062501 1.58439,-1.7062501 h 9.01875 c 0.85311,0 1.58436,0.73125 1.58436,1.7062501 v 2.437499 l 3.65625,-3.2906241 c 0.36564,-0.365625 0.73125,-0.4875 1.21875,-0.365625 V 16.801002 c -0.36561,0.121875 -0.85311,0 -1.21875,-0.365625 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4997-5);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" />
     <g
-       id="g4779"
-       style="display:inline;filter:url(#filter5159)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)">
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline"
+       id="g4779">
       <path
-         style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;"
-         d="M 165.73984,2.6257296 V 20.34448 h 9.42792 0.69708 2.46698 c 1.25518,-0.32709 2.23657,-1.314095 2.53125,-2.53125 v -2.53125 -7.5937504 -2.53125 c -0.29468,-1.2171559 -1.27607,-2.2041601 -2.53125,-2.53125 h -2.07148 -1.09258 z m 7.73958,3.0577697 1.33485,2.2420349 c 0,0 0.36967,0.6174141 0.65753,0.813263 0.26974,0.1834496 0.93438,0.2892151 0.93438,0.2892151 h 2.72901 l -1.89596,3.0800167 c 0,0 -0.27577,0.604831 -0.41281,0.907196 -0.20593,0.452534 0.006,1.243536 0.0742,1.982484 0.10732,1.162403 0.19033,2.286529 0.19033,2.286529 l -2.21484,-1.132141 c 0,0 -0.90763,-0.426918 -1.39416,-0.427644 -0.5721,0 -1.64383,0.496858 -1.64383,0.496858 l -2.2198,1.065398 c 0,0 0.16319,-1.013778 0.33866,-2.128325 0.11606,-0.733074 0.43611,-1.567458 0.17798,-2.071473 -0.13995,-0.274086 -0.42023,-0.820679 -0.42023,-0.820679 L 167.532,9.0996981 h 2.71169 c 0,0 0.88228,-0.06226 1.24339,-0.2892151 0.27408,-0.1711231 0.61056,-0.7539368 0.61056,-0.7539368 z"
-         id="bookmarks-star-4" />
+         id="bookmarks-star-4"
+         d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z"
+         style="fill:url(#radialGradient4710-4);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" />
       <path
-         style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;"
-         d="m 163.20859,2.6257296 c -1.25519,0.3270899 -2.23658,1.3140942 -2.53125,2.53125 v 2.53125 7.5937504 2.53125 c 0.29467,1.217155 1.27606,2.20416 2.53125,2.53125 h 3.16406 v -5.0625 -7.5937504 -5.0625 z"
-         id="bookmarks-overlay-1" />
+         id="bookmarks-overlay-1"
+         d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z"
+         style="fill:url(#radialGradient4712-2);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" />
       <path
-         style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:0.6328125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
-         d="M 166.37156,2.6257296 V 20.34448"
-         id="bookmarks-divider-7" />
+         id="bookmarks-divider-7"
+         d="M 165.92886,2.5152127 V 20.122041"
+         style="opacity:0.66300001;fill:url(#radialGradient4714-4);fill-opacity:1;stroke:url(#radialGradient4750-3);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <path
-       d="m 133.26971,34.690626 -6.72001,6.6 c -0.24,0.36 -0.72,0.48 -1.2,0.48 -0.48,0 -0.96,-0.12 -1.32,-0.48 l -6.72,-6.6 c -0.6,-0.72 -0.48,-1.32 0.48,-1.32 h 3.96 v -7.200001 c 0,-0.72 0.48,-1.2 1.2,-1.2 h 4.8 c 0.72,0 1.2,0.48 1.2,1.2 v 7.200001 h 3.84 c 0.96001,0 1.20001,0.6 0.48001,1.32 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4709-1-2);fill-opacity:1;stroke-width:1;filter:url(#filter4844)"
        id="path4214-3"
-       style="display:inline;fill:url(#radialGradient4709-1);fill-opacity:1;stroke-width:1;filter:url(#filter5171)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" />
   </g>
 </svg>
diff --git a/application/palemoon/themes/windows/Toolbar-inverted.png b/application/palemoon/themes/windows/Toolbar-inverted.png
new file mode 100644
index 000000000..54d83bf5f
--- /dev/null
+++ b/application/palemoon/themes/windows/Toolbar-inverted.png
diff --git a/application/palemoon/themes/windows/Toolbar.png b/application/palemoon/themes/windows/Toolbar.png
new file mode 100644
index 000000000..8ec756e03
--- /dev/null
+++ b/application/palemoon/themes/windows/Toolbar.png
diff --git a/application/palemoon/themes/windows/Toolbar.svg b/application/palemoon/themes/windows/Toolbar.svg
index 314e020fb..7a68c0608 100644
--- a/application/palemoon/themes/windows/Toolbar.svg
+++ b/application/palemoon/themes/windows/Toolbar.svg
@@ -6,14 +6,14 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   enable-background="new 0 0 378 38"
-   viewBox="0 0 378 38"
-   height="38"
-   width="378"
-   y="0px"
-   x="0px"
+   version="1.1"
    id="PaleMoonToolbarSVG"
-   version="1.1">
+   x="0px"
+   y="0px"
+   width="378"
+   height="38"
+   viewBox="0 0 378 38"
+   enable-background="new 0 0 378 38">
   <metadata
      id="metadata146">
     <rdf:RDF>
@@ -29,1329 +29,1328 @@
   <defs
      id="defs144">
     <radialGradient
-       cy="0.69999999"
-       id="globalGradient">
+       id="globalGradient"
+       cy="0.69999999">
       <stop
-         style="stop-color:#87939b;stop-opacity:1"
+         offset="0.05"
          id="stop4"
-         offset="0.05" />
+         style="stop-color:#87939b;stop-opacity:1" />
       <stop
-         style="stop-color:#45555f;stop-opacity:1"
+         offset="1"
          id="stop6"
-         offset="1" />
+         style="stop-color:#45555f;stop-opacity:1" />
     </radialGradient>
     <filter
        id="insetShadow">
       <feFlood
-         id="feFlood1875"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood1875" />
       <feComposite
-         id="feComposite1877"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite1877" />
       <feGaussianBlur
-         id="feGaussianBlur1879"
-         result="blur"
+         in="composite1"
          stdDeviation="2"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur1879" />
       <feOffset
-         id="feOffset1881"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset1881" />
       <feComposite
-         id="feComposite1883"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite1883" />
     </filter>
     <filter
-       id="filter2164"
-       style="color-interpolation-filters:sRGB;">
+       style="color-interpolation-filters:sRGB;"
+       id="filter2164">
       <feFlood
-         id="feFlood2154"
-         result="flood"
+         flood-opacity="1"
          flood-color="rgb(0,0,0)"
-         flood-opacity="1" />
+         result="flood"
+         id="feFlood2154" />
       <feComposite
-         id="feComposite2156"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite2156" />
       <feGaussianBlur
-         id="feGaussianBlur2158"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur2158" />
       <feOffset
-         id="feOffset2160"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset2160" />
       <feComposite
-         id="feComposite2162"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite2162" />
     </filter>
     <radialGradient
-       cy="12.21416"
-       id="globalGradient-8"
-       gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)"
-       cx="95.643087"
-       fx="95.643087"
-       fy="12.21416"
+       gradientUnits="userSpaceOnUse"
        r="7.2456884"
-       gradientUnits="userSpaceOnUse">
+       fy="12.21416"
+       fx="95.643087"
+       cx="95.643087"
+       gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)"
+       id="globalGradient-8"
+       cy="12.21416">
       <stop
-         style="stop-color:#12d92d;stop-opacity:1"
+         offset="0.05"
          id="stop4-5"
-         offset="0.05" />
+         style="stop-color:#12d92d;stop-opacity:1" />
       <stop
-         style="stop-color:#01b222;stop-opacity:1"
+         offset="1"
          id="stop6-5"
-         offset="1" />
+         style="stop-color:#01b222;stop-opacity:1" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
-       r="7.1399999"
-       fy="14.778796"
-       fx="10.529827"
-       cy="14.778796"
-       cx="10.529827"
+       xlink:href="#linearGradient4635"
        id="radialGradient4669"
-       xlink:href="#linearGradient4635" />
+       cx="10.529827"
+       cy="14.778796"
+       fx="10.529827"
+       fy="14.778796"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4635">
       <stop
-         id="stop4631"
+         style="stop-color:#6198cb;stop-opacity:1"
          offset="0"
-         style="stop-color:#6198cb;stop-opacity:1" />
+         id="stop4631" />
       <stop
-         id="stop4633"
+         style="stop-color:#3a78b2;stop-opacity:1"
          offset="1"
-         style="stop-color:#3a78b2;stop-opacity:1" />
+         id="stop4633" />
     </linearGradient>
     <filter
-       id="filter4701"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4701">
       <feFlood
-         id="feFlood4691"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4691" />
       <feComposite
-         id="feComposite4693"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4693" />
       <feGaussianBlur
-         id="feGaussianBlur4695"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4695" />
       <feOffset
-         id="feOffset4697"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4697" />
       <feComposite
-         id="feComposite4699"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4699" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
-       r="8.7600002"
-       fy="38.79744"
-       fx="11.063469"
-       cy="38.79744"
-       cx="11.063469"
+       xlink:href="#linearGradient4635"
        id="radialGradient4637"
-       xlink:href="#linearGradient4635" />
+       cx="11.063469"
+       cy="38.79744"
+       fx="11.063469"
+       fy="38.79744"
+       r="8.7600002"
+       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4661"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4661">
       <feFlood
-         id="feFlood4651"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4651" />
       <feComposite
-         id="feComposite4653"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4653" />
       <feGaussianBlur
-         id="feGaussianBlur4655"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4655" />
       <feOffset
-         id="feOffset4657"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4657" />
       <feComposite
-         id="feComposite4659"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4659" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
-       r="7.1399999"
-       fy="14.552581"
-       fx="34.841751"
-       cy="14.552581"
-       cx="34.841751"
+       xlink:href="#linearGradient4635"
        id="radialGradient4677"
-       xlink:href="#linearGradient4635" />
+       cx="34.841751"
+       cy="14.552581"
+       fx="34.841751"
+       fy="14.552581"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4689"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4689">
       <feFlood
-         id="feFlood4679"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4679" />
       <feComposite
-         id="feComposite4681"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4681" />
       <feGaussianBlur
-         id="feGaussianBlur4683"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4683" />
       <feOffset
-         id="feOffset4685"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4685" />
       <feComposite
-         id="feComposite4687"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4687" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
-       r="7.6799994"
-       fy="12.761739"
-       fx="58.062626"
-       cy="12.761739"
-       cx="58.062626"
+       xlink:href="#linearGradient4603"
        id="radialGradient4605"
-       xlink:href="#linearGradient4603" />
+       cx="58.062626"
+       cy="12.761739"
+       fx="58.062626"
+       fy="12.761739"
+       r="7.6799994"
+       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4603">
       <stop
-         id="stop4599"
+         style="stop-color:#e72b1d;stop-opacity:1"
          offset="0"
-         style="stop-color:#e72b1d;stop-opacity:1" />
+         id="stop4599" />
       <stop
-         id="stop4601"
+         style="stop-color:#cc4338;stop-opacity:1"
          offset="1"
-         style="stop-color:#cc4338;stop-opacity:1" />
+         id="stop4601" />
     </linearGradient>
     <filter
-       id="filter4629"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4629">
       <feFlood
-         id="feFlood4619"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4619" />
       <feComposite
-         id="feComposite4621"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4621" />
       <feGaussianBlur
-         id="feGaussianBlur4623"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4623" />
       <feOffset
-         id="feOffset4625"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4625" />
       <feComposite
-         id="feComposite4627"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4627" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
-       r="7.8000002"
-       fy="13.939252"
-       fx="79.305222"
-       cy="13.939252"
-       cx="79.305222"
+       xlink:href="#linearGradient4523-3"
        id="radialGradient4525"
-       xlink:href="#linearGradient4523-3" />
+       cx="79.305222"
+       cy="13.939252"
+       fx="79.305222"
+       fy="13.939252"
+       r="7.8000002"
+       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4523-3">
       <stop
-         id="stop4519"
+         style="stop-color:#4fb55d;stop-opacity:1"
          offset="0"
-         style="stop-color:#4fb55d;stop-opacity:1" />
+         id="stop4519" />
       <stop
-         id="stop4521"
+         style="stop-color:#2d8539;stop-opacity:1"
          offset="1"
-         style="stop-color:#2d8539;stop-opacity:1" />
+         id="stop4521" />
     </linearGradient>
     <filter
-       id="filter4597"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4597">
       <feFlood
-         id="feFlood4587"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4587" />
       <feComposite
-         id="feComposite4589"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4589" />
       <feGaussianBlur
-         id="feGaussianBlur4591"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4591" />
       <feOffset
-         id="feOffset4593"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4593" />
       <feComposite
-         id="feComposite4595"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4595" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
-       r="9.5995998"
-       fy="12.664675"
-       fx="103.23091"
-       cy="12.664675"
-       cx="103.23091"
+       xlink:href="#linearGradient4527"
        id="radialGradient4529"
-       xlink:href="#linearGradient4527" />
+       cx="103.23091"
+       cy="12.664675"
+       fx="103.23091"
+       fy="12.664675"
+       r="9.5995998"
+       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4527">
       <stop
-         id="stop4523"
+         style="stop-color:#3f6bbd;stop-opacity:1"
          offset="0"
-         style="stop-color:#3f6bbd;stop-opacity:1" />
+         id="stop4523" />
       <stop
-         id="stop4525"
+         style="stop-color:#29467b;stop-opacity:1"
          offset="1"
-         style="stop-color:#29467b;stop-opacity:1" />
+         id="stop4525" />
     </linearGradient>
     <filter
-       id="filter4783"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4783">
       <feFlood
-         id="feFlood4773"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4773" />
       <feComposite
-         id="feComposite4775"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4775" />
       <feGaussianBlur
-         id="feGaussianBlur4777"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4777" />
       <feOffset
-         id="feOffset4779"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4779" />
       <feComposite
-         id="feComposite4781"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4781" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
-       r="8.3726959"
-       fy="16.659737"
-       fx="125.30523"
-       cy="16.659737"
-       cx="125.30523"
+       xlink:href="#linearGradient4707"
        id="radialGradient4709"
-       xlink:href="#linearGradient4707" />
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4707">
       <stop
-         id="stop4703"
+         style="stop-color:#8c9ba5;stop-opacity:1"
          offset="0"
-         style="stop-color:#8c9ba5;stop-opacity:1" />
+         id="stop4703" />
       <stop
-         id="stop4705"
+         style="stop-color:#607480;stop-opacity:1"
          offset="1"
-         style="stop-color:#607480;stop-opacity:1" />
+         id="stop4705" />
     </linearGradient>
     <filter
-       id="filter4721"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4721">
       <feFlood
-         id="feFlood4711"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4711" />
       <feComposite
-         id="feComposite4713"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4713" />
       <feGaussianBlur
-         id="feGaussianBlur4715"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4715" />
       <feOffset
-         id="feOffset4717"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4717" />
       <feComposite
-         id="feComposite4719"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4719" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
-       r="8.6400051"
-       fy="12.784631"
-       fx="149.26262"
-       cy="12.784631"
-       cx="149.26262"
+       xlink:href="#linearGradient4727"
        id="radialGradient4729"
-       xlink:href="#linearGradient4727" />
+       cx="149.26262"
+       cy="12.784631"
+       fx="149.26262"
+       fy="12.784631"
+       r="8.6400051"
+       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4727">
       <stop
-         id="stop4723"
+         style="stop-color:#3eb796;stop-opacity:1"
          offset="0"
-         style="stop-color:#3eb796;stop-opacity:1" />
+         id="stop4723" />
       <stop
-         id="stop4725"
+         style="stop-color:#31a886;stop-opacity:1"
          offset="1"
-         style="stop-color:#31a886;stop-opacity:1" />
+         id="stop4725" />
     </linearGradient>
     <filter
-       id="filter4741"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4741">
       <feFlood
-         id="feFlood4731"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4731" />
       <feComposite
-         id="feComposite4733"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4733" />
       <feGaussianBlur
-         id="feGaussianBlur4735"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4735" />
       <feOffset
-         id="feOffset4737"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4737" />
       <feComposite
-         id="feComposite4739"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4739" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
-       r="9.6007004"
-       fy="12.037849"
-       fx="466.94476"
-       cy="12.037849"
-       cx="466.94476"
+       xlink:href="#linearGradient5023"
        id="radialGradient5017"
-       xlink:href="#linearGradient5023" />
+       cx="466.94476"
+       cy="12.037849"
+       fx="466.94476"
+       fy="12.037849"
+       r="9.6007004"
+       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5023">
       <stop
-         style="stop-color:#c6cdd2;stop-opacity:1"
+         id="stop5019"
          offset="0"
-         id="stop5019" />
+         style="stop-color:#c6cdd2;stop-opacity:1" />
       <stop
-         style="stop-color:#9cabb4;stop-opacity:1"
+         id="stop5021"
          offset="1"
-         id="stop5021" />
+         style="stop-color:#9cabb4;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
-       r="9.5999947"
-       fy="13.746766"
-       fx="194.44176"
-       cy="13.746766"
-       cx="194.44176"
+       xlink:href="#linearGradient4707"
        id="radialGradient4793"
-       xlink:href="#linearGradient4707" />
+       cx="194.44176"
+       cy="13.746766"
+       fx="194.44176"
+       fy="13.746766"
+       r="9.5999947"
+       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4805"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4805">
       <feFlood
-         id="feFlood4795"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4795" />
       <feComposite
-         id="feComposite4797"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4797" />
       <feGaussianBlur
-         id="feGaussianBlur4799"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4799" />
       <feOffset
-         id="feOffset4801"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4801" />
       <feComposite
-         id="feComposite4803"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4803" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
-       r="9.6000004"
-       fy="11.101265"
-       fx="239.2"
-       cy="11.101265"
-       cx="239.2"
+       xlink:href="#linearGradient4707"
        id="radialGradient4833"
-       xlink:href="#linearGradient4707" />
+       cx="239.2"
+       cy="11.101265"
+       fx="239.2"
+       fy="11.101265"
+       r="9.6000004"
+       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4853"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4853">
       <feFlood
-         id="feFlood4843"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4843" />
       <feComposite
-         id="feComposite4845"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4845" />
       <feGaussianBlur
-         id="feGaussianBlur4847"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4847" />
       <feOffset
-         id="feOffset4849"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4849" />
       <feComposite
-         id="feComposite4851"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4851" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79274533,0,0,0.78327978,-0.14435628,0.11758726)"
-       r="3.5288758"
-       fy="12.418613"
-       fx="242.0894"
-       cy="12.418613"
-       cx="242.0894"
+       xlink:href="#linearGradient4707"
        id="radialGradient4841"
-       xlink:href="#linearGradient4707" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)"
+       cx="242.26164"
+       cy="12.423289"
+       fx="242.26164"
+       fy="12.423289"
        r="3.5288758"
-       fy="12.418613"
-       fx="242.0894"
-       cy="12.418613"
-       cx="242.0894"
+       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
        id="radialGradient4858"
-       xlink:href="#linearGradient4707" />
+       cx="242.0894"
+       cy="12.418613"
+       fx="242.0894"
+       fy="12.418613"
+       r="3.5288758"
+       gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
-       r="9.7507105"
-       fy="31.105829"
-       fx="466.39926"
-       cy="31.105829"
-       cx="466.39926"
+       xlink:href="#linearGradient5037"
        id="radialGradient5031"
-       xlink:href="#linearGradient5037" />
+       cx="466.39926"
+       cy="31.105829"
+       fx="466.39926"
+       fy="31.105829"
+       r="9.7507105"
+       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient5037">
       <stop
-         style="stop-color:#e8e1a1;stop-opacity:1"
+         id="stop5033"
          offset="0"
-         id="stop5033" />
+         style="stop-color:#e8e1a1;stop-opacity:1" />
       <stop
-         style="stop-color:#baad3e;stop-opacity:1"
+         id="stop5035"
          offset="1"
-         id="stop5035" />
+         style="stop-color:#baad3e;stop-opacity:1" />
     </linearGradient>
     <filter
-       id="filter5049"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter5049">
       <feFlood
-         id="feFlood5039"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood5039" />
       <feComposite
-         id="feComposite5041"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5041" />
       <feGaussianBlur
-         id="feGaussianBlur5043"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5043" />
       <feOffset
-         id="feOffset5045"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset5045" />
       <feComposite
-         id="feComposite5047"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite5047" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
-       r="10.35937"
-       fy="16.56296"
-       fx="217.95329"
-       cy="16.56296"
-       cx="217.95329"
+       xlink:href="#linearGradient4707"
        id="radialGradient4813"
-       xlink:href="#linearGradient4707" />
+       cx="217.95329"
+       cy="16.56296"
+       fx="217.95329"
+       fy="16.56296"
+       r="10.35937"
+       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4825"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4825">
       <feFlood
-         id="feFlood4815"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4815" />
       <feComposite
-         id="feComposite4817"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4817" />
       <feGaussianBlur
-         id="feGaussianBlur4819"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4819" />
       <feOffset
-         id="feOffset4821"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4821" />
       <feComposite
-         id="feComposite4823"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4823" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
-       r="8.5577164"
-       fy="15.840806"
-       fx="262.79288"
-       cy="15.840806"
-       cx="262.79288"
+       xlink:href="#linearGradient4707"
        id="radialGradient4861"
-       xlink:href="#linearGradient4707" />
+       cx="262.79288"
+       cy="15.840806"
+       fx="262.79288"
+       fy="15.840806"
+       r="8.5577164"
+       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4873"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4873">
       <feFlood
-         id="feFlood4863"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4863" />
       <feComposite
-         id="feComposite4865"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4865" />
       <feGaussianBlur
-         id="feGaussianBlur4867"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4867" />
       <feOffset
-         id="feOffset4869"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4869" />
       <feComposite
-         id="feComposite4871"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4871" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="8.53125"
-       fy="14.171478"
-       fx="286.58698"
-       cy="14.171478"
-       cx="286.58698"
+       xlink:href="#linearGradient4707"
        id="radialGradient4881"
-       xlink:href="#linearGradient4707" />
+       cx="286.58698"
+       cy="14.171478"
+       fx="286.58698"
+       fy="14.171478"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4893"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4893">
       <feFlood
-         id="feFlood4883"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4883" />
       <feComposite
-         id="feComposite4885"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4885" />
       <feGaussianBlur
-         id="feGaussianBlur4887"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4887" />
       <feOffset
-         id="feOffset4889"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4889" />
       <feComposite
-         id="feComposite4891"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4891" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
-       r="6.09375"
-       fy="14.457072"
-       fx="308.97141"
-       cy="14.457072"
-       cx="308.97141"
+       xlink:href="#linearGradient4707"
        id="radialGradient4901"
-       xlink:href="#linearGradient4707" />
+       cx="308.97141"
+       cy="14.457072"
+       fx="308.97141"
+       fy="14.457072"
+       r="6.09375"
+       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4913"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4913">
       <feFlood
-         id="feFlood4903"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4903" />
       <feComposite
-         id="feComposite4905"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4905" />
       <feGaussianBlur
-         id="feGaussianBlur4907"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4907" />
       <feOffset
-         id="feOffset4909"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4909" />
       <feComposite
-         id="feComposite4911"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4911" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="8.53125"
-       fy="13.119289"
-       fx="331.15933"
-       cy="13.119289"
-       cx="331.15933"
+       xlink:href="#linearGradient4707"
        id="radialGradient4921"
-       xlink:href="#linearGradient4707" />
+       cx="331.15933"
+       cy="13.119289"
+       fx="331.15933"
+       fy="13.119289"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4933"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4933">
       <feFlood
-         id="feFlood4923"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4923" />
       <feComposite
-         id="feComposite4925"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4925" />
       <feGaussianBlur
-         id="feGaussianBlur4927"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4927" />
       <feOffset
-         id="feOffset4929"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4929" />
       <feComposite
-         id="feComposite4931"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4931" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
-       r="6.09375"
-       fy="11.316628"
-       fx="353.15076"
-       cy="11.316628"
-       cx="353.15076"
+       xlink:href="#linearGradient4707"
        id="radialGradient4941"
-       xlink:href="#linearGradient4707" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
+       cx="353.15076"
+       cy="11.316628"
+       fx="353.15076"
+       fy="11.316628"
        r="6.09375"
-       fy="11.407905"
-       fx="375.97003"
-       cy="11.407905"
-       cx="375.97003"
-       id="radialGradient4949"
+       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)"
        xlink:href="#linearGradient4707"
-       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)" />
+       id="radialGradient4949"
+       cx="375.97003"
+       cy="11.407905"
+       fx="375.97003"
+       fy="11.407905"
+       r="6.09375"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
-       r="8.5350475"
-       fy="13.518586"
-       fx="400.5007"
-       cy="13.518586"
-       cx="400.5007"
+       xlink:href="#linearGradient4707"
        id="radialGradient4957"
-       xlink:href="#linearGradient4707" />
+       cx="400.5007"
+       cy="13.518586"
+       fx="400.5007"
+       fy="13.518586"
+       r="8.5350475"
+       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter4969"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4969">
       <feFlood
-         id="feFlood4959"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4959" />
       <feComposite
-         id="feComposite4961"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4961" />
       <feGaussianBlur
-         id="feGaussianBlur4963"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4963" />
       <feOffset
-         id="feOffset4965"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4965" />
       <feComposite
-         id="feComposite4967"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4967" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
-       r="8.53125"
-       fy="15.742972"
-       fx="417.02075"
-       cy="15.742972"
-       cx="417.02075"
+       xlink:href="#linearGradient4975"
        id="radialGradient4977"
-       xlink:href="#linearGradient4975" />
+       cx="417.02075"
+       cy="15.742972"
+       fx="417.02075"
+       fy="15.742972"
+       r="8.53125"
+       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4975">
       <stop
-         id="stop4971"
+         style="stop-color:#f79729;stop-opacity:1"
          offset="0"
-         style="stop-color:#f79729;stop-opacity:1" />
+         id="stop4971" />
       <stop
-         id="stop4973"
+         style="stop-color:#d2831f;stop-opacity:1"
          offset="1"
-         style="stop-color:#d2831f;stop-opacity:1" />
+         id="stop4973" />
     </linearGradient>
     <filter
-       id="filter4989"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4989">
       <feFlood
-         id="feFlood4979"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4979" />
       <feComposite
-         id="feComposite4981"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4981" />
       <feGaussianBlur
-         id="feGaussianBlur4983"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4983" />
       <feOffset
-         id="feOffset4985"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset4985" />
       <feComposite
-         id="feComposite4987"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4987" />
     </filter>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
-       r="8.53125"
-       fy="11.316628"
-       fx="444.33652"
-       cy="11.316628"
-       cx="444.33652"
+       xlink:href="#linearGradient4707"
        id="radialGradient4997"
-       xlink:href="#linearGradient4707" />
+       cx="444.33652"
+       cy="11.316628"
+       fx="444.33652"
+       fy="11.316628"
+       r="8.53125"
+       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
+       gradientUnits="userSpaceOnUse" />
     <filter
-       id="filter5009"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter5009">
       <feFlood
-         id="feFlood4999"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4999" />
       <feComposite
-         id="feComposite5001"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite5001" />
       <feGaussianBlur
-         id="feGaussianBlur5003"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur5003" />
       <feOffset
-         id="feOffset5005"
-         result="offset"
+         dx="0"
          dy="0"
-         dx="0" />
+         result="offset"
+         id="feOffset5005" />
       <feComposite
-         id="feComposite5007"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite5007" />
     </filter>
     <radialGradient
-       r="7.9746099"
-       fy="9"
-       fx="134.97461"
-       cy="9"
-       cx="134.97461"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4747"
        id="radialGradient4710"
-       xlink:href="#linearGradient4747" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
     <linearGradient
        id="linearGradient4747">
       <stop
-         id="stop4743"
+         style="stop-color:#c5b631;stop-opacity:1"
          offset="0"
-         style="stop-color:#c5b631;stop-opacity:1" />
+         id="stop4743" />
       <stop
-         id="stop4745"
+         style="stop-color:#baad3e;stop-opacity:1"
          offset="1"
-         style="stop-color:#baad3e;stop-opacity:1" />
+         id="stop4745" />
     </linearGradient>
     <filter
-       id="filter4729"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4729">
       <feFlood
-         id="feFlood4719"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4719" />
       <feComposite
-         id="feComposite4721"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4721" />
       <feGaussianBlur
-         id="feGaussianBlur4723"
-         result="blur"
+         in="composite1"
          stdDeviation="1"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4723" />
       <feOffset
-         id="feOffset4725"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4725" />
       <feComposite
-         id="feComposite4727"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4727" />
     </filter>
     <radialGradient
-       r="7.9746099"
-       fy="9.0947113"
-       fx="132.6468"
-       cy="9.0947113"
-       cx="132.6468"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5037"
        id="radialGradient4712"
-       xlink:href="#linearGradient5037" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="132.6468"
+       cy="9.0947113"
+       fx="132.6468"
+       fy="9.0947113"
+       r="7.9746099" />
     <filter
-       id="filter4774"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4774">
       <feFlood
-         id="feFlood4764"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4764" />
       <feComposite
-         id="feComposite4766"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4766" />
       <feGaussianBlur
-         id="feGaussianBlur4768"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4768" />
       <feOffset
-         id="feOffset4770"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4770" />
       <feComposite
-         id="feComposite4772"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4772" />
     </filter>
     <radialGradient
-       r="7.9746099"
-       fy="9"
-       fx="134.97461"
-       cy="9"
-       cx="134.97461"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4747"
        id="radialGradient4714"
-       xlink:href="#linearGradient4747" />
-    <radialGradient
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,28.000001,0,-310.09784)"
-       r="0.31640625"
-       fy="11.485105"
-       fx="166.37157"
-       cy="11.485105"
-       cx="166.37157"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
        id="radialGradient4750"
-       xlink:href="#linearGradient4707" />
+       cx="166.37157"
+       cy="11.485105"
+       fx="166.37157"
+       fy="11.485105"
+       r="0.31640625"
+       gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
-       r="8.3726959"
-       fy="16.659737"
-       fx="125.30523"
-       cy="16.659737"
-       cx="125.30523"
+       xlink:href="#linearGradient4832"
        id="radialGradient4709-1"
-       xlink:href="#linearGradient4832" />
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient4832">
       <stop
-         style="stop-color:#22e23d;stop-opacity:1"
+         id="stop5029"
          offset="0"
-         id="stop5029" />
+         style="stop-color:#22e23d;stop-opacity:1" />
       <stop
-         style="stop-color:#38a748;stop-opacity:1"
+         id="stop4830"
          offset="1"
-         id="stop4830" />
+         style="stop-color:#38a748;stop-opacity:1" />
     </linearGradient>
     <filter
-       id="filter4844"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       id="filter4844">
       <feFlood
-         id="feFlood4834"
-         result="flood"
+         flood-opacity="0.498039"
          flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
+         result="flood"
+         id="feFlood4834" />
       <feComposite
-         id="feComposite4836"
-         result="composite1"
-         operator="out"
+         in="flood"
          in2="SourceGraphic"
-         in="flood" />
+         operator="out"
+         result="composite1"
+         id="feComposite4836" />
       <feGaussianBlur
-         id="feGaussianBlur4838"
-         result="blur"
+         in="composite1"
          stdDeviation="0.5"
-         in="composite1" />
+         result="blur"
+         id="feGaussianBlur4838" />
       <feOffset
-         id="feOffset4840"
-         result="offset"
+         dx="2.77556e-017"
          dy="0"
-         dx="2.77556e-017" />
+         result="offset"
+         id="feOffset4840" />
       <feComposite
-         id="feComposite4842"
-         result="composite2"
-         operator="atop"
+         in="offset"
          in2="SourceGraphic"
-         in="offset" />
+         operator="atop"
+         result="composite2"
+         id="feComposite4842" />
     </filter>
   </defs>
   <g
-     id="layer1">
+     id="g7757">
     <path
-       id="path4"
-       d="m 17.311578,13.702319 h -5.76 l 2.28,2.28 c 0.6,0.6 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 l -6.4800001,-6.6 c -0.12,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.16,2.1599999 h 5.76 c 0.72,0 1.2,0.48 1.2,1.2000001 v 2.399999 c 0,0.72 -0.48,1.2 -1.2,1.2 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4669);fill-opacity:1;stroke-width:1;filter:url(#filter4701)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z"
+       id="path4" />
     <path
-       d="m 19.271765,37.987692 h -7.987059 l 3.607059,3.507571 c 0.515294,0.50108 0.644117,1.377974 0.257648,1.753785 l -1.545884,1.503245 C 13.217059,45.128104 12.315294,45.128104 11.8,44.501752 L 3.5552941,36.609718 c 0,0 -0.5152941,-0.626352 -0.5152941,-1.127434 0,-0.501081 0.5152941,-1.002163 0.5152941,-1.002163 L 11.8,26.462816 c 0.515294,-0.50108 1.417059,-0.626351 1.803529,-0.25054 l 1.545884,1.503245 c 0.386469,0.375811 0.386469,1.252704 -0.257648,1.753785 l -3.478236,3.50757 h 7.858236 c 0.772941,0 1.288236,0.501082 1.288236,1.252705 v 2.505407 c 0,0.751622 -0.515295,1.252704 -1.288236,1.252704 z"
-       id="path4154"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4637);fill-opacity:1;stroke-width:1;filter:url(#filter4661)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4154"
+       d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" />
     <path
-       d="m 26.86,12.501265 v -2.4 c 0,-0.7200003 0.48,-1.2000003 1.2,-1.2000003 h 5.76 L 31.66,6.7412646 c -0.6,-0.5999999 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 l 2.28,-2.16 h -5.76 c -0.72,0 -1.2,-0.48 -1.2,-1.2 z"
-       id="path4165"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4677);fill-opacity:1;stroke-width:1;filter:url(#filter4689)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4165"
+       d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" />
     <path
-       d="m 64.48,6.6012647 -5.039999,5.0400003 5.039999,5.04 -2.519999,2.52 -5.16,-4.92 -5.04,5.04 -2.52,-2.52 5.04,-5.16 -5.16,-5.0400003 2.52,-2.5200001 5.16,5.04 5.04,-5.04 z"
-       id="path4176"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4605);fill-opacity:1;stroke-width:1;filter:url(#filter4629)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4176"
+       d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" />
     <path
-       d="m 87.000001,11.301265 h -8.4 l 3.36,-3.3600004 c -0.84,-0.6 -1.68,-0.84 -2.76,-0.84 -2.64,0 -4.8,2.1600001 -4.8,4.8000004 0,2.64 2.16,4.8 4.8,4.8 1.68,0 3.24,-0.84 4.08,-2.28 l 2.76,1.2 c -1.32,2.4 -3.84,4.08 -6.84,4.08 -4.32,0 -7.8,-3.48 -7.8,-7.8 0,-4.3200004 3.48,-7.8000004 7.8,-7.8000004 1.8,0 3.48,0.6 4.92,1.6800001 l 2.88,-2.8800001 z"
-       id="path4187"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4525);fill-opacity:1;stroke-width:1;filter:url(#filter4597)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4187"
+       d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" />
     <path
-       id="path4209"
-       d="M 102.59961,2.7011715 93,11.101561 h 2.400391 l 1.242188,-0.03516 -0.04297,0.03516 v 8.400392 h 4.800781 v -6.000001 h 2.40039 v 6.000001 h 4.79884 v -8.400392 l -0.043,-0.03516 1.24415,0.03516 h 2.39843 z"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4529);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z"
+       id="path4209" />
     <path
-       d="m 133.15407,12.421265 -6.72001,6.6 c -0.24,0.36 -0.72,0.48 -1.2,0.48 -0.48,0 -0.96,-0.12 -1.32,-0.48 l -6.72,-6.6 c -0.6,-0.72 -0.48,-1.32 0.48,-1.32 h 3.96 V 3.9012646 c 0,-0.72 0.48,-1.2 1.2,-1.2 h 4.8 c 0.72,0 1.2,0.48 1.2,1.2 v 7.2000004 h 3.84 c 0.96001,0 1.20001,0.6 0.48001,1.32 z"
-       id="path4214"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4709);fill-opacity:1;stroke-width:1;filter:url(#filter4721)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4214"
+       d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" />
     <path
-       d="m 148,19.881265 c -4.8,0 -8.64,-3.84 -8.64,-8.64 0,-4.6800004 3.84,-8.5200004 8.64,-8.5200004 4.8,0 8.64001,3.84 8.64001,8.6400004 0,4.68 -3.84001,8.52 -8.64001,8.52 z m 0,-14.5200003 c -3.36,0 -6,2.6399999 -6,6.0000003 0,3.24 2.64,6 6,6 3.36,0 6.00001,-2.64 6.00001,-6 0,-3.3600004 -2.64001,-6.0000003 -6.00001,-6.0000003 z m -0.36,7.0800003 c -0.48,-0.12 -0.84,-0.6 -0.84,-1.08 V 7.7612646 c 0,-0.72 0.48,-1.2 1.2,-1.2 0.72,0 1.2,0.48 1.2,1.2 v 3.3600004 c 1.32,1.32 2.4,3.84 2.4,3.84 0,0 -2.64,-1.2 -3.96,-2.52 z"
-       id="path4225"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4729);fill-opacity:1;stroke-width:1;filter:url(#filter4741)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4225"
+       d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" />
     <path
-       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z"
+       style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529"
        id="path4355"
-       style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529" />
+       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" />
     <path
-       d="m 202,17.101265 h -2.4 l 1.2,2.4 h -14.39999 l 1.2,-2.4 h -2.4 c -0.72,0 -1.2,-0.48 -1.2,-1.2 V 9.9012647 c 0,-0.7200001 0.48,-1.2000001 1.2,-1.2000001 h 1.2 V 6.3012647 c 0,-0.7200001 0.48,-1.2000001 1.2,-1.2000001 v -1.2 c 0,-0.72 0.48,-1.2 1.2,-1.2 H 198.4 c 0.72,0 1.2,0.48 1.2,1.2 v 1.2 c 0.72,0 1.2,0.48 1.2,1.2000001 v 2.3999999 h 1.2 c 0.72,0 1.2,0.48 1.2,1.2000001 v 6.0000003 c 0,0.72 -0.48,1.2 -1.2,1.2 z m -14.39999,0 0.6,-1.2 h -0.6 z m 0.6,-6 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z M 198.4,5.1012646 c 0,-0.72 -0.48,-1.2 -1.2,-1.2 h -7.19999 c -0.72,0 -1.2,0.48 -1.2,1.2 v 3.6 c 0,0.7200001 0.48,1.2000001 1.2,1.2000001 H 197.2 c 0.72,0 1.2,-0.48 1.2,-1.2000001 z m -1.08,10.8000004 h -7.43999 l -1.08,2.4 H 198.4 Z m 2.28,0 H 199 l 0.6,1.2 z"
-       id="path4366"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4793);fill-opacity:1;stroke-width:1;filter:url(#filter4805)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4366"
+       d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-10e-8 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" />
     <path
-       d="m 247,19.501265 h -15.6 c -0.96,0 -1.8,-0.84 -1.8,-1.8 V 4.5012646 c 0,-0.9599999 0.84,-1.8 1.8,-1.8 H 247 c 0.96,0 1.8,0.8400001 1.8,1.8 V 17.701265 c 0,0.96 -0.84,1.8 -1.8,1.8 z M 239.8,3.9012646 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.28,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.6,4.8 c 0,-0.72 -0.48,-1.1999999 -1.2,-1.1999999 h -12 c -0.72,0 -1.2,0.4799999 -1.2,1.1999999 v 7.2000004 c 0,0.72 0.48,1.2 1.2,1.2 h 12 c 0.72,0 1.2,-0.48 1.2,-1.2 z"
-       id="path4388"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4833);fill-opacity:1;stroke-width:1;filter:url(#filter4853)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
-    <text
-       transform="scale(0.98484982,1.0153832)"
-       id="text4409"
-       y="12.608931"
-       x="188.06316"
+       id="path4388"
+       d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" />
+    <g
+       aria-label="+"
+       transform="scale(0.98484984,1.0153832)"
        style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
+       id="text4409">
+      <path
+         d="m 194.95358,9.8484986 h -2.03077 v 1.9696994 h -1.01538 V 9.8484986 h -2.03077 V 8.8636487 h 2.03077 V 6.893949 h 1.01538 v 1.9696997 h 2.03077 z"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient4841);fill-opacity:1;stroke-width:0.79274535px"
-         y="12.608931"
-         x="188.06316"
-         id="tspan4411">+</tspan></text>
+         id="path7725" />
+    </g>
     <path
-       style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)"
-       id="path6182"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        d="m 467.25784,24.196945 c -0.36562,0 -0.73125,0.24375 -0.975,0.853125 l -2.4375,4.996876 -5.24062,0.853125 c -1.21875,0.24375 -1.4625,1.096875 -0.60938,1.95 l 3.77813,4.021875 -0.85313,5.60625 c -0.12181,0.73125 0.24375,1.21875 0.85313,1.21875 0.24375,0 0.4875,-0.121875 0.73125,-0.24375 l 4.75312,-2.559375 4.75313,2.559375 c 0.24375,0.121875 0.60937,0.24375 0.73125,0.24375 0.60937,0 0.975,-0.4875 0.85312,-1.340625 l -0.85312,-5.60625 3.77812,-4.021875 c 0.85313,-0.853125 0.4875,-1.70625 -0.60937,-1.95 l -5.24063,-0.853125 -2.4375,-4.996876 c -0.24375,-0.4875 -0.60937,-0.73125 -0.975,-0.73125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path6182"
+       style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" />
     <path
-       style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 226.66131,15.091518 -0.0388,3.707848 c -0.007,0.673061 -0.5177,1.245488 -1.19079,1.24654 l -17.77799,0.02779 c -0.6731,0.0011 -1.2416,-0.573462 -1.24671,-1.24654 l -0.028,-3.688049 c -0.005,-0.673078 0.6302,-1.305219 1.30331,-1.305219 1.26531,-1.257631 1.03718,-3.269047 1.26531,-5.0305225 0.4278,-2.8226251 0.0953,-6.2244545 3.80878,-6.2479747 l 7.52682,-0.047673 c 3.73297,-0.023644 3.4173,3.4730226 3.84751,6.2956477 0.41438,2.7153765 0,3.7728915 1.26526,5.0305225 0.70548,0 1.26526,0.515815 1.26526,1.25763 z m -7.68106,-4.410561 h -1.82811 V 8.8528316 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281254 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
        id="path7318"
-       d="m 226.73438,15.945016 v 2.437501 c 0,0.673097 -0.54566,1.21875 -1.21875,1.21875 h -18.28124 c -0.67311,0 -1.21875,-0.545653 -1.21875,-1.21875 v -2.437501 c 0,-0.673097 0.54564,-1.21875 1.21875,-1.21875 h -1.04571 c 2.80313,0 2.36053,-3.256168 2.77368,-5.9703239 0.4278,-2.8226251 0.1927,-6.1069689 3.90598,-6.0616014 l 7.47091,0.091277 c 3.73276,0.045605 3.22143,3.1476992 3.65164,5.9703243 0.41438,2.715376 -0.20346,5.970324 2.60942,5.970324 h -1.08468 c 0.67309,0 1.21875,0.545653 1.21875,1.21875 z m -7.92188,-4.874999 h -1.82811 V 9.2418912 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281258 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" />
     <path
-       style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)"
-       id="path7886"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        d="m 269.02823,19.939154 c -0.975,0 -1.82813,-0.24375 -2.80313,-1.584375 -0.975,-1.340625 -2.07187,-3.046875 -2.07187,-3.046875 0,0 -0.85313,-1.096875 -1.34063,-1.95 -0.60937,-0.853125 -1.34062,-0.609375 -1.34062,-0.609375 0,0 -3.53438,-5.7281239 -4.14375,-6.581249 -0.73125,-1.21875 0.73125,-3.290625 0.73125,-3.290625 l 5.3625,8.531249 c 0,0 1.70625,2.315625 2.31562,2.803125 0.60938,0.4875 1.70625,-0.4875 3.4125,1.096875 2.31563,2.19375 1.58438,4.63125 -0.12181,4.63125 z m -0.36563,-3.534375 c -1.09687,-1.21875 -2.07187,-1.096875 -2.31562,-0.73125 -0.24375,0.365625 0,1.4625 0.4875,2.071875 0.4875,0.609375 0.975,0.853125 1.70625,0.853125 0.73125,0.121875 1.34062,-0.853125 0.1218,-2.19375 z m -4.63125,-5.728124 -1.4625,-2.19375 3.53438,-5.60625 c 0,0 1.4625,2.071875 0.73125,3.290625 -0.36563,0.4875001 -1.70625,2.803125 -2.80313,4.509375 z m -5.60625,3.534374 c 0.36563,-0.365625 1.21875,-1.340625 1.70625,-2.071875 l 0.975,1.4625 c -0.4875,0.73125 -1.09687,1.70625 -1.09687,1.70625 0,0 -1.09688,1.70625 -2.07188,3.046875 -0.85312,1.340625 -1.70625,1.584375 -2.80312,1.584375 -1.70625,0 -2.55938,-2.4375 -0.12181,-4.63125 1.70625,-1.4625 2.80312,-0.609375 3.4125,-1.096875 z m -2.925,2.19375 c -1.09687,1.21875 -0.4875,2.19375 0.24375,2.19375 0.73125,0 1.21875,-0.24375 1.70625,-0.853125 0.4875,-0.609375 0.73125,-1.828125 0.4875,-2.071875 -0.36562,-0.365625 -1.34062,-0.4875 -2.4375,0.73125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path7886"
+       style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" />
     <path
-       style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 292.45286,20.11787 -7.56413,0 c -0.73125,0 -1.32549,-0.515308 -1.33058,-1.24654 l -0.028,-4.017519 v -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 l 6.44059,0.00442 2.53052,2.515261 0.0354,8.810334 c 0.003,0.731244 -0.57138,1.24654 -1.30263,1.24654 z M 289.62394,8.7600607 v 2.4375003 h 2.4375 z m -7.3125,-0.6736655 0.0213,0.7169703 v 2.5152615 3.772891 l -5.06403,0.04019 c -0.73123,0.0058 -1.21672,-0.598663 -1.21875,-1.32991 l -0.028,-10.0556901 c -0.002,-0.7312471 0.4875,-1.21875 1.21875,-1.21875 h 6.09375 l 2.79402,2.5031129 v 1.81343 h -2.53052 c -0.67317,-0.017075 -1.31624,0.241688 -1.28654,1.2424914 z m 0.0213,-4.7304016 v 2.4596813 l 2.53052,-0.02779 z"
        id="path8454"
-       d="m 292.00552,19.7566 h -7.3125 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 v -3.656249 -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 0,0 3.9,0 6.09375,0 0,0 2.4375,2.4375003 2.4375,2.4375003 0,2.68125 0,8.531249 0,8.531249 0,0.73125 -0.4875,1.21875 -1.21875,1.21875 z m -2.4375,-10.9687493 v 2.4375003 h 2.4375 z m -7.3125,-1.3406249 v 1.3406249 2.3156253 3.778125 h -4.875 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 V 3.9128507 c 0,-0.7312499 0.4875,-1.21875 1.21875,-1.21875 0,0 3.9,0 6.09375,0 0,0 2.4375,2.4375 2.4375,2.4375 0,0.4875 0,0.9750001 0,1.5843751 h -3.04688 c -0.36562,0.121875 -0.60937,0.365625 -0.60937,0.73125 z m 0,-3.5343751 v 2.4375001 h 2.4375 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" />
     <path
-       style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 312.76384,20.20124 -10.1808,-0.02779 c -0.75126,-0.0021 -1.21143,-0.547743 -1.21303,-1.272325 l -0.028,-12.6083588 c -0.002,-0.9749978 0.29395,-1.2762443 1.26895,-1.2723257 l 2.49639,0.010033 c 0,0 0.0587,-2.5309032 2.49616,-2.5309032 2.4375,0 2.56487,2.5309032 2.56487,2.5309032 l 2.48359,0.017757 c 0.97497,0.00697 1.35938,0.3251372 1.35283,1.3001156 l -0.0839,12.4971989 c -0.005,0.808245 -0.51762,1.35744 -1.15713,1.355695 z m -1.86968,-13.8508896 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.47079,1.1953846 h 7.59155 z m 0.53952,2.4530151 h -6.32629 l -2.53052,2.5152615 2.53052,5.030522 7.59155,-5.030522 z"
        id="path9022"
-       d="m 311.86917,19.7566 h -8.53125 c -0.97501,0 -1.82812,-0.853125 -1.82812,-1.828124 V 6.9597255 c 0,-0.9750001 0.85311,-1.8281251 1.82812,-1.8281251 h 1.82813 c 0,0 0,-2.4375 2.4375,-2.4375 2.4375,0 2.4375,2.4375 2.4375,2.4375 h 1.82812 c 0.975,0 1.82813,0.853125 1.82813,1.8281251 V 17.928476 c 0,0.974999 -0.85313,1.828124 -1.82813,1.828124 z m -0.97501,-13.4062496 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.60937,1.2187501 h 3.04687 3.9 0.975 z m 0.12182,2.071875 h -5.72812 l -3.65625,2.0718756 3.4125,5.971875 8.04375,-4.63125 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" />
     <path
-       style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="M 335.47361,15.091518 V 7.545735 l 3.79578,3.772892 z m -8.85681,1.257631 h 7.59155 l -3.79578,3.772892 z m 6.32629,-1.257631 h -5.06103 c -0.73124,-0.0041 -1.26114,-0.526392 -1.26526,-1.25763 V 8.8033655 c -0.004,-0.7312386 0.53401,-1.2576305 1.26526,-1.2576305 h 5.06103 c 0.73125,0 1.26526,0.5263804 1.26526,1.2576305 v 5.0305225 c 0,0.609375 -0.53402,1.261705 -1.26526,1.25763 z m 0,-3.772891 c 0,-0.73125 -0.53401,-1.257631 -1.26526,-1.257631 h -2.53052 c -0.73125,0 -1.26525,0.526381 -1.26525,1.257631 v 1.25763 c 0,0.73125 0.534,1.257631 1.26525,1.257631 h 2.53052 c 0.73125,0 1.26526,-0.526381 1.26526,-1.257631 z m -2.53052,-8.8034143 3.79578,3.7728917 h -7.59155 z m -5.06103,5.0305223 v 7.545783 l -3.79578,-3.772891 z"
        id="path9590"
-       d="M 335.29779,14.881601 V 7.5691009 l 3.65625,3.6562501 z m -8.53125,1.21875 h 7.3125 l -3.65625,3.656249 z m 6.09375,-1.21875 h -4.875 c -0.73125,0 -1.21875,-0.4875 -1.21875,-1.21875 v -4.875 c 0,-0.7312501 0.4875,-1.2187501 1.21875,-1.2187501 h 4.875 c 0.73125,0 1.21875,0.4875 1.21875,1.2187501 v 4.875 c 0,0.609375 -0.4875,1.21875 -1.21875,1.21875 z m 0,-3.65625 c 0,-0.73125 -0.4875,-1.21875 -1.21875,-1.21875 h -2.4375 c -0.73125,0 -1.21875,0.4875 -1.21875,1.21875 v 1.21875 c 0,0.73125 0.4875,1.21875 1.21875,1.21875 h 2.4375 c 0.73125,0 1.21875,-0.4875 1.21875,-1.21875 z m -2.4375,-8.5312501 3.65625,3.6562501 h -7.3125 z m -4.875,4.875 v 7.3125001 l -3.65625,-3.65625 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" />
     <path
-       style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839"
+       d="m 274,8 h 10 v 2 h -10 z"
        id="path10158"
-       d="m 274.15498,8.0293266 h 9.6324 v 1.9381685 h -9.6324 z" />
+       style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839" />
     <path
-       style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839"
+       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
        id="path10726"
-       d="m 301.82263,10.040073 h -3.85298 v 3.876338 h -1.92648 v -3.876338 h -3.85298 V 8.1019059 h 3.85298 V 4.2255681 h 1.92648 v 3.8763378 h 3.85298 z" />
+       style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839" />
     <path
-       style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 406.82037,12.583531 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 l -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.071875 -0.73125,-2.8031253 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437504 z m -8.53125,-2.4375 c 0,0 -1.34061,-1.8281254 -1.95,-2.4375004 -1.70625,0.853125 -2.68125,2.4375004 -2.68125,4.1437504 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531253 0.36561,-1.7062504 0.60936,-2.4375004 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250004 -1.4625,6.8250004 z"
        id="path11294"
-       d="m 407.09514,12.361211 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 0,0 -0.12181,-0.121875 -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.0718751 -0.73125,-2.8031251 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437502 z m -8.53125,-2.4375001 c 0,0 -1.34061,-1.8281251 -1.95,-2.4375001 -1.70625,0.853125 -2.68125,2.4375001 -2.68125,4.1437502 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531251 0.36561,-1.7062502 0.60936,-2.4375002 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250001 -1.4625,6.8250001 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" />
     <path
-       style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 429.73975,20.187746 -2.55504,0.05558 c -0.48738,0.0106 -0.61242,-0.769541 -0.61242,-1.378916 0,0 0.31966,-4.276424 -3.79578,-8.803414 -3.20233,-3.5225593 -8.85682,-3.7728916 -8.85682,-3.7728916 -0.60938,0 -1.26177,-0.171597 -1.25602,-0.6590635 l 0.028,-2.3732094 c 0.006,-0.4874666 0.61868,-0.7406188 1.22806,-0.7406188 0,0 7.05132,0.3003217 11.38734,5.0305223 3.72704,4.065871 5.06103,11.318675 5.06103,11.318675 0,0.4875 -0.0191,1.310083 -0.62831,1.323336 z M 413.91969,8.8033655 c 0,0 4.48239,0.7421569 7.0114,3.0905195 2.59016,2.40515 3.11068,6.970525 3.11068,6.970525 0,0.4875 -0.7448,1.278471 -1.23236,1.278471 h -1.35283 c -0.4875,0 -1.21059,-0.669096 -1.21059,-1.278471 0,0 0.4472,-2.304652 -1.91012,-4.45401 -1.78736,-1.629677 -4.41618,-1.834143 -4.41618,-1.834143 -0.60938,0 -1.23946,-0.793663 -1.22806,-1.281032 l 0.028,-1.195314 c 0.0114,-0.4873685 0.59073,-1.2965455 1.20011,-1.2965455 z m 1.20944,6.3426395 c 1.34062,0 2.54933,1.124665 2.54933,2.46529 0,1.340626 -1.09688,2.576451 -2.4375,2.576451 -1.34063,0 -2.54933,-1.208035 -2.54933,-2.548661 0,-1.340625 1.09687,-2.49308 2.4375,-2.49308 z"
        id="path11862"
-       d="m 429.01283,20.243326 h -1.82812 c -0.4875,0 -0.975,-0.365625 -0.975,-0.975 0,0 0.36562,-4.387501 -3.9,-8.775 -3.04688,-3.6562503 -8.53125,-3.9000003 -8.53125,-3.9000003 -0.60938,0 -0.975,-0.365625 -0.975,-0.8531249 V 4.0339507 c 0,-0.4875 0.36562,-0.853125 0.975,-0.853125 0,0 7.67812,0.4875 11.7,5.4843751 4.02187,3.7781242 4.3875,10.7250002 4.3875,10.7250002 0,0.4875 -0.24375,0.853125 -0.85313,0.853125 z M 413.77846,9.2745758 c 0,0 4.50937,0.609375 7.06875,2.9249992 2.55937,2.4375 3.04687,7.190626 3.04687,7.190626 0,0.4875 -0.12181,0.975 -0.60937,0.975 h -1.82813 c -0.4875,0 -0.73125,-0.365625 -0.73125,-0.975 0,0 0.12181,-2.925001 -2.19375,-5.118751 -1.82812,-1.584375 -4.75312,-1.70625 -4.75312,-1.70625 -0.60938,0 -0.975,-0.365625 -0.975,-0.853125 v -1.584374 c 0,-0.4875002 0.36562,-0.8531252 0.975,-0.8531252 z m 1.4625,6.0937492 c 1.34062,0 2.4375,1.096875 2.4375,2.4375 0,1.340626 -1.09688,2.437501 -2.4375,2.437501 -1.34063,0 -2.4375,-1.096875 -2.4375,-2.437501 0,-1.340625 1.09687,-2.4375 2.4375,-2.4375 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" />
     <path
-       style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 448.08169,13.833888 v 2.515261 c 0,0.975 -0.41214,1.257631 -1.26525,1.257631 h -10.12208 c -0.85314,0 -1.26526,-0.282631 -1.26526,-1.257631 V 6.2881044 c 0,-0.9750001 0.41212,-1.2576306 1.26526,-1.2576306 h 10.12208 c 0.85311,0 1.26525,0.2826305 1.26525,1.2576306 v 2.5152611 l 5.06104,-2.5152611 V 16.349149 Z"
        id="path12430"
-       d="m 451.64901,16.435377 -3.65625,-3.290625 v 2.559375 c 0,0.975 -0.73125,1.70625 -1.58436,1.70625 h -9.01875 c -0.85314,0 -1.58439,-0.73125 -1.58439,-1.70625 V 6.9291285 c 0,-0.9750001 0.73125,-1.7062501 1.58439,-1.7062501 h 9.01875 c 0.85311,0 1.58436,0.73125 1.58436,1.7062501 v 2.437499 l 3.65625,-3.2906241 c 0.36564,-0.365625 0.73125,-0.4875 1.21875,-0.365625 V 16.801002 c -0.36561,0.121875 -0.85311,0 -1.21875,-0.365625 z"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" />
     <g
-       id="g4779"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)">
+       id="g4779">
       <path
-         style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)"
-         d="M 165.73984,2.6257296 V 20.34448 h 9.42792 0.69708 2.46698 c 1.25518,-0.32709 2.23657,-1.314095 2.53125,-2.53125 v -2.53125 -7.5937504 -2.53125 c -0.29468,-1.2171559 -1.27607,-2.2041601 -2.53125,-2.53125 h -2.07148 -1.09258 z m 7.73958,3.0577697 1.33485,2.2420349 c 0,0 0.36967,0.6174141 0.65753,0.813263 0.26974,0.1834496 0.93438,0.2892151 0.93438,0.2892151 h 2.72901 l -1.89596,3.0800167 c 0,0 -0.27577,0.604831 -0.41281,0.907196 -0.20593,0.452534 0.006,1.243536 0.0742,1.982484 0.10732,1.162403 0.19033,2.286529 0.19033,2.286529 l -2.21484,-1.132141 c 0,0 -0.90763,-0.426918 -1.39416,-0.427644 -0.5721,0 -1.64383,0.496858 -1.64383,0.496858 l -2.2198,1.065398 c 0,0 0.16319,-1.013778 0.33866,-2.128325 0.11606,-0.733074 0.43611,-1.567458 0.17798,-2.071473 -0.13995,-0.274086 -0.42023,-0.820679 -0.42023,-0.820679 L 167.532,9.0996981 h 2.71169 c 0,0 0.88228,-0.06226 1.24339,-0.2892151 0.27408,-0.1711231 0.61056,-0.7539368 0.61056,-0.7539368 z"
-         id="bookmarks-star-4" />
+         id="bookmarks-star-4"
+         d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z"
+         style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" />
       <path
-         style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)"
-         d="m 163.20859,2.6257296 c -1.25519,0.3270899 -2.23658,1.3140942 -2.53125,2.53125 v 2.53125 7.5937504 2.53125 c 0.29467,1.217155 1.27606,2.20416 2.53125,2.53125 h 3.16406 v -5.0625 -7.5937504 -5.0625 z"
-         id="bookmarks-overlay-1" />
+         id="bookmarks-overlay-1"
+         d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z"
+         style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" />
       <path
-         style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:0.6328125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 166.37156,2.6257296 V 20.34448"
-         id="bookmarks-divider-7" />
+         id="bookmarks-divider-7"
+         d="M 165.92886,2.5152127 V 20.122041"
+         style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <path
-       d="m 133.26971,34.690626 -6.72001,6.6 c -0.24,0.36 -0.72,0.48 -1.2,0.48 -0.48,0 -0.96,-0.12 -1.32,-0.48 l -6.72,-6.6 c -0.6,-0.72 -0.48,-1.32 0.48,-1.32 h 3.96 v -7.200001 c 0,-0.72 0.48,-1.2 1.2,-1.2 h 4.8 c 0.72,0 1.2,0.48 1.2,1.2 v 7.200001 h 3.84 c 0.96001,0 1.20001,0.6 0.48001,1.32 z"
-       id="path4214-3"
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
        style="display:inline;fill:url(#radialGradient4709-1);fill-opacity:1;stroke-width:1;filter:url(#filter4844)"
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" />
+       id="path4214-3"
+       d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" />
   </g>
 </svg>
diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css
index f921554df..56a8318da 100644
--- a/application/palemoon/themes/windows/browser.css
+++ b/application/palemoon/themes/windows/browser.css
@@ -39,9 +39,9 @@
   --toolbarbutton-border-radius: 2.5px;
   --toolbarbutton-border-color: hsla(210,54%,20%,.2);
 
-  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
-  --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.svg");
-  --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg");
+  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
+  --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.png");
+  --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png");
 
   --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2));
   --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2));
@@ -52,6 +52,15 @@
   --window-text-color: currentColor;
 }
 
+/* Use SVG for HiDPI 133%+ */
+@media (min-resolution: 1.33dppx) {
+  :root {
+    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+    --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.svg");
+    --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg");
+  }
+}
+
 :root:-moz-lwtheme-brighttext {
   --toolbar-highlight-top: rgba(32,32,32,.8);
   --toolbar-highlight-bottom: rgba(32,32,32,0);
@@ -2041,9 +2050,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-sound[soundplaying],
-#TabsToolbar[brighttext] .tab-icon-sound[blocked],
-#TabsToolbar[brighttext] .tab-icon-sound[muted] {
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked],
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] {
   filter: invert(1);
 }
 
@@ -2087,17 +2096,17 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
 .tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
 }
 
-#TabsToolbar[brighttext] .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
+#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
 .tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked");
 }
diff --git a/application/palemoon/themes/windows/downloads/download-glow.png b/application/palemoon/themes/windows/downloads/download-glow.png
deleted file mode 100644
index 53182d7a4..000000000
--- a/application/palemoon/themes/windows/downloads/download-glow.png
+++ /dev/null
diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index 8a00d8b70..604466c9f 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -60,6 +60,9 @@ browser.jar:
   skin/classic/browser/Secure24.png
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar-glass.png
+  skin/classic/browser/Toolbar-inverted.png
   skin/classic/browser/Toolbar.svg
   skin/classic/browser/Toolbar-glass.svg
   skin/classic/browser/Toolbar-inverted.svg
diff --git a/application/palemoon/themes/windows/places/organizer.css b/application/palemoon/themes/windows/places/organizer.css
index 16a0ab09c..45851d0da 100644
--- a/application/palemoon/themes/windows/places/organizer.css
+++ b/application/palemoon/themes/windows/places/organizer.css
@@ -8,6 +8,13 @@
   --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
 }
 
+/* Use SVG for HiDPI 133%+ */
+@media (min-resolution: 1.33dppx) {
+  :root {
+    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+  }
+}
+
 /* Toolbar */
 #placesToolbar {
   padding: 3px;
diff --git a/application/palemoon/themes/windows/statusbar/overlay.css b/application/palemoon/themes/windows/statusbar/overlay.css
index 77e8d8732..7f9a5982f 100644
--- a/application/palemoon/themes/windows/statusbar/overlay.css
+++ b/application/palemoon/themes/windows/statusbar/overlay.css
@@ -53,7 +53,7 @@ toolbar[brighttext] #status4evar-download-button #status4evar-download-icon
 
 #status4evar-download-button[attention] #status4evar-download-icon
 {
-	background-image: url("chrome://browser/skin/downloads/download-glow.png");
+	background: -moz-image-rect(var(--toolbarbutton-glass-image), 19, 108, 36, 90) center no-repeat;
 }
 
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label