7 files changed, 118 insertions, 207 deletions

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 e436abf..b46a731 100644
--- a/arc-firefox-theme/chrome/global/in-content/check-partial.svg
+++ b/arc-firefox-theme/chrome/global/in-content/check-partial.svg
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<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">
   <style>
     use:not(:target) {
       display: none;
@@ -19,10 +22,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs>
+  <defs style="display: none;">
     <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>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/global/in-content/check.svg b/arc-firefox-theme/chrome/global/in-content/check.svg
index 1f9f99c..9fb2223 100644
--- a/arc-firefox-theme/chrome/global/in-content/check.svg
+++ b/arc-firefox-theme/chrome/global/in-content/check.svg
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<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">
   <style>
     use:not(:target) {
       display: none;
@@ -19,10 +22,10 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs>
+  <defs style="display: none;">
     <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>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index dc3d018..1e1e00c 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -5,50 +5,13 @@
 @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: var(--in-content-page-background);
-  color: var(--in-content-page-color);
+  background-color: #fbfbfb;
+  color: #424e5a;
 }
 
 html|body {
@@ -61,14 +24,14 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: var(--in-content-text-color);
+  color: #333;
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: var(--in-content-border-color);
+  border-color: #c1c1c1;
 }
 
 xul|caption {
@@ -84,6 +47,10 @@ xul|caption > xul|label {
   margin: 0 !important;
 }
 
+xul|description {
+  -moz-margin-start: 0;
+}
+
 *|*.main-content {
   padding-top: 40px;
   -moz-padding-end: 44px; /* compensate the 4px margin of child elements */
@@ -107,8 +74,7 @@ xul|groupbox {
   font-size: 1.25rem;
 }
 
-xul|groupbox xul|label,
-xul|groupbox xul|description {
+xul|groupbox xul|label {
   /* !important needed to override toolkit !important rule */
   -moz-margin-start: 0 !important;
   -moz-margin-end: 0 !important;
@@ -128,9 +94,9 @@ xul|tabpanels {
 
 xul|tabs {
   margin-bottom: 15px;
-  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);
+  border-top: 1px solid #c1c1c1;
+  border-bottom: 1px solid #c1c1c1;
+  background-color: #fbfbfb;
 }
 
 xul|*.tabs-left,
@@ -143,20 +109,20 @@ xul|tab {
   margin-top: 0;
   padding: 4px 20px;
   min-height: 44px;
-  color: var(--in-content-tab-color);
-  background-color: var(--in-content-page-background);
+  color: #424f5a;
+  background-color: #fbfbfb;
   border-width: 0;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: var(--in-content-box-background-hover);
+  background-color: #ebebeb;
 }
 
 xul|tab[selected] {
-  background-color: var(--in-content-box-background-hover);
+  background-color: #ebebeb;
   padding-bottom: 0; /* compensate the 4px border */
-  border-bottom: 4px solid var(--in-content-border-highlight);
+  border-bottom: 4px solid #ff9500;
 }
 
 xul|*.tab-text {
@@ -179,28 +145,29 @@ xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
   height: 30px;
-  color: var(--in-content-text-color);
-  border: 1px solid var(--in-content-box-border-color);
+  color: #333;
+  line-height: 20px;
+  border: 1px solid #c1c1c1;
   -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: var(--in-content-page-background);
+  background-color: #fbfbfb;
 }
 
 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: var(--in-content-box-background-hover);
+  background-color: #ebebeb;
 }
 
 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: var(--in-content-box-background-active);
+  background-color: #dadada;
 }
 
 html|button:disabled,
@@ -212,19 +179,19 @@ xul|menulist[disabled="true"] {
 }
 
 *|button.primary {
-  background-color: var(--in-content-primary-button-background);
+  background-color: #0095dd;
   border-color: transparent;
-  color: var(--in-content-selected-text);
+  color: #fff;
 }
 
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
-  background-color: var(--in-content-primary-button-background-hover);
+  background-color: #008acb;
 }
 
 html|button.primary:enabled:hover:active,
 xul|button.primary:not([disabled="true"]):hover:active {
-  background-color: var(--in-content-primary-button-background-active);
+  background-color: #006b9d;
 }
 
 xul|colorpicker[type="button"] {
@@ -258,19 +225,19 @@ xul|*.help-button {
   min-width: 30px;
   border-radius: 2px;
   border-width: 0;
-  background-color: var(--in-content-help-button-background);
+  background-color: #ffcb00;
   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: var(--in-content-help-button-background-hover);
+  background-color: #f4c200;
   background-image: none;
 }
 
 xul|*.help-button:not([disabled="true"]):hover:active {
-  background-color: var(--in-content-help-button-background-active);
+  background-color: #eaba00;
   background-image: none;
 }
 
@@ -347,9 +314,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 var(--in-content-box-border-color);
+  border: 1px solid #c1c1c1;
   border-radius: 2px;
-  background-color: var(--in-content-box-background);
+  background-color: #fff;
 }
 
 xul|menulist > xul|menupopup xul|menu,
@@ -358,37 +325,27 @@ xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1em;
-  color: var(--in-content-text-color);
+  color: #333;
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   -moz-padding-start: 10px;
   -moz-padding-end: 30px;
 }
 
-xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
-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: var(--in-content-text-color);
-  background-color: var(--in-content-item-hover);
+xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"],
+xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
+  color: #333;
+  background-color: rgba(0,149,221,0.25);
 }
 
