update to 41.0b2

36 files changed, 345 insertions, 573 deletions

diff --git a/arc-firefox-theme/chrome/global/aboutSupport.css b/arc-firefox-theme/chrome/global/aboutSupport.css
index 71ef7a7..61f5305 100644
--- a/arc-firefox-theme/chrome/global/aboutSupport.css
+++ b/arc-firefox-theme/chrome/global/aboutSupport.css
@@ -3,15 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 html {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  font: message-box;
+  --aboutSupport-table-background: #ebebeb;
+  background-color: var(--in-content-page-background);
 }
 
 body {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
+  margin: 40px 48px;
 }
 
 .page-subtitle {
@@ -26,19 +23,24 @@ body {
   font-weight: bold;
 }
 
+button {
+  -moz-margin-start: 0;
+  -moz-margin-end: 8px;
+}
+
 table {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
+  background-color: var(--aboutSupport-table-background);
+  color: var(--in-content-text-color);
   font: message-box;
   text-align: start;
   width: 100%;
-  border: 1px solid ThreeDShadow;
+  border: 1px solid var(--in-content-border-color);
   border-spacing: 0px;
 }
 
 th, td {
-  border: 1px dotted ThreeDShadow;
-  padding: 3px;
+  border: 1px solid var(--in-content-border-color);
+  padding: 4px;
 }
 
 thead th {
@@ -47,8 +49,8 @@ thead th {
 
 th {
   text-align: start;
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
 }
 
 th.column {
@@ -58,7 +60,7 @@ th.column {
 
 td {
   text-align: start;
-  border-top: 1px dotted ThreeDShadow;
+  border-color: var(--in-content-table-border-dark-color);
 }
 
 .prefs-table {
@@ -79,9 +81,9 @@ td {
 }
 
 #action-box {
-  background-color: -moz-Dialog;
-  border: 1px solid ThreeDShadow;
-  color: -moz-DialogText;
+  background-color: var(--aboutSupport-table-background);
+  border: 1px solid var(--in-content-border-color);
+  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
diff --git a/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal-themed.svg b/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal-themed.svg
index 1939867..29e9c3d 100644
--- a/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal-themed.svg
+++ b/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal-themed.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="ThreeDShadow"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="ThreeDShadow"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="-moz-field"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal.svg b/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal.svg
index dae4639..40ffa25 100644
--- a/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal.svg
+++ b/arc-firefox-theme/chrome/global/arrow/panelarrow-horizontal.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="hsla(210,4%,10%,.2)"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="hsla(210,4%,10%,.2)"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="-moz-field"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical-themed.svg b/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical-themed.svg
index a2d3a95..0bd6073 100644
--- a/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical-themed.svg
+++ b/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical-themed.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="ThreeDShadow"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="ThreeDShadow"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="-moz-field"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical.svg b/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical.svg
index 4e559ed..8048693 100644
--- a/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical.svg
+++ b/arc-firefox-theme/chrome/global/arrow/panelarrow-vertical.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="hsla(210,4%,10%,.2)"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="-moz-field"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="hsla(210,4%,10%,.2)"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="-moz-field"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/icons/autocomplete-search.svg b/arc-firefox-theme/chrome/global/icons/autocomplete-search.svg
index 50c77a5..5da904d 100644
--- a/arc-firefox-theme/chrome/global/icons/autocomplete-search.svg
+++ b/arc-firefox-theme/chrome/global/icons/autocomplete-search.svg
@@ -2,32 +2,21 @@
 <!-- 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/. -->

-<svg xmlns="http://www.w3.org/2000/svg"

-     xmlns:xlink="http://www.w3.org/1999/xlink"

-     x="0px" y="0px"

-     viewBox="0 0 16 16"

-     enable-background="new 0 0 16 16"

-     xml:space="preserve">

-<style>

-  use:not(:target) {

-    display: none;

-  }

-

-  use {

-    fill: GrayText;

-  }

-

-  use[id$="-inverted"] {

-    fill: highlighttext;

-  }

-</style>

-<defs style="display:none">

-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947

-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283

-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001

-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352

-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>

-</defs>

-<use id="search-icon"             xlink:href="#search"/>

-<use id="search-icon-inverted"    xlink:href="#search"/>

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" >

+  <style>

+    use:not(:target) {

+      display: none;

+    }

+    use {

+      fill: GrayText;

+    }

+    use[id$="-inverted"] {

+      fill: highlighttext;

+    }

+  </style>

+  <defs>

+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>

+  </defs>

+  <use id="search-icon" xlink:href="#search"/>

+  <use id="search-icon-inverted" xlink:href="#search"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/icons/close.svg b/arc-firefox-theme/chrome/global/icons/close.svg
index 375a412..042ecbf 100644
--- a/arc-firefox-theme/chrome/global/icons/close.svg
+++ b/arc-firefox-theme/chrome/global/icons/close.svg
@@ -1,104 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-     id="icon-close"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px"
-     y="0px"
-     width="96px"
-     height="16px"
-     viewBox="0 0 96 16">
-
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96px" height="16px" viewBox="0 0 96 16">
   <defs>
-    <style type="text/css"><![CDATA[
+    <style>
       /* X Glyph Styles */
-
       .glyphShape-style-foreground {
         fill: ButtonText;
         fill-opacity: .8;
       }
-
       .glyphShape-style-background {
         fill: -moz-MenuBarText;
         fill-opacity: .8;
       }
-
       .glyphShape-style-hover {
         fill: #fff;
       }
-
       .glyphShape-style-hover-shadow {
         fill: #b32c12;
       }
-
       .glyphShape-style-hover-active {
         fill: #fff;
         fill-opacity: .8;
       }
-
       .glyphShape-style-hover-active-shadow {
         fill: #99260f;
       }
-
       .glyphShape-style-LWT-bright {
         fill: #fff;
         fill-opacity: .8;
       }
-
       .glyphShape-style-LWT-dark {
         fill: #000;
         fill-opacity: .8;
       }
-
-
       /* Close Button Background Styles */
-
       .icon-background-hover {
         fill: #d93616;
       }
-
       .icon-background-hover-active {
         fill: #b32c12;
       }
-      ]]></style>
-
+    </style>
     <polygon id="glyphShape-close" points="4,5.5 5.5,4 8,6.5 10.5,4 12,5.5 9.5,8 12,10.5 10.5,12 8,9.5 5.5,12 4,10.5 6.5,8"/>
     <polygon id="glyphShape-close-topHighlight" points="4,5.5 5.5,4 8,6.5 10.5,4 12,5.5 9.5,8 11.5,6 10.5,5 8,7.5 5.5,5 4.5,6"/>
-    <rect    id="glyphShape-background" x="2" y="2" rx="2" width="12" height="12"/>
-
+    <rect id="glyphShape-background" x="2" y="2" rx="2" width="12" height="12"/>
   </defs>
-
   <g id="icon-closeForeground-default">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-foreground" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-foreground" />
   </g>
-
   <g id="icon-close-hover" transform="translate(16)">
     <use xlink:href="#glyphShape-background" class="icon-background-hover" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-shadow" transform="translate(0,1)" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover" />
   </g>
-
   <g id="icon-close-hover-active" transform="translate(32)">
     <use xlink:href="#glyphShape-background" class="icon-background-hover-active" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-active-shadow" transform="translate(0,1)" />
     <use xlink:href="#glyphShape-close" class="glyphShape-style-hover-active" />
   </g>
-
   <g id="icon-closeBackground-default" transform="translate(48)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-background" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-background" />
   </g>
-
   <g id="icon-close-LWT-bright" transform="translate(64)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-LWT-bright" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-LWT-bright" />
   </g>
-
   <g id="icon-close-LWT-dark" transform="translate(80)">
     <use xlink:href="#glyphShape-close" class="glyphShape-style-LWT-dark" />
     <use xlink:href="#glyphShape-close-topHighlight" class="glyphShape-style-LWT-dark" />
   </g>
-
 </svg>
diff --git a/arc-firefox-theme/chrome/global/icons/panelarrow-horizontal.svg b/arc-firefox-theme/chrome/global/icons/panelarrow-horizontal.svg
index 6f794b7..1c4c6bc 100644
--- a/arc-firefox-theme/chrome/global/icons/panelarrow-horizontal.svg
+++ b/arc-firefox-theme/chrome/global/icons/panelarrow-horizontal.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,-0.2 L -0.2,10 10,20.2 z"
-        fill="ThreeDShadow"/>
-  <path d="M 10,1.2 L 1.2,10 10,18.8 z"
-        fill="-moz-Dialog"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,-0.2 L -0.2,10 10,20.2 z" fill="ThreeDShadow"/>
+  <path d="M 10,1.2 L 1.2,10 10,18.8 z" fill="-moz-Dialog"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/icons/panelarrow-vertical.svg b/arc-firefox-theme/chrome/global/icons/panelarrow-vertical.svg
index 3d79e18..073d021 100644
--- a/arc-firefox-theme/chrome/global/icons/panelarrow-vertical.svg
+++ b/arc-firefox-theme/chrome/global/icons/panelarrow-vertical.svg
@@ -2,12 +2,7 @@
 <!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M -0.2,10 L 10,-0.2 20.2,10 z"
-        fill="ThreeDShadow"/>
-  <path d="M 1.2,10 L 10,1.2 18.8,10 z"
-        fill="-moz-Dialog"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M -0.2,10 L 10,-0.2 20.2,10 z" fill="ThreeDShadow"/>
+  <path d="M 1.2,10 L 10,1.2 18.8,10 z" fill="-moz-Dialog"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/icons/warning.svg b/arc-firefox-theme/chrome/global/icons/warning.svg
index 0082970..bde2da1 100644
--- a/arc-firefox-theme/chrome/global/icons/warning.svg
+++ b/arc-firefox-theme/chrome/global/icons/warning.svg
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
-    <stop offset="0" style="stop-color: #fedb00"/>
-    <stop offset="1" style="stop-color: #fcce00"/>
-  </linearGradient>
-  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702
-    L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224
-    C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896
-    c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592
-    C32.592,43.712,31.472,44.896,30,44.896z"/>
-</svg>
\ No newline at end of file
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 60 60">
+  <defs>
+    <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
+      <stop offset="0" style="stop-color: #fedb00"/>
+      <stop offset="1" style="stop-color: #fcce00"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702 L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224 C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896 c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592 C32.592,43.712,31.472,44.896,30,44.896z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/check-partial.svg b/arc-firefox-theme/chrome/global/in-content/check-partial.svg
index b46a731..e436abf 100644
--- a/arc-firefox-theme/chrome/global/in-content/check-partial.svg
+++ b/arc-firefox-theme/chrome/global/in-content/check-partial.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="21"
-     height="21"
-     viewBox="0 0 21 21">
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="21" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -22,10 +19,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <rect id="check-shape" x="3" y="9" width="15" height="3"/>
   </defs>
   <use id="check-partial" xlink:href="#check-shape"/>
   <use id="check-partial-inverted" xlink:href="#check-shape"/>
   <use id="check-partial-native" xlink:href="#check-shape"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/check.svg b/arc-firefox-theme/chrome/global/in-content/check.svg
index 9fb2223..1f9f99c 100644
--- a/arc-firefox-theme/chrome/global/in-content/check.svg
+++ b/arc-firefox-theme/chrome/global/in-content/check.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="21"
-     height="21"
-     viewBox="0 0 21 21">
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21" height="21" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -22,10 +19,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="check-shape" d="M 9.39,16.5 16.28,6 14.77,4.5 9.37,12.7 6.28,9.2 4.7,10.7 z"/>
   </defs>
   <use id="check" xlink:href="#check-shape"/>
   <use id="check-inverted" xlink:href="#check-shape"/>
   <use id="check-native" xlink:href="#check-shape"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index 0b02360..dc3d018 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -5,13 +5,50 @@
 @namespace html "http://www.w3.org/1999/xhtml";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+*|*:root {
+  --in-content-page-color: #424e5a;
+  --in-content-page-background: #fbfbfb;
+  --in-content-text-color: #333;
+  --in-content-selected-text: #fff;
+  --in-content-header-border-color: #c8c8c8;
+  --in-content-box-background: #fff;
+  --in-content-box-background-odd: #f3f6fa;
+  --in-content-box-background-hover: #ebebeb;
+  --in-content-box-background-active: #dadada;
+  --in-content-box-border-color: #c1c1c1;
+  --in-content-item-hover: rgba(0,149,221,0.25);
+  --in-content-item-selected: #0095dd;
+  --in-content-border-highlight: #ff9500;
+  --in-content-border-focus: #0095dd;
+  --in-content-border-color: #c1c1c1;
+  --in-content-category-text: #c1c1c1;
+  --in-content-category-border-focus: 1px dotted #fff;
+  --in-content-category-text-selected: #f2f2f2;
+  --in-content-category-background: #424f5a;
+  --in-content-category-background-hover: #5e6972;
+  --in-content-category-background-active: #343f48;
+  --in-content-tab-color: #424f5a;
+  --in-content-link-color: #0095dd;
+  --in-content-link-color-hover: #178ce5;
+  --in-content-link-color-active: #ff9500;
+  --in-content-link-color-visited: #551a8b;
+  --in-content-primary-button-background: #0095dd;
+  --in-content-primary-button-background-hover: #008acb;
+  --in-content-primary-button-background-active: #006b9d;
+  --in-content-table-border-dark-color: #d1d1d1;
+  --in-content-table-header-background: #0095dd;
+  --in-content-help-button-background: #ffcb00;
+  --in-content-help-button-background-hover: #f4c200;
+  --in-content-help-button-background-active: #eaba00;
+}
+
 html|body,
 xul|page,
 xul|window {
   font: message-box;
   -moz-appearance: none;
-  background-color: #fbfbfb;
-  color: #424e5a;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
 }
 
 html|body {
@@ -24,14 +61,14 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: #333;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: #c1c1c1;
+  border-color: var(--in-content-border-color);
 }
 
 xul|caption {
@@ -91,9 +128,9 @@ xul|tabpanels {
 
 xul|tabs {
   margin-bottom: 15px;
-  border-top: 1px solid #c1c1c1;
-  border-bottom: 1px solid #c1c1c1;
-  background-color: #fbfbfb;
+  border-top: 1px solid var(--in-content-box-border-color);
+  border-bottom: 1px solid var(--in-content-box-border-color);
+  background-color: var(--in-content-page-background);
 }
 
 xul|*.tabs-left,
@@ -106,20 +143,20 @@ xul|tab {
   margin-top: 0;
   padding: 4px 20px;
   min-height: 44px;
-  color: #424f5a;
-  background-color: #fbfbfb;
+  color: var(--in-content-tab-color);
+  background-color: var(--in-content-page-background);
   border-width: 0;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
 xul|tab[selected] {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   padding-bottom: 0; /* compensate the 4px border */
-  border-bottom: 4px solid #ff9500;
+  border-bottom: 4px solid var(--in-content-border-highlight);
 }
 
 xul|*.tab-text {
@@ -142,29 +179,28 @@ xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
-  line-height: 20px;
-  border: 1px solid #c1c1c1;
+  color: var(--in-content-text-color);
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fbfbfb;
+  background-color: var(--in-content-page-background);
 }
 
 html|button:enabled:hover,
 xul|button:not([disabled="true"]):hover,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover,
 xul|menulist:not([disabled="true"]):hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
 html|button:enabled:hover:active,
 xul|button:not([disabled="true"]):hover:active,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover:active,
 xul|menulist[open="true"]:not([disabled="true"]) {
-  background-color: #dadada;
+  background-color: var(--in-content-box-background-active);
 }
 
 html|button:disabled,
@@ -176,19 +212,19 @@ xul|menulist[disabled="true"] {
 }
 
 *|button.primary {
-  background-color: #0095dd;
+  background-color: var(--in-content-primary-button-background);
   border-color: transparent;
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
 
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
-  background-color: #008acb;
+  background-color: var(--in-content-primary-button-background-hover);
 }
 
 html|button.primary:enabled:hover:active,
 xul|button.primary:not([disabled="true"]):hover:active {
-  background-color: #006b9d;
+  background-color: var(--in-content-primary-button-background-active);
 }
 
 xul|colorpicker[type="button"] {
@@ -222,19 +258,19 @@ xul|*.help-button {
   min-width: 30px;
   border-radius: 2px;
   border-width: 0;
-  background-color: #ffcb00;
+  background-color: var(--in-content-help-button-background);
   background-image: none;
   box-shadow: none;
   list-style-image: url("chrome://global/skin/in-content/help-glyph.svg");
 }
 
 xul|*.help-button:not([disabled="true"]):hover {
-  background-color: #f4c200;
+  background-color: var(--in-content-help-button-background-hover);
   background-image: none;
 }
 
 xul|*.help-button:not([disabled="true"]):hover:active {
-  background-color: #eaba00;
+  background-color: var(--in-content-help-button-background-active);
   background-image: none;
 }
 
@@ -311,9 +347,9 @@ xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker
 xul|menulist > xul|menupopup,
 xul|button[type="menu"] > xul|menupopup {
   -moz-appearance: none;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
 }
 
 xul|menulist > xul|menupopup xul|menu,
@@ -322,7 +358,7 @@ xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1em;
-  color: #333;
+  color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   -moz-padding-start: 10px;
@@ -333,16 +369,16 @@ xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="
 xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
-  color: #333;
-  background-color: rgba(0,149,221,0.25);
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
 }
 
 xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
 xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
-  color: #fff;
-  background-color: #0095dd;
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-item-selected);
 }
 
 xul|menulist > xul|menupopup > xul|menu[disabled="true"],
@@ -360,7 +396,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
   -moz-appearance: none;
   margin: 0;
   padding: 0;
-  border-top: 1px solid #c1c1c1;
+  border-top: 1px solid var(--in-content-box-border-color);
   border-bottom: none;
 }
 
@@ -369,22 +405,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 *|textbox {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
+  color: var(--in-content-text-color);
   line-height: 20px;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
 }
 
 html|textbox:focus,
 xul|textbox[focused] {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 html|textbox:disabled,
@@ -397,25 +433,25 @@ xul|textbox[disabled="true"] {
 html|a,
 .text-link,
 .inline-link {
-  color: #0095dd;
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: #178ce5;
+  color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
 
 html|a:visited {
-  color: #551a8b;
+  color: var(--in-content-link-color-visited);
 }
 
 html|a:hover:active,
 .text-link:hover:active,
 .inline-link:hover:active {
-  color: #ff9500;
+  color: var(--in-content-link-color-active);
   text-decoration: none;
 }
 
@@ -448,7 +484,7 @@ html|input[type="checkbox"] + html|label:before {
   width: 23px;
   height: 23px;
   border-radius: 2px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
   /* !important needed to override toolkit checked !important rule */
@@ -460,7 +496,7 @@ html|input[type="checkbox"] + html|label:before {
 
 xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check,
 html|input[type="checkbox"]:not(:disabled) + html|label:hover:before {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.checkbox-check[checked] {
@@ -493,7 +529,7 @@ xul|*.radio-check {
   -moz-appearance: none;
   width: 23px;
   height: 23px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 50%;
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
@@ -502,7 +538,7 @@ xul|*.radio-check {
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.radio-check[selected] {
@@ -523,7 +559,7 @@ xul|*.radio-label-box {
 
 xul|*#categories {
   -moz-appearance: none;
-  background-color: #424f5a;
+  background-color: var(--in-content-category-background);
   padding-top: 39px;
   margin: 0;
   border-width: 0;
@@ -531,7 +567,7 @@ xul|*#categories {
 
 xul|*.category {
   -moz-appearance: none;
-  color: #c1c1c1;
+  color: var(--in-content-category-text);
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -540,19 +576,19 @@ xul|*.category {
 }
 
 xul|*.category:hover {
-  background-color: #5e6972;
+  background-color: var(--in-content-category-background-hover);
 }
 
 xul|*.category[selected] {
-  background-color: #343f48;
-  color: #f2f2f2;
+  background-color: var(--in-content-category-background-active);
+  color: var(--in-content-category-text-selected);
   -moz-padding-start: 11px; /* compensate the 4px border */
-  -moz-border-start: solid 4px #ff9500;
+  -moz-border-start: solid 4px var(--in-content-border-highlight);
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
-  border-top: 1px #ffffff dotted;
-  border-bottom: 1px #ffffff dotted;
+  border-top: var(--in-content-category-border-focus);
+  border-bottom: var(--in-content-category-border-focus);
 }
 
 *|*.category-name {
@@ -572,7 +608,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 /* header */
 
 *|*.header {
-  border-bottom: 1px solid #c8c8c8;
+  border-bottom: 1px solid var(--in-content-header-border-color);
   -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
   margin-bottom: 15px;
   padding-bottom: 15px;
@@ -636,9 +672,9 @@ xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
   -moz-margin-start: 0;
-  background-color: #fff;
-  border: 1px solid #c1c1c1;
-  color: #333;
+  background-color: var(--in-content-box-background);
+  border: 1px solid var(--in-content-box-border-color);
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-row,
@@ -652,13 +688,13 @@ xul|listbox xul|listitem {
 
 xul|treechildren::-moz-tree-row(hover),
 xul|listbox xul|listitem:hover {
-  background-color: rgba(0,149,221,0.25);
+  background-color: var(--in-content-item-hover);
 }
 
 xul|treechildren::-moz-tree-row(selected),
 xul|listbox xul|listitem[selected="true"] {
-  background-color: #0095dd;
-  color: #fff;
+  background-color: var(--in-content-item-selected);
+  color: var(--in-content-selected-text);
 }
 
 /* Trees */
@@ -666,20 +702,21 @@ xul|listbox xul|listitem[selected="true"] {
 xul|tree {
   -moz-appearance: none;
   font-size: 1em;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
+  background-color: var(--in-content-box-background);
   margin: 0;
 }
 
 xul|tree:-moz-focusring,
 xul|richlistbox:-moz-focusring {
-  border: 1px dotted #0095dd;
+  border: 1px dotted var(--in-content-border-focus);
 }
 
 xul|listheader,
 xul|treecols {
   -moz-appearance: none;
   border: none;
-  border-bottom: 1px solid #c1c1c1;
+  border-bottom: 1px solid var(--in-content-border-color);
   padding: 0;
 }
 
@@ -687,15 +724,15 @@ xul|treecol:not([hideheader="true"]),
 xul|treecolpicker {
   -moz-appearance: none;
   border: none;
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   color: #808080;
   padding: 5px 10px;
 }
 
 xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover,
 xul|treecolpicker:hover {
-  background-color: #dadada;
-  color: #333;
+  background-color: var(--in-content-box-background-active);
+  color: var(--in-content-text-color);
 }
 
 xul|treecol:not([hideheader="true"]):not(:first-child),
@@ -722,11 +759,11 @@ xul|treechildren::-moz-tree-row {
 
 /* Color needs to be set on tree cell in order to be applied */
 xul|treechildren::-moz-tree-cell-text {
-  color: #333;
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-cell-text(selected) {
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
 
 xul|tab[visuallyselected] {
@@ -803,6 +840,13 @@ xul|*.radio-label-box {
   -moz-appearance: none;
 }
 
+/* Override OS-theme-based color to make it visible
+   on dark color themes. */
+xul|radio:not([disabled="true"]):hover,
+xul|checkbox:not([disabled="true"]):hover {
+  color: var(--in-content-text-color);
+}
+
 xul|*.numberbox-input-box {
   -moz-appearance: none;
   border-width: 0;
@@ -816,3 +860,20 @@ xul|*.inline-link:-moz-focusring {
 xul|spinbuttons {
   -moz-appearance: none;
 }
+
+xul|treechildren::-moz-tree-row(multicol, odd) {
+  background-color: var(--in-content-box-background-odd);
+}
+
+/* These rules are duplicated from common.inc.css
+ * because above -moz-tree-row(multicol, odd) rule 
+ * overrides also hover/selected states. 
+ */
+xul|treechildren::-moz-tree-row(hover) {
+  background-color: var(--in-content-item-hover);
+}
+
+xul|treechildren::-moz-tree-row(selected) {
+  background-color: var(--in-content-item-selected);
+}
+
diff --git a/arc-firefox-theme/chrome/global/in-content/dropdown.svg b/arc-firefox-theme/chrome/global/in-content/dropdown.svg
index a757585..458eb0b 100644
--- a/arc-firefox-theme/chrome/global/in-content/dropdown.svg
+++ b/arc-firefox-theme/chrome/global/in-content/dropdown.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-   viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">

   <style>

     use:not(:target) {

       display: none;

@@ -12,8 +14,8 @@
       fill: GrayText;

     }

   </style>

-  <defs style="display: none;">

-    <path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>

+  <defs>

+    <path id="dropdown-shape" fill-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>

   </defs>

   <use id="dropdown" xlink:href="#dropdown-shape"/>

   <use id="dropdown-disabled" xlink:href="#dropdown-shape"/>

diff --git a/arc-firefox-theme/chrome/global/in-content/help-glyph.svg b/arc-firefox-theme/chrome/global/in-content/help-glyph.svg
index 6f9ffb3..012bef4 100644
--- a/arc-firefox-theme/chrome/global/in-content/help-glyph.svg
+++ b/arc-firefox-theme/chrome/global/in-content/help-glyph.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">

-	<path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89

-		c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182

-		C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457

-		c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="-moz-dialogText"/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">

+  <path fill="-moz-dialogText" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/in-content/info-pages.css b/arc-firefox-theme/chrome/global/in-content/info-pages.css
index 6a6bd08..fcecbd8 100644
--- a/arc-firefox-theme/chrome/global/in-content/info-pages.css
+++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css
@@ -1,9 +1,10 @@
+
 @import url("chrome://global/skin/in-content/common.css");
 /* Body and container */
 body {
   display: flex;
   flex-direction: column;
-  box-sizing: padding-box;
+  box-sizing: border-box;
   min-height: 100vh;
   padding-top: 0;
   padding-bottom: 0;
diff --git a/arc-firefox-theme/chrome/global/in-content/radio.svg b/arc-firefox-theme/chrome/global/in-content/radio.svg
index ca926b7..97826bc 100644
--- a/arc-firefox-theme/chrome/global/in-content/radio.svg
+++ b/arc-firefox-theme/chrome/global/in-content/radio.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 21 21">
   <style>
     use:not(:target) {
       display: none;
@@ -12,7 +14,7 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <circle id="radio-shape" cx="10.5" cy="10.5" r="6"/>
   </defs>
   <use id="radio" xlink:href="#radio-shape"/>
diff --git a/arc-firefox-theme/chrome/global/inContentUI.css b/arc-firefox-theme/chrome/global/inContentUI.css
deleted file mode 100644
index afcef92..0000000
--- a/arc-firefox-theme/chrome/global/inContentUI.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 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/. */
-
-/*
- * The default namespace for this file is XUL. Be sure to prefix rules that
- * are applicable to both XUL and HTML with '*|'.
- */
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Page background */
-*|*:root {
-  -moz-appearance: none;
-  padding: 18px;
-  background-color: Window;
-  background-image: /* Texture */
-                    url("chrome://global/skin/inContentUI/background-texture.png");
-  color: WindowText;
-}
-
-/* Use the new in-content colors for #contentAreaDownloadsView. After landing
-   of bug 989469 the colors can be moved to *|*:root */
-*|*#contentAreaDownloadsView {
-  background: #f1f1f1;
-  color: #424e5a;
-}
-
-html|html {
-  font: message-box;
-}
-
-/* Content */
-*|*.main-content {
-  /* Needed to allow the radius to clip the inner content, see bug 595656 */
-  overflow: hidden;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border: 1px solid ThreeDShadow;
-  border-radius: 5px;
-}
diff --git a/arc-firefox-theme/chrome/global/inContentUI/background-texture.png b/arc-firefox-theme/chrome/global/inContentUI/background-texture.png
deleted file mode 100644
index 0d3cacd..0000000
--- a/arc-firefox-theme/chrome/global/inContentUI/background-texture.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
index 3060bf8..760cdcd 100644
--- a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
+++ b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css
@@ -4,6 +4,7 @@
 
 body {
   background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
+  background-color: rgb(33,33,33); /* Average color of that ^ image. */
 }
 
 video {
diff --git a/arc-firefox-theme/chrome/global/media/videoClickToPlayButton.svg b/arc-firefox-theme/chrome/global/media/videoClickToPlayButton.svg
index f118afb..f7ca6b6 100644
--- a/arc-firefox-theme/chrome/global/media/videoClickToPlayButton.svg
+++ b/arc-firefox-theme/chrome/global/media/videoClickToPlayButton.svg
@@ -1,79 +1,30 @@
 <!-- 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/. -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="videoPlayButtonOverlay"
-   preserveAspectRatio="xMinYMin meet"
-   viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
   <defs>
     <linearGradient id="whiteGradientStops">
-      <stop id="whiteGradientStop01" style="stop-color:#ffffff;stop-opacity:.95" offset="0" />
-      <stop id="whiteGradientStop02" style="stop-color:#ffffff;stop-opacity:.75" offset=".45" />
-      <stop id="whiteGradientStop03" style="stop-color:#ffffff;stop-opacity:.72" offset=".55" />
-      <stop id="whiteGradientStop04" style="stop-color:#ffffff;stop-opacity:.65" offset="1" />
+      <stop style="stop-color:#fff;stop-opacity:.95" offset="0"/>
+      <stop style="stop-color:#fff;stop-opacity:.75" offset=".45"/>
+      <stop style="stop-color:#fff;stop-opacity:.72" offset=".55"/>
+      <stop style="stop-color:#fff;stop-opacity:.65" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="0"
-       x2="32"
-       y2="62"
-       id="whiteGradient"
-       xlink:href="#whiteGradientStops"
-       gradientUnits="userSpaceOnUse" />
+    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
     <linearGradient id="arrowGradientStops">
-      <stop id="arrowGradientStop01" style="stop-color:#333333;stop-opacity:.5" offset="0" />
-      <stop id="arrowGradientStop02" style="stop-color:#666666;stop-opacity:.5" offset="1" />
+      <stop style="stop-color:#333;stop-opacity:.5" offset="0"/>
+      <stop style="stop-color:#666;stop-opacity:.5" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="16"
-       x2="32"
-       y2="48"
-       id="arrowGradient"
-       xlink:href="#arrowGradientStops"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.15"
-       y="-0.15"
-       width="1.25"
-       height="1.25"
-       color-interpolation-filters="sRGB"
-       id="dropShadow">
+    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
+    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
       <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
     </filter>
     <mask id="dropShadowMask">
-      <path
-         d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"
-         id="dropShadowMaskPath"
-         style="fill:#ffffff;" />
-    </mask>       
+      <path style="fill:#fff;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
+    </mask>
   </defs>
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     mask="url(#dropShadowMask)"
-     id="playButtonShadow"
-     style="filter:url(#dropShadow);" />
-  <path
-     d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"
-     id="playButtonArrow"
-     style="fill:url(#arrowGradient);" />
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButton"
-     style="fill:url(#whiteGradient);" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButtonEdgeHighlights"
-     style="fill:white;fill-opacity:.3;" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"
-     id="playButtonTopEdgeHighlights"
-     style="fill:white;fill-opacity:.8;" />
+  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
+  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonEdgeHighlights" style="fill:white;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonTopEdgeHighlights" style="fill:white;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css
index a49b781..61de49d 100644
--- a/arc-firefox-theme/chrome/global/menu.css
+++ b/arc-firefox-theme/chrome/global/menu.css
@@ -12,6 +12,7 @@
 
 menu,
 menuitem,
+menucaption,
 .splitmenu-menuitem {
   -moz-appearance: menuitem;
   -moz-box-align: center;
@@ -68,6 +69,7 @@ menuitem.spell-suggestion {
 /* ::::: menu/menuitems in menulist popups ::::: */
 
 menulist > menupopup > menuitem,
+menulist > menupopup > menucaption,
 menulist > menupopup > menu {
   padding: 1px 5px;
   max-width: none;
@@ -92,6 +94,12 @@ menulist > menupopup > menu {
   font-weight: inherit;
 }
 
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+  -moz-margin-start: 0 !important;
+  font-weight: bold;
+}
+
 .menu-description {
   font-style: italic;
   color: GrayText;
@@ -149,6 +157,7 @@ menulist > menupopup > menu {
 
 
 menulist > menupopup > menuitem > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
diff --git a/arc-firefox-theme/chrome/global/menu/shared-menu-check-active.svg b/arc-firefox-theme/chrome/global/menu/shared-menu-check-active.svg
index 8ef2c40..ba8a7c9 100644
--- a/arc-firefox-theme/chrome/global/menu/shared-menu-check-active.svg
+++ b/arc-firefox-theme/chrome/global/menu/shared-menu-check-active.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">

-<polygon fill="#4A90E2" points="7.1,15.5 0.5,10.8 2.2,8.3 6.3,11.2 13,0.5 15.5,2.2 "/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">

+  <polygon fill="#4a90e2" points="7.1,15.5 0.5,10.8 2.2,8.3 6.3,11.2 13,0.5 15.5,2.2 "/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/menu/shared-menu-check-black.svg b/arc-firefox-theme/chrome/global/menu/shared-menu-check-black.svg
index 74ee2c8..f388f81 100644
--- a/arc-firefox-theme/chrome/global/menu/shared-menu-check-black.svg
+++ b/arc-firefox-theme/chrome/global/menu/shared-menu-check-black.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="0 0 9 9" enable-background="new 0 0 9 9" xml:space="preserve">

-<polygon points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">

+  <polygon points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/menu/shared-menu-check-hover.svg b/arc-firefox-theme/chrome/global/menu/shared-menu-check-hover.svg
index d52d3d6..b8c8ec3 100644
--- a/arc-firefox-theme/chrome/global/menu/shared-menu-check-hover.svg
+++ b/arc-firefox-theme/chrome/global/menu/shared-menu-check-hover.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="0 0 9 9" enable-background="new 0 0 9 9" xml:space="preserve">

-<polygon fill="#CCCCCC" points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">

+  <polygon fill="#ccc" points="4,9 0,6.2 1,4.7 3.5,6.4 7.5,0 9,1 "/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css
index 2eb2abf..4c5d27e 100644
--- a/arc-firefox-theme/chrome/global/notification.css
+++ b/arc-firefox-theme/chrome/global/notification.css
@@ -84,6 +84,11 @@ notification[type="critical"] {
   margin-top: 17px;
 }
 
+.popup-notification-closebutton {
+  -moz-margin-end: -10px;
+  margin-top: -6px;
+}
+
 .popup-notification-menubutton > .button-menubutton-button[disabled] {
   opacity: 0.5;
 }
diff --git a/arc-firefox-theme/chrome/global/popup.css b/arc-firefox-theme/chrome/global/popup.css
index 1c5bc50..63c8d86 100644
--- a/arc-firefox-theme/chrome/global/popup.css
+++ b/arc-firefox-theme/chrome/global/popup.css
@@ -4,6 +4,14 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* ::::: Variables ::::: */
+.panel-arrowcontent {
+  --panel-arrowcontent-padding: 10px;
+  --panel-arrowcontent-background: -moz-Dialog;
+  --panel-arrowcontent-color: -moz-DialogText;
+  --panel-arrowcontent-border: 1px solid ThreeDShadow;
+}
+
 /* ::::: menupopup ::::: */
 
 menupopup,
@@ -32,10 +40,10 @@ panel[type="arrow"][side="right"] {
 }
 
 .panel-arrowcontent {
-  padding: 10px;
-  color: -moz-DialogText;
-  background: -moz-Dialog;
-  border: 1px solid ThreeDShadow;
+  padding: var(--panel-arrowcontent-padding);
+  color: var(--panel-arrowcontent-color);
+  background: var(--panel-arrowcontent-background);
+  border: var(--panel-arrowcontent-border);
 }
 
 .panel-arrow[side="top"],
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
index 66551ef..2071381 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10

-    C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
index b0674b2..e57a475 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Close-24x24.svg
@@ -2,30 +2,24 @@
 <!-- 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/. -->
-<svg viewBox="0 0 24 24"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
-    <style type="text/css">
+    <style>
       use:not(:target) {
         display: none;
       }
-
       #close {
         fill: #808080;
       }
       #close-hover {
-        fill: #FFFFFF;
+        fill: #fff;
       }
     </style>
-
     <g id="close-shape">
       <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
       <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
     </g>
   </defs>
-
-  <use id="close"       xlink:href="#close-shape"/>
+  <use id="close" xlink:href="#close-shape"/>
   <use id="close-hover" xlink:href="#close-shape"/>
-
-</svg>
\ No newline at end of file
+</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
index 6010fbe..0ed3983 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10

-    C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Minus-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Minus-24x24.svg
index 9da7e03..e85a397 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Minus-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Minus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>

-<g enable-background="new    ">

-    <g>

-        <defs>

-            <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/>

-        </defs>

-        <clipPath id="SVGID_1_">

-            <use xlink:href="#SVGID_2_"  overflow="visible"/>

-        </clipPath>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_3_">

-                <use xlink:href="#SVGID_6_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_5_">

-                <use xlink:href="#SVGID_10_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_7_">

-                <use xlink:href="#SVGID_16_"  overflow="visible"/>

-            </clipPath>

-        </g>

-    </g>

-</g>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <path fill-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Plus-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Plus-24x24.svg
index 249912a..f3a98dd 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Plus-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Plus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>

-<g enable-background="new    ">

-    <g>

-        <defs>

-            <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/>

-        </defs>

-        <clipPath id="SVGID_1_">

-            <use xlink:href="#SVGID_2_"  overflow="visible"/>

-        </clipPath>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_3_">

-                <use xlink:href="#SVGID_6_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_5_">

-                <use xlink:href="#SVGID_10_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_7_">

-                <use xlink:href="#SVGID_16_"  overflow="visible"/>

-            </clipPath>

-        </g>

-    </g>

-</g>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <path fill-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
index 1f21efd..b43a8b8 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
@@ -1,46 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<g>

-    <rect x="8" y="10" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>

-    <rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>

-    <rect x="8" y="4" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>

-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="6" r="2"/>

-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="12" r="2"/>

-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="18" r="2"/>

-</g>

-<g enable-background="new    ">

-    <g>

-        <defs>

-            <rect id="SVGID_2_" x="-197" y="-1054" width="22" height="34"/>

-        </defs>

-        <clipPath id="SVGID_1_">

-            <use xlink:href="#SVGID_2_"  overflow="visible"/>

-        </clipPath>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_6_" x="-293" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_3_">

-                <use xlink:href="#SVGID_6_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_10_" x="-293" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_5_">

-                <use xlink:href="#SVGID_10_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_16_" x="-293" y="-1459" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_7_">

-                <use xlink:href="#SVGID_16_"  overflow="visible"/>

-            </clipPath>

-        </g>

-    </g>

-</g>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <rect x="8" y="10" fill="#808080" width="14" height="4"/>

+  <rect x="8" y="16" fill="#808080" width="14" height="4"/>

+  <rect x="8" y="4" fill="#808080" width="14" height="4"/>

+  <circle fill="#808080" cx="4" cy="6" r="2"/>

+  <circle fill="#808080" cx="4" cy="12" r="2"/>

+  <circle fill="#808080" cx="4" cy="18" r="2"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
index a25429a..8a5a212 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-24x24.svg
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<g>

-    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07

-        H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166

-        L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z

-         M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>

-    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425

-        c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815

-        S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581

-        s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273

-        c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181

-        c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061

-        c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459

-        c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474

-        c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03

-        s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592

-        c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786

-        c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117

-        c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>

-</g>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>

+    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
index 9094d8a..837392f 100644
--- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
+++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">

-<polygon opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985

-    "/>

-<g enable-background="new    ">

-    <g>

-        <defs>

-            <rect id="SVGID_2_" x="-125" y="-1086.667" width="22" height="34"/>

-        </defs>

-        <clipPath id="SVGID_1_">

-            <use xlink:href="#SVGID_2_"  overflow="visible"/>

-        </clipPath>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_6_" x="-221" y="-1491.667" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_3_">

-                <use xlink:href="#SVGID_6_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_10_" x="-221" y="-1491.667" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_5_">

-                <use xlink:href="#SVGID_10_"  overflow="visible"/>

-            </clipPath>

-        </g>

-        <g clip-path="url(#SVGID_1_)">

-            <defs>

-                <rect id="SVGID_16_" x="-221" y="-1491.667" width="1080" height="2896"/>

-            </defs>

-            <clipPath id="SVGID_7_">

-                <use xlink:href="#SVGID_16_"  overflow="visible"/>

-            </clipPath>

-        </g>

-    </g>

-</g>

-<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FBFBFB" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008

-    16.591,22.994 "/>

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

+  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>

+  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>

 </svg>

diff --git a/arc-firefox-theme/chrome/global/reader/pocket.svg b/arc-firefox-theme/chrome/global/reader/pocket.svg
index 63b22fa..d93fd6a 100644
--- a/arc-firefox-theme/chrome/global/reader/pocket.svg
+++ b/arc-firefox-theme/chrome/global/reader/pocket.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<svg xmlns="http://www.w3.org/2000/svg"

-     xmlns:xlink="http://www.w3.org/1999/xlink"

-     viewBox="0 0 24 24">

+<!-- 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/. -->

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">

   <style>

     use:not(:target) {

       display: none;

@@ -10,18 +11,11 @@
       fill: #808080;

     }

     use[id$="-added"] {

-      fill: #EE4056;

+      fill: #ee4056;

     }

   </style>

-  <defs style="display: none;">

-    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179

-      C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018

-      c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171

-      c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018

-      c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z

-      M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547

-      c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63

-      c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>

+  <defs>

+    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>

   </defs>

   <use id="pocket-mark" xlink:href="#pocket-mark-shape"/>

   <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/>