-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: var(--in-content-selected-text);
-  background-color: var(--in-content-item-selected);
-}
-
-xul|menulist > xul|menupopup > xul|menu[disabled="true"],
-xul|menulist > xul|menupopup > xul|menuitem[disabled="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] {
-  color: #999;
-  /* override the [_moz-menuactive="true"] background color from
-     global/menu.css */
-  background-color: transparent;
+xul|menulist > xul|menupopup > xul|menu[selected="true"],
+xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
+  color: #fff;
+  background-color: #0095DD;
 }
 
 xul|menulist > xul|menupopup xul|menuseparator,
@@ -396,7 +353,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
   -moz-appearance: none;
   margin: 0;
   padding: 0;
-  border-top: 1px solid var(--in-content-box-border-color);
+  border-top: 1px solid #c1c1c1;
   border-bottom: none;
 }
 
@@ -405,22 +362,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 *|textbox {
   -moz-appearance: none;
   height: 30px;
-  color: var(--in-content-text-color);
+  color: #333;
   line-height: 20px;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid var(--in-content-box-border-color);
+  border: 1px solid #c1c1c1;
   -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: var(--in-content-box-background);
+  background-color: #fff;
 }
 
 html|textbox:focus,
 xul|textbox[focused] {
-  border-color: var(--in-content-border-focus);
+  border-color: #0095dd;
 }
 
 html|textbox:disabled,
@@ -433,25 +390,22 @@ xul|textbox[disabled="true"] {
 html|a,
 .text-link,
 .inline-link {
-  color: var(--in-content-link-color);
+  line-height: 22px;
+  color: #0095dd;
   text-decoration: none;
 }
 
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: var(--in-content-link-color-hover);
+  color: #178ce5;
   text-decoration: underline;
 }
 
-html|a:visited {
-  color: var(--in-content-link-color-visited);
-}
-
 html|a:hover:active,
 .text-link:hover:active,
 .inline-link:hover:active {
-  color: var(--in-content-link-color-active);
+  color: #ff9500;
   text-decoration: none;
 }
 
@@ -484,7 +438,7 @@ html|input[type="checkbox"] + html|label:before {
   width: 23px;
   height: 23px;
   border-radius: 2px;
-  border: 1px solid var(--in-content-box-border-color);
+  border: 1px solid #c1c1c1;
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
   /* !important needed to override toolkit checked !important rule */
@@ -496,7 +450,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: var(--in-content-border-focus);
+  border-color: #0095dd;
 }
 
 xul|*.checkbox-check[checked] {
@@ -529,7 +483,7 @@ xul|*.radio-check {
   -moz-appearance: none;
   width: 23px;
   height: 23px;
-  border: 1px solid var(--in-content-box-border-color);
+  border: 1px solid #c1c1c1;
   border-radius: 50%;
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
@@ -538,7 +492,7 @@ xul|*.radio-check {
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: var(--in-content-border-focus);
+  border-color: #0095dd;
 }
 
 xul|*.radio-check[selected] {
@@ -559,7 +513,7 @@ xul|*.radio-label-box {
 
 xul|*#categories {
   -moz-appearance: none;
-  background-color: var(--in-content-category-background);
+  background-color: #424f5a;
   padding-top: 39px;
   margin: 0;
   border-width: 0;
@@ -567,7 +521,7 @@ xul|*#categories {
 
 xul|*.category {
   -moz-appearance: none;
-  color: var(--in-content-category-text);
+  color: #c1c1c1;
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -576,19 +530,19 @@ xul|*.category {
 }
 
 xul|*.category:hover {
-  background-color: var(--in-content-category-background-hover);
+  background-color: #5e6972;
 }
 
 xul|*.category[selected] {
-  background-color: var(--in-content-category-background-active);
-  color: var(--in-content-category-text-selected);
+  background-color: #343f48;
+  color: #f2f2f2;
   -moz-padding-start: 11px; /* compensate the 4px border */
-  -moz-border-start: solid 4px var(--in-content-border-highlight);
+  -moz-border-start: solid 4px #ff9500;
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
-  border-top: var(--in-content-category-border-focus);
-  border-bottom: var(--in-content-category-border-focus);
+  border-top: 1px #ffffff dotted;
+  border-bottom: 1px #ffffff dotted;
 }
 
 *|*.category-name {
@@ -608,7 +562,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 /* header */
 
 *|*.header {
-  border-bottom: 1px solid var(--in-content-header-border-color);
+  border-bottom: 1px solid #c8c8c8;
   -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
   margin-bottom: 15px;
   padding-bottom: 15px;
@@ -672,9 +626,9 @@ xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
   -moz-margin-start: 0;
-  background-color: var(--in-content-box-background);
-  border: 1px solid var(--in-content-box-border-color);
-  color: var(--in-content-text-color);
+  background-color: #fff;
+  border: 1px solid #c1c1c1;
+  color: #333;
 }
 
 xul|treechildren::-moz-tree-row,
@@ -688,13 +642,13 @@ xul|listbox xul|listitem {
 
 xul|treechildren::-moz-tree-row(hover),
 xul|listbox xul|listitem:hover {
-  background-color: var(--in-content-item-hover);
+  background-color: rgba(0,149,221,0.25);
 }
 
 xul|treechildren::-moz-tree-row(selected),
 xul|listbox xul|listitem[selected="true"] {
-  background-color: var(--in-content-item-selected);
-  color: var(--in-content-selected-text);
+  background-color: #0095dd;
+  color: #fff;
 }
 
 /* Trees */
@@ -702,21 +656,19 @@ xul|listbox xul|listitem[selected="true"] {
 xul|tree {
   -moz-appearance: none;
   font-size: 1em;
-  border: 1px solid var(--in-content-box-border-color);
-  background-color: var(--in-content-box-background);
-  margin: 0;
+  border: 1px solid #c1c1c1;
 }
 
 xul|tree:-moz-focusring,
 xul|richlistbox:-moz-focusring {
-  border: 1px dotted var(--in-content-border-focus);
+  border: 1px dotted #0095dd;
 }
 
 xul|listheader,
 xul|treecols {
   -moz-appearance: none;
   border: none;
-  border-bottom: 1px solid var(--in-content-border-color);
+  border-bottom: 1px solid #c1c1c1;
   padding: 0;
 }
 
@@ -724,15 +676,15 @@ xul|treecol:not([hideheader="true"]),
 xul|treecolpicker {
   -moz-appearance: none;
   border: none;
-  background-color: var(--in-content-box-background-hover);
+  background-color: #ebebeb;
   color: #808080;
   padding: 5px 10px;
 }
 
 xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover,
 xul|treecolpicker:hover {
-  background-color: var(--in-content-box-background-active);
-  color: var(--in-content-text-color);
+  background-color: #dadada;
+  color: #333;
 }
 
 xul|treecol:not([hideheader="true"]):not(:first-child),
@@ -759,14 +711,14 @@ 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: var(--in-content-text-color);
+  color: #333;
 }
 
 xul|treechildren::-moz-tree-cell-text(selected) {
-  color: var(--in-content-selected-text);
+  color: #fff;
 }
 
-xul|tab[visuallyselected] {
+xul|tab[selected] {
   /* Override styles for tab[selected] from
      toolkit/themes/linux/global/tabbox.css */
   margin-bottom: 0;
@@ -840,40 +792,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;
 }
 
+html|a:-moz-focusring,
 xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
   border: 1px dotted -moz-DialogText;
 }
-
-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 458eb0b..a757585 100644
--- a/arc-firefox-theme/chrome/global/in-content/dropdown.svg
+++ b/arc-firefox-theme/chrome/global/in-content/dropdown.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!-- 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">

+<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;

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

     }

   </style>

-  <defs>

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

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

+    <path id="dropdown-shape" fill-rule="evenodd" clip-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 012bef4..6f9ffb3 100644
--- a/arc-firefox-theme/chrome/global/in-content/help-glyph.svg
+++ b/arc-firefox-theme/chrome/global/in-content/help-glyph.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!-- 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 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"/>

 </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 fcecbd8..09838d3 100644
--- a/arc-firefox-theme/chrome/global/in-content/info-pages.css
+++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css
@@ -1,10 +1,8 @@
-
 @import url("chrome://global/skin/in-content/common.css");
 /* Body and container */
 body {
   display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
+  box-sizing: padding-box;
   min-height: 100vh;
   padding-top: 0;
   padding-bottom: 0;
@@ -19,13 +17,6 @@ body {
   max-width: 52em;
 }
 
-.container.restore-chosen {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  margin: 10vh 0;
-}
-
 /* Typography */
 .title {
   background-image: url("chrome://browser/skin/aboutNetError_info.svg");
@@ -91,16 +82,8 @@ ul {
 }
 
 /* Trees */
-.tree-container {
-  margin-top: 1.2em;
-  flex-grow: 1;
-  min-height: 12em;
-}
-
-.tree-container > tree {
-  height: 100%;
-}
-
 tree {
+  min-height: 12em;
+  margin-top: 1.2em;
   width: 100%;
-}
+}
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/global/in-content/radio.svg b/arc-firefox-theme/chrome/global/in-content/radio.svg
index 97826bc..ca926b7 100644
--- a/arc-firefox-theme/chrome/global/in-content/radio.svg
+++ b/arc-firefox-theme/chrome/global/in-content/radio.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<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">
   <style>
     use:not(:target) {
       display: none;
@@ -14,7 +12,7 @@
       fill: -moz-dialogText;
     }
   </style>
-  <defs>
+  <defs style="display: none;">
     <circle id="radio-shape" cx="10.5" cy="10.5" r="6"/>
   </defs>
   <use id="radio" xlink:href="#radio-shape"/>