Merge branch 'master' into firefox-41-beta

42 files changed, 405 insertions, 446 deletions

diff --git a/Makefile.am b/Makefile.am
index 4af080a..780235a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,8 @@ if ENABLE_DARKER
 	cp $(darkertempdir)/chrome/browser/sass/browser-darker.css $(darkertempdir)/chrome/browser/browser.css
 	rm -rf $(darkertempdir)/chrome/browser/sass
 
-	sed -i 's/arc-firefox-theme/arc-darker-firefox-theme/' $(darkertempdir)/chrome.manifest
-	sed -i 's/arc-firefox-theme/arc-darker-firefox-theme/' $(darkertempdir)/install.rdf
+	sed -i 's/arc-theme/arc-darker-theme/' $(darkertempdir)/chrome.manifest
+	sed -i 's/arc-theme/arc-darker-theme/' $(darkertempdir)/install.rdf
 	sed -i 's/Arc /Arc Darker /' $(darkertempdir)/install.rdf
 
 	sed -i "s/$(light_guid)/$(darker_guid)/" $(darkertempdir)/install.rdf
@@ -56,8 +56,8 @@ if ENABLE_DARK
 	cp $(darktempdir)/chrome/browser/sass/browser-dark.css $(darktempdir)/chrome/browser/browser.css
 	rm -rf $(darktempdir)/chrome/browser/sass
 
-	sed -i 's/arc-firefox-theme/arc-dark-firefox-theme/' $(darktempdir)/chrome.manifest
-	sed -i 's/arc-firefox-theme/arc-dark-firefox-theme/' $(darktempdir)/install.rdf
+	sed -i 's/arc-theme/arc-dark-theme/' $(darktempdir)/chrome.manifest
+	sed -i 's/arc-theme/arc-dark-theme/' $(darktempdir)/install.rdf
 	sed -i 's/Arc /Arc Dark /' $(darktempdir)/install.rdf
 
 	sed -i "s/$(light_guid)/$(dark_guid)/" $(darktempdir)/install.rdf
diff --git a/README.md b/README.md
index 93cdf8d..5a8b267 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,15 @@ Offical [Arc](https://github.com/horst3180/Arc-theme) Firefox theme.
 
 #####Arc Firefox
 
-![alt tag](http://i.imgur.com/qHpAWT3.png)
+![alt tag](http://i.imgur.com/UjJabE3.png)
 
 #####Arc Darker Firefox
 
-![alt tag](http://i.imgur.com/tjJf9T7.png)
+![alt tag](http://i.imgur.com/5fMURDp.png)
 
 #####Arc Dark Firefox
 
-![alt tag](http://i.imgur.com/tv8C0Hs.png)
+![alt tag](http://i.imgur.com/5HuYVUl.png)
 
 
 ### Requirements
diff --git a/arc-firefox-theme/chrome.manifest b/arc-firefox-theme/chrome.manifest
index e21f5d5..4bb97cb 100644
--- a/arc-firefox-theme/chrome.manifest
+++ b/arc-firefox-theme/chrome.manifest
@@ -1,4 +1,4 @@
-skin    browser         arc-firefox-theme   chrome/browser/
-skin    communicator    arc-firefox-theme   chrome/communicator/
-skin    global          arc-firefox-theme   chrome/global/
-skin    mozapps         arc-firefox-theme   chrome/mozapps/
+skin    browser         arc-theme   chrome/browser/
+skin    communicator    arc-theme   chrome/communicator/
+skin    global          arc-theme   chrome/global/
+skin    mozapps         arc-theme   chrome/mozapps/
diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css
index 82fc9e9..b7cd533 100644
--- a/arc-firefox-theme/chrome/browser/browser.css
+++ b/arc-firefox-theme/chrome/browser/browser.css
@@ -8,7 +8,7 @@
 :root {
   --toolbarbutton-hover-background: #fbfbfc;
   --toolbarbutton-hover-boxshadow: none;
-  --toolbarbutton-hover-bordercolor: #5294E2;
+  --toolbarbutton-hover-bordercolor: #cfd6e6;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: #5294E2;
   --toolbarbutton-active-background: #5294E2;
@@ -58,7 +58,7 @@
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  border-top: 1px solid rgba(203, 205, 212, 0.95) !important;
+  border-top: 1px solid rgba(212, 213, 219, 0.95) !important;
   background-clip: padding-box;
   margin-top: -1px;
   /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
@@ -137,8 +137,8 @@ toolbarbutton.bookmark-item {
 toolbarbutton.bookmark-item:not([disabled=true]):hover {
   -moz-appearance: none;
   color: #5c616c;
-  background-color: #fbfbfc;
-  border: 1px solid #5294E2; }
+  background-color: white;
+  border: 1px solid #cfd6e6; }
 
 toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   -moz-appearance: none;
@@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   padding: 3px;
   border-radius: 3px;
   margin: 0 3px;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
 
 #urlbar[focused],
 .searchbar-textbox[focused] {
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #5294E2; }
@@ -1547,9 +1545,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   background-color: transparent;
   background-clip: padding-box;
   padding-left: 1px;
-  border-width: 0 8px 0 0;
+  padding-right: 4px;
+  border-width: 0 1px 0 0;
   border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; }
+  border-color: #dcdfe3; }
 
 #notification-popup-box:-moz-locale-dir(rtl),
 .notification-anchor-icon:-moz-locale-dir(rtl) {
@@ -1708,9 +1707,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill; }
-
   .notification-anchor-icon {
     list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
 
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg
index 36c4251..514f96b 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg
@@ -39,8 +39,8 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="10.766271"
-     inkscape:cx="-9.9304967"
-     inkscape:cy="10.808825"
+     inkscape:cx="3.3052838"
+     inkscape:cy="3.3782114"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -57,7 +57,7 @@
      id="defs4" />
   <g
      id="g4136"
-     style="opacity:0.5">
+     style="opacity:0.6">
     <rect
        rx="0.5"
        ry="0.5"
@@ -66,7 +66,7 @@
        height="34"
        width="44"
        id="rect3837"
-       style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" />
+       style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" />
     <rect
        ry="1"
        y="1.5"
@@ -74,16 +74,7 @@
        height="35"
        width="45"
        id="rect3837-9"
-       style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#20242b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        rx="1" />
-    <rect
-       ry="1.3877788e-16"
-       rx="1.3877788e-16"
-       y="30"
-       x="16"
-       height="1"
-       width="1"
-       id="rect4135"
-       style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg
index 7b0e1f8..e3c2967 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg
@@ -39,7 +39,7 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="10.766271"
-     inkscape:cx="6.5561773"
+     inkscape:cx="-26.417171"
      inkscape:cy="10.808825"
      inkscape:window-x="0"
      inkscape:window-y="23"
@@ -56,7 +56,7 @@
   <defs
      id="defs4" />
   <rect
-     style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981"
+     style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981"
      id="rect3837"
      width="44"
      height="34"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
@@ -74,7 +74,7 @@
      y="1.5"
      ry="1" />
   <rect
-     style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect4135"
      width="1"
      height="1"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle-hover.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle-hover.svg
index edd78fc..438ac29 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle-hover.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle-hover.svg
@@ -38,9 +38,9 @@
      inkscape:window-height="1052"
      id="namedview16"
      showgrid="true"
-     inkscape:zoom="5.3831355"
-     inkscape:cx="-26.527046"
-     inkscape:cy="9.9647005"
+     inkscape:zoom="30.451613"
+     inkscape:cx="22.422533"
+     inkscape:cy="31.436498"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -57,7 +57,7 @@
      id="defs4" />
   <g
      id="g4135"
-     style="opacity:0.5">
+     style="opacity:0.6">
     <rect
        rx="0.5"
        ry="0.5"
@@ -66,7 +66,7 @@
        height="34"
        width="44"
        id="rect3837"
-       style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" />
+       style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555984" />
     <rect
        ry="1"
        y="1.5"
@@ -74,7 +74,7 @@
        height="35"
        width="45"
        id="rect3837-9"
-       style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#20242b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        rx="1" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg
index 9f94872..7cc1a03 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg
@@ -38,9 +38,9 @@
      inkscape:window-height="1052"
      id="namedview16"
      showgrid="true"
-     inkscape:zoom="5.3831355"
-     inkscape:cx="6.4463018"
-     inkscape:cy="9.9647005"
+     inkscape:zoom="30.451613"
+     inkscape:cx="22.422533"
+     inkscape:cy="31.436498"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -56,7 +56,7 @@
   <defs
      id="defs4" />
   <rect
-     style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981"
+     style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555984"
      id="rect3837"
      width="44"
      height="34"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start-hover.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start-hover.svg
index 0236837..fecbbb8 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start-hover.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start-hover.svg
@@ -38,9 +38,9 @@
      inkscape:window-height="1052"
      id="namedview16"
      showgrid="true"
-     inkscape:zoom="7.6129032"
-     inkscape:cx="-10.453684"
-     inkscape:cy="11.931441"
+     inkscape:zoom="15.225806"
+     inkscape:cx="12.679952"
+     inkscape:cy="0.60549575"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -57,7 +57,7 @@
      id="defs4" />
   <g
      id="g4136"
-     style="opacity:0.5">
+     style="opacity:0.6">
     <rect
        ry="0.5"
        y="2"
@@ -65,7 +65,7 @@
        height="34"
        width="44"
        id="rect3837"
-       style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" />
+       style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" />
     <rect
        ry="1"
        y="1.5"
@@ -73,16 +73,7 @@
        height="35"
        width="45"
        id="rect3837-9"
-       style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#20242b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        rx="1" />
-    <rect
-       ry="1.3877788e-16"
-       rx="1.3877788e-16"
-       y="30"
-       x="13"
-       height="1"
-       width="1"
-       id="rect4135"
-       style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg
index 6a280d5..05a6788 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg
@@ -38,9 +38,9 @@
      inkscape:window-height="1052"
      id="namedview16"
      showgrid="true"
-     inkscape:zoom="7.6129032"
-     inkscape:cx="-10.453684"
-     inkscape:cy="11.931441"
+     inkscape:zoom="43.065084"
+     inkscape:cx="12.889294"
+     inkscape:cy="0.72416328"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -56,7 +56,7 @@
   <defs
      id="defs4" />
   <rect
-     style="fill:#444852;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981"
+     style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981"
      id="rect3837"
      width="44"
      height="34"
@@ -65,7 +65,7 @@
      ry="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1d2125;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
@@ -73,7 +73,7 @@
      y="1.5"
      ry="1" />
   <rect
-     style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect4135"
      width="1"
      height="1"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close.svg
index b496683..4a82a49 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -135,75 +135,69 @@
      transform="translate(0,-1028.3622)">
     <g
        style="display:inline"
-       id="titlebutton-close-dark"
+       id="titlebutton-close-dark-8"
        inkscape:label="#g6210"
-       transform="translate(-641.00002,1218)">
+       transform="translate(-641,1218)">
       <g
-         id="g4927-9-2-8"
+         id="g4927-9-2-8-4"
          style="display:inline;opacity:1"
          transform="translate(-678,-432.63782)">
         <g
            transform="translate(-103,0)"
            style="display:inline;opacity:1"
-           id="g4490-6-5-2-5-3">
+           id="g4490-6-5-2-5-3-6">
           <g
-             id="g4092-0-2-21-0-9-7"
+             id="g4092-0-2-21-0-9-7-0"
              style="display:inline"
              transform="translate(58,0)">
-            <circle
-               r="7"
-               cy="255"
-               cx="1376"
-               style="fill:#e45e65;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-               id="path4068-7-5-9-6-5-8" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#cc575d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="m 414,58 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 414,63.867188 415.73438,62.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.6875 C 416.9302,66.77394 416.99999,66.9729 417,67.171875 l 0,0.75 -0.75,0 c -0.19898,-8e-6 -0.39794,-0.06982 -0.53906,-0.210937 L 414,66 l -1.71094,1.710938 c -0.14112,0.141142 -0.34009,0.210937 -0.53906,0.210937 l -0.75,0 0,-0.75 c 0,-0.198967 0.0698,-0.397935 0.21094,-0.539063 l 1.71094,-1.6875 -1.71094,-1.710937 C 411.05288,63.088403 410.98357,62.882438 411,62.671875 l 0,-0.75 z"
+               transform="translate(962.00001,190.00002)"
+               id="path4068-7-5-9-6-5-8-5" />
           </g>
         </g>
         <g
-           id="g4778-2-68-8-7"
+           id="g4778-2-68-8-7-9"
            transform="translate(1323,246.86719)"
            style="fill:#ffffff;fill-opacity:1">
           <g
              style="display:inline;fill:#ffffff;fill-opacity:1"
-             id="layer9-9-4-4-1-1"
+             id="layer9-9-4-4-1-1-7"
              transform="translate(-60,-518)" />
           <g
-             id="layer10-2-1-8-0-4"
+             id="layer10-2-1-8-0-4-4"
              transform="translate(-60,-518)"
              style="fill:#ffffff;fill-opacity:1" />
           <g
-             id="layer11-16-4-9-6-9"
+             id="layer11-16-4-9-6-9-0"
              transform="translate(-60,-518)"
              style="fill:#ffffff;fill-opacity:1" />
           <g
              transform="matrix(0.75,0,0,0.75,2,2.0546875)"
-             id="g2996-76-5-96-3"
+             id="g2996-76-5-96-3-7"
              style="fill:#ffffff;fill-opacity:1">
             <g
                transform="translate(-60,-518)"
-               id="layer12-4-5-7-9-4"
+               id="layer12-4-5-7-9-4-5"
                style="fill:#ffffff;fill-opacity:1">
               <g
                  transform="translate(19,-242)"
-                 id="layer4-4-1-9-5-6-3"
-                 style="display:inline;fill:#ffffff;fill-opacity:1">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
-                   id="path10839-9-2-2-7-9"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-              </g>
+                 id="layer4-4-1-9-5-6-3-8"
+                 style="display:inline;fill:#ffffff;fill-opacity:1" />
             </g>
           </g>
           <g
-             id="layer13-2-6-11-3-1"
+             id="layer13-2-6-11-3-1-6"
              transform="translate(-60,-518)"
              style="fill:#ffffff;fill-opacity:1" />
           <g
-             id="layer14-4-0-33-2-4"
+             id="layer14-4-0-33-2-4-8"
              transform="translate(-60,-518)"
              style="fill:#ffffff;fill-opacity:1" />
           <g
-             id="layer15-7-3-0-6-6"
+             id="layer15-7-3-0-6-6-3"
              transform="translate(-60,-518)"
              style="fill:#ffffff;fill-opacity:1" />
         </g>
@@ -213,7 +207,7 @@
          x="645"
          height="16"
          width="16"
-         id="rect17883-39-99-8"
+         id="rect17883-39-99-8-8"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
     </g>
   </g>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg
index 748830f..852b85a 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -150,11 +150,11 @@
              id="g4092-0-2-3-4-6"
              style="display:inline"
              transform="translate(58,0)">
-            <circle
-               r="7"
-               cy="255"
-               cx="1376"
-               style="fill:#f48085;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#d7787d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="m 414,92 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 414,97.867188 415.73438,96.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.687498 c 0.14114,0.14113 0.21093,0.34009 0.21094,0.53907 l 0,0.75 -0.75,0 c -0.19898,-1e-5 -0.39794,-0.0698 -0.53906,-0.21094 L 414,100 l -1.71094,1.71094 c -0.14112,0.14114 -0.34009,0.21094 -0.53906,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.687498 -1.71094,-1.710937 C 411.05288,97.088403 410.98357,96.882438 411,96.671875 l 0,-0.75 z"
+               transform="translate(962,156.00002)"
                id="path4068-7-5-8-2-3" />
           </g>
         </g>
@@ -185,13 +185,7 @@
               <g
                  transform="translate(19,-242)"
                  id="layer4-4-1-3-3-7"
-                 style="display:inline;fill:#ffffff;fill-opacity:1">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
-                   id="path10839-9-5-0-4"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-              </g>
+                 style="display:inline;fill:#ffffff;fill-opacity:1" />
             </g>
           </g>
           <g
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_pressed.svg
index 1a7cdfd..349692a 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_pressed.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -137,7 +137,7 @@
        style="display:inline"
        id="titlebutton-close-active-dark"
        inkscape:label="#g6332"
-       transform="translate(-437,1218)">
+       transform="translate(-437.00001,1218)">
       <g
          id="g4927-8-7-4-9"
          style="display:inline;opacity:1"
@@ -150,11 +150,11 @@
              id="g4092-0-2-2-1-7-2"
              style="display:inline"
              transform="translate(58,0)">
-            <circle
-               r="7"
-               cy="255"
-               cx="1376"
-               style="fill:#e6262f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#be3841;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="m 414,109 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.92188 0.75,0 c 0.008,-1e-4 0.0156,-3.5e-4 0.0234,0 0.19121,0.008 0.3824,0.0964 0.51562,0.23437 l 1.71094,1.71094 1.73438,-1.71094 c 0.19921,-0.17287 0.335,-0.22913 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0258,0.41298 -0.1875,0.5625 l -1.71094,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21094,0.53907 l 0,0.75 -0.75,0 c -0.19898,-1e-5 -0.39794,-0.0698 -0.53906,-0.21094 L 414,117 l -1.71094,1.71094 c -0.14112,0.14114 -0.34009,0.21094 -0.53906,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15806,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z"
+               transform="translate(962.00001,139.00001)"
                id="path4068-7-5-4-9-7-6" />
           </g>
         </g>
@@ -185,13 +185,7 @@
               <g
                  transform="translate(19,-242)"
                  id="layer4-4-1-4-1-7-0"
-                 style="display:inline;fill:#ffffff;fill-opacity:1">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
-                   id="path10839-9-8-7-6-8"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-              </g>
+                 style="display:inline;fill:#ffffff;fill-opacity:1" />
             </g>
           </g>
           <g
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize.svg
index 057ecc7..e2036d7 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -134,22 +134,10 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       style="display:inline"
+       style="display:inline;opacity:0.7"
        id="titlebutton-max-dark"
        inkscape:label="#g6234"
-       transform="translate(-612,1218)">
-      <ellipse
-         cy="-177.63782"
-         cx="624"
-         style="display:inline;opacity:0.85;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4068-7-5-9-6-7-2-6-0-6"
-         rx="6"
-         ry="6.0000005" />
-      <path
-         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 624,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
-         id="path4068-7-5-9-6-7-2-5-2-0-6"
-         inkscape:connector-curvature="0" />
+       transform="translate(-612.00002,1218)">
       <g
          id="g7146-16-4"
          style="display:inline;opacity:1"
@@ -165,7 +153,7 @@
         </g>
         <path
            id="path4293-5-95-1-7"
-           style="display:inline;opacity:0.8;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:1;fill:#b9bcc2;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg
index 6a420b9..9be9958 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -145,12 +145,12 @@
         <ellipse
            cy="255"
            cx="1302"
-           style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.45;fill:#5f697f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-4-6-6"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.37000002;fill:#15171c;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1302,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-78-2-6"
            inkscape:connector-curvature="0" />
@@ -207,7 +207,7 @@
                sodipodi:nodetypes="csscccsscc"
                inkscape:connector-curvature="0"
                d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-               style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-6-7-1" />
           </g>
         </g>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg
index 326ae8d..6974699 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -111,10 +111,6 @@
        orientation="1,0"
        position="12,12"
        id="guide4316" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="12,12"
-       id="guide4318" />
   </sodipodi:namedview>
   <metadata
      id="metadata4311">
@@ -135,9 +131,96 @@
      transform="translate(0,-1028.3622)">
     <g
        style="display:inline"
+       id="titlebutton-max-hover-dark"
+       inkscape:label="#g6284"
+       transform="translate(-509,1218)">
+      <g
+         id="g4891-5-8"
+         style="display:inline;opacity:1"
+         transform="translate(-781,-432.63782)">
+        <ellipse
+           cy="255"
+           cx="1302"
+           style="display:inline;opacity:0.45;fill:#5f697f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path4068-7-5-9-6-7-2-4-6-6"
+           rx="6"
+           ry="6.0000005" />
+        <path
+           style="display:inline;opacity:0.37000002;fill:#15171c;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1302,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
+           id="path4068-7-5-9-6-7-2-5-78-2-6"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g4806-9-0-6"
+           transform="translate(1294,247)"
+           style="fill:#c0e3ff;fill-opacity:1">
+          <g
+             transform="translate(-81.0002,-967)"
+             style="display:inline;fill:#c0e3ff;fill-opacity:1"
+             inkscape:label="status"
+             id="layer9-78-7-6-6" />
+          <g
+             transform="translate(-81.0002,-967)"
+             inkscape:label="devices"
+             id="layer10-3-3-2-7"
+             style="fill:#c0e3ff;fill-opacity:1" />
+          <g
+             transform="translate(-81.0002,-967)"
+             inkscape:label="apps"
+             id="layer11-19-75-1-2"
+             style="fill:#c0e3ff;fill-opacity:1" />
+          <g
+             transform="translate(-81.0002,-967)"
+             inkscape:label="places"
+             id="layer13-4-9-2-3"
+             style="fill:#c0e3ff;fill-opacity:1" />
+          <g
+             transform="translate(-81.0002,-967)"
+             inkscape:label="mimetypes"
+             id="layer14-8-5-0-4"
+             style="fill:#c0e3ff;fill-opacity:1" />
+          <g
+             transform="translate(-81.0002,-967)"
+             style="display:inline;fill:#c0e3ff;fill-opacity:1"
+             inkscape:label="emblems"
+             id="layer15-5-8-0-4" />
+          <g
+             transform="translate(-81.0002,-967)"
+             style="display:inline;fill:#c0e3ff;fill-opacity:1"
+             inkscape:label="emotes"
+             id="g71291-1-7-5-9" />
+          <g
+             transform="translate(-81.0002,-967)"
+             style="display:inline;fill:#c0e3ff;fill-opacity:1"
+             inkscape:label="categories"
+             id="g4953-7-1-4-1" />
+          <g
+             transform="translate(-81.0002,-967)"
+             style="display:inline;fill:#c0e3ff;fill-opacity:1"
+             inkscape:label="actions"
+             id="layer12-3-0-0-6">
+            <path
+               sodipodi:nodetypes="csscccsscc"
+               inkscape:connector-curvature="0"
+               d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
+               style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               id="path4293-6-7-1" />
+          </g>
+        </g>
+      </g>
+      <rect
+         y="-185.63782"
+         x="513"
+         height="16"
+         width="16"
+         id="rect17883-0-1-5"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
+    </g>
+    <g
+       style="display:inline"
        id="titlebutton-max-active-dark"
        inkscape:label="#g6356"
-       transform="translate(-408,1218)">
+       transform="translate(-408.00001,1218)">
       <g
          id="g4891-4-5-5"
          style="display:inline;opacity:1"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize.svg
index 45ae2cb..480c900 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -111,10 +111,6 @@
        orientation="1,0"
        position="12,12"
        id="guide4316" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="12,12"
-       id="guide4318" />
   </sodipodi:namedview>
   <metadata
      id="metadata4311">
@@ -134,17 +130,10 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       style="display:inline"
+       style="display:inline;opacity:0.7"
        id="titlebutton-min-dark"
        inkscape:label="#g6247"
        transform="translate(-583.00002,1218)">
-      <ellipse
-         cy="-177.63782"
-         cx="595"
-         style="display:inline;opacity:0.85;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4068-7-5-9-6-7-2-47-2"
-         rx="6"
-         ry="6.0000005" />
       <g
          id="g7138-6-5"
          style="display:inline;opacity:1"
@@ -162,7 +151,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-3-8-5"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b9bcc2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -172,11 +161,6 @@
          width="16"
          id="rect17883-32-6-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
-      <path
-         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 595,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
-         id="path4068-7-5-9-6-7-2-5-3-9"
-         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg
index 5c12c91..d029d16 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg
@@ -14,7 +14,7 @@
    id="svg4306"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="minimize_focused_prelight.svg"
+   sodipodi:docname="minimize_prelight.svg"
    style="enable-background:new">
   <defs
      id="defs4308">
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -111,10 +111,6 @@
        orientation="1,0"
        position="12,12"
        id="guide4316" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="12,12"
-       id="guide4318" />
   </sodipodi:namedview>
   <metadata
      id="metadata4311">
@@ -145,12 +141,12 @@
         <ellipse
            cy="255"
            cx="1273"
-           style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.45;fill:#5f697f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-1-6-1"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.37000002;fill:#15171c;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1273,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-23-4-3"
            inkscape:connector-curvature="0" />
@@ -205,7 +201,7 @@
              id="layer12-45-6-2-7">
             <path
                sodipodi:nodetypes="ccccc"
-               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c4c7cc;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                id="rect9057-8-2-3"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                inkscape:connector-curvature="0" />
diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg
index be0af55..f88d4f0 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg
@@ -14,7 +14,7 @@
    id="svg4306"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="minimize_focused_pressed.svg"
+   sodipodi:docname="minimize_pressed.svg"
    style="enable-background:new">
   <defs
      id="defs4308">
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1889683"
-     inkscape:cy="9.2440344"
+     inkscape:zoom="22.627418"
+     inkscape:cx="4.6255954"
+     inkscape:cy="10.407616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -111,10 +111,6 @@
        orientation="1,0"
        position="12,12"
        id="guide4316" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="12,12"
-       id="guide4318" />
   </sodipodi:namedview>
   <metadata
      id="metadata4311">
@@ -137,7 +133,7 @@
        style="display:inline"
        id="titlebutton-min-active-dark"
        inkscape:label="#g6414"
-       transform="translate(-379,1218)">
+       transform="translate(-379.00001,1218)">
       <g
          id="g4909-1-2-0"
          style="display:inline;opacity:1"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-end.svg b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-end.svg
index 52289a9..5143022 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-end.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-end.svg
@@ -38,9 +38,9 @@
      inkscape:window-height="1052"
      id="namedview16"
      showgrid="true"
-     inkscape:zoom="7.6129032"
-     inkscape:cx="-10.161981"
-     inkscape:cy="-1.6586208"
+     inkscape:zoom="15.225806"
+     inkscape:cx="0.17945867"
+     inkscape:cy="9.8157373"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1f2226;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-middle.svg b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-middle.svg
index 91ae573..0fae91a 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-middle.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-middle.svg
@@ -39,7 +39,7 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="21.532542"
-     inkscape:cx="8.110082"
+     inkscape:cx="-16.619929"
      inkscape:cy="30.597364"
      inkscape:window-x="0"
      inkscape:window-y="23"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1f2226;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-start.svg b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-start.svg
index 9e33abc..a6d0c1a 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-start.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/darker/tabs/tab-start.svg
@@ -39,8 +39,8 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="10.766271"
-     inkscape:cx="-2.4351641"
-     inkscape:cy="3.8082735"
+     inkscape:cx="27.751704"
+     inkscape:cy="11.238887"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -65,7 +65,7 @@
      ry="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#1f2226;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#252a33;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-end.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-end.svg
index 1e492e4..50f3b58 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-end.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-end.svg
@@ -39,7 +39,7 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="21.532542"
-     inkscape:cx="11.87183"
+     inkscape:cx="3.628493"
      inkscape:cy="0.87490949"
      inkscape:window-x="0"
      inkscape:window-y="23"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#cdd0d6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#d5d6dc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-middle.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-middle.svg
index 297ea86..83a885b 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-middle.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-middle.svg
@@ -12,7 +12,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="tabActiveMiddle.svg">
+   sodipodi:docname="tab-middle.svg">
   <metadata
      id="metadata18">
     <rdf:RDF>
@@ -21,7 +21,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -39,7 +39,7 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="21.532542"
-     inkscape:cx="16.353419"
+     inkscape:cx="8.110082"
      inkscape:cy="30.597364"
      inkscape:window-x="0"
      inkscape:window-y="23"
@@ -66,7 +66,7 @@
      rx="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#cdd0d6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#d5d6dc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-start.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-start.svg
index 1cb8b10..96576ec 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-start.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-start.svg
@@ -39,7 +39,7 @@
      id="namedview16"
      showgrid="true"
      inkscape:zoom="60.903226"
-     inkscape:cx="13.251794"
+     inkscape:cx="10.337334"
      inkscape:cy="3.0056555"
      inkscape:window-x="0"
      inkscape:window-y="23"
@@ -65,7 +65,7 @@
      ry="0.5" />
   <rect
      rx="1"
-     style="fill:none;fill-opacity:1;stroke:#cdd0d6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     style="fill:none;fill-opacity:1;stroke:#d5d6dc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="rect3837-9"
      width="45"
      height="35"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close.svg
index 1f647b6..4241adc 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="22.627418"
+     inkscape:cx="12.382889"
+     inkscape:cy="11.054563"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -124,7 +124,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -150,11 +150,11 @@
              id="g4092-0-2-21-0"
              style="display:inline"
              transform="translate(58,0)">
-            <circle
-               r="7"
-               cy="255"
-               cx="1376"
-               style="fill:#f37076;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#f46067;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="m 172,58 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 172,63.867188 173.73438,62.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.6875 C 174.9302,66.77394 174.99999,66.9729 175,67.171875 l 0,0.75 -0.75,0 c -0.19898,-8e-6 -0.39794,-0.06982 -0.53906,-0.210937 L 172,66 l -1.71094,1.710938 c -0.14112,0.141142 -0.34009,0.210937 -0.53906,0.210937 l -0.75,0 0,-0.75 c 0,-0.198967 0.0698,-0.397935 0.21094,-0.539063 l 1.71094,-1.6875 -1.71094,-1.710937 C 169.05288,63.088403 168.98357,62.882438 169,62.671875 l 0,-0.75 z"
+               transform="translate(1204,190)"
                id="path4068-7-5-9-6" />
           </g>
         </g>
@@ -185,13 +185,7 @@
               <g
                  transform="translate(19,-242)"
                  id="layer4-4-1-9-5"
-                 style="display:inline;fill:#ffffff;fill-opacity:1">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
-                   id="path10839-9-2-2"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-              </g>
+                 style="display:inline;fill:#ffffff;fill-opacity:1" />
             </g>
           </g>
           <g
@@ -215,6 +209,11 @@
          width="16"
          id="rect17883-39"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 650.00003,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 l -1.71094,-1.71094 -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z"
+         id="path10839-9-2-2-7-9-7"
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg
index 879400d..6f2670e 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="22.627418"
+     inkscape:cx="12.382889"
+     inkscape:cy="11.054563"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -150,11 +150,11 @@
              id="g4092-0-2-3"
              style="display:inline"
              transform="translate(58,0)">
-            <circle
-               r="7"
-               cy="255"
-               cx="1376"
-               style="fill:#f79da1;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#f68086;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               d="m 172,92 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m -3,3.921875 0.75,0 c 0.008,-9e-5 0.0156,-3.45e-4 0.0234,0 0.19121,0.0084 0.3824,0.09643 0.51562,0.234375 L 172,97.867188 173.73438,96.15625 c 0.19921,-0.172875 0.335,-0.229125 0.51562,-0.234375 l 0.75,0 0,0.75 c 0,0.214853 -0.0258,0.412987 -0.1875,0.5625 l -1.71094,1.710937 1.6875,1.687498 c 0.14114,0.14113 0.21093,0.34009 0.21094,0.53907 l 0,0.75 -0.75,0 c -0.19898,-1e-5 -0.39794,-0.0698 -0.53906,-0.21094 L 172,100 l -1.71094,1.71094 c -0.14112,0.14114 -0.34009,0.21094 -0.53906,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.687498 -1.71094,-1.710937 C 169.05288,97.088403 168.98357,96.882438 169,96.671875 l 0,-0.75 z"
+               transform="translate(1204,156)"
                id="path4068-7-5-8" />
           </g>
         </g>
@@ -185,13 +185,7 @@
               <g
                  transform="translate(19,-242)"
                  id="layer4-4-1-3"
-                 style="display:inline;fill:#ffffff;fill-opacity:1">
-                <path
-                   inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
-                   id="path10839-9-5"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-              </g>
+                 style="display:inline;fill:#ffffff;fill-opacity:1" />
             </g>
           </g>
           <g
@@ -215,6 +209,11 @@
          width="16"
          id="rect17883-5"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 547.00004,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 L 550,-176.63782 l -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z"
+         id="path10839-9-2-2-7-9-7-4-9"
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg
index 9f0fe17..0365887 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="1"
+     inkscape:cx="13.034303"
+     inkscape:cy="10.832259"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -154,7 +154,7 @@
                r="7"
                cy="255"
                cx="1376"
-               style="fill:#ef4048;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               style="fill:#f13039;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                id="path4068-7-5-4-9" />
           </g>
         </g>
@@ -188,7 +188,7 @@
                  style="display:inline;fill:#ffffff;fill-opacity:1">
                 <path
                    inkscape:connector-curvature="0"
-                   d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
+                   d="m 45.001573,764.10442 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z"
                    id="path10839-9-8-7"
                    style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
               </g>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg
index c2a642d..5da027c 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -134,22 +134,10 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       style="display:inline"
        id="titlebutton-max"
        inkscape:label="#g6234"
-       transform="translate(-612,1218)">
-      <ellipse
-         cy="-177.63782"
-         cx="624"
-         style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4068-7-5-9-6-7-2-6"
-         rx="6"
-         ry="6.0000005" />
-      <path
-         style="display:inline;opacity:0.1;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 624,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
-         id="path4068-7-5-9-6-7-2-5-2"
-         inkscape:connector-curvature="0" />
+       transform="translate(-612,1218)"
+       style="display:inline;opacity:0.8">
       <g
          id="g7146"
          style="display:inline;opacity:1"
@@ -165,7 +153,7 @@
         </g>
         <path
            id="path4293-5-95"
-           style="display:inline;opacity:0.8;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:1;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg
index 90ef47c..a530d48 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -145,12 +145,12 @@
         <ellipse
            cy="255"
            cx="1302"
-           style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-4"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.15;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1302,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-78"
            inkscape:connector-curvature="0" />
@@ -207,7 +207,7 @@
                sodipodi:nodetypes="csscccsscc"
                inkscape:connector-curvature="0"
                d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-               style="opacity:1;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="opacity:1;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-6" />
           </g>
         </g>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg
index 549401c..c2f869b 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg
index 5c2cecd..78a5356 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -134,17 +134,10 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       style="display:inline"
        id="titlebutton-min"
        inkscape:label="#g6247"
-       transform="translate(-583,1218)">
-      <ellipse
-         cy="-177.63782"
-         cx="595"
-         style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4068-7-5-9-6-7-2"
-         rx="6"
-         ry="6.0000005" />
+       transform="translate(-583,1218)"
+       style="display:inline;opacity:0.8">
       <g
          id="g7138"
          style="display:inline;opacity:1"
@@ -162,7 +155,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-3"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7a7f8b;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -172,11 +165,6 @@
          width="16"
          id="rect17883-32"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
-      <path
-         style="display:inline;opacity:0.1;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 595,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
-         id="path4068-7-5-9-6-7-2-5"
-         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg
index 93d5baf..5d9de25 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg
@@ -14,7 +14,7 @@
    id="svg4306"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="minimize_focused_prelight.svg"
+   sodipodi:docname="minimize_prelight.svg"
    style="enable-background:new">
   <defs
      id="defs4308">
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -145,12 +145,12 @@
         <ellipse
            cy="255"
            cx="1273"
-           style="display:inline;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-1"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.15;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1273,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-23"
            inkscape:connector-curvature="0" />
@@ -205,7 +205,7 @@
              id="layer12-45-6">
             <path
                sodipodi:nodetypes="ccccc"
-               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7a7f8b;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                id="rect9057-8"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                inkscape:connector-curvature="0" />
diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg
index fe9ebee..588536a 100644
--- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg
+++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg
@@ -14,7 +14,7 @@
    id="svg4306"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="minimize_focused_pressed.svg"
+   sodipodi:docname="minimize_pressed.svg"
    style="enable-background:new">
   <defs
      id="defs4308">
@@ -81,9 +81,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="9.1908305"
-     inkscape:cy="9.2459508"
+     inkscape:zoom="45.254834"
+     inkscape:cx="12.734727"
+     inkscape:cy="10.911658"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index 5de59e3..4557663 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -23,7 +23,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path);
 :root {
   --toolbarbutton-hover-background: $button_bg;
   --toolbarbutton-hover-boxshadow: none;
-  --toolbarbutton-hover-bordercolor: $selected_bg_color;
+  --toolbarbutton-hover-bordercolor: $button_border;
 
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: $selected_bg_color;
@@ -83,7 +83,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path);
 }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  border-top: 1px solid darken($header_border, 3%) !important;
+  border-top: 1px solid $header_border !important;
   background-clip: padding-box;
   margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
   /* Position the toolbar above the bottom of background tabs */
@@ -2092,9 +2092,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   background-color: transparent;
   background-clip: padding-box;
   padding-left: 1px;
-  border-width: 0 8px 0 0;
+  padding-right: 4px;
+  border-width: 0 1px 0 0;
   border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
+  border-color: $borders_color;
+  //border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
   //-moz-margin-end: -8px;
 }
 
@@ -2299,7 +2301,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
   #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
+    //border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
   }
 
   .notification-anchor-icon {
diff --git a/arc-firefox-theme/chrome/browser/sass/_colors.scss b/arc-firefox-theme/chrome/browser/sass/_colors.scss
index 9c51858..47daa0f 100644
--- a/arc-firefox-theme/chrome/browser/sass/_colors.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_colors.scss
@@ -2,15 +2,15 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant =='light', #ffffff, #383C45);
+$base_color: if($variant =='light', #ffffff, #404552);
 $text_color: if($variant == 'light', #5c616c, #D3DAE3);
-$bg_color: if($variant =='light', #F5F6F7, #444852);
+$bg_color: if($variant =='light', #F5F6F7, #383C4A);
 $fg_color: if($variant =='light', #5c616c, #D3DAE3);
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: #5294E2;
 $selected_borders_color: darken($selected_bg_color, 20%);
-$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%));
+$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
 
 $link_color: if($variant == 'light', darken($selected_bg_color,10%),
                                      lighten($selected_bg_color,20%));
@@ -28,63 +28,67 @@ $suggested_color: #4DADD4;
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
 $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
-
-$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
-$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
-
-$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
-$button_border: $entry_border;
-
 $header_bg: red;
 @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); }
 @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; }
-@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); }
-@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; }
+@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); }
+@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; }
 
 $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%));
 
-$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));
+$header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%));
 
 $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
 $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg);
 
-$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049);
+$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945);
 $dark_sidebar_fg: #BAC3CF;
-$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%));
+$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%));
 
 $osd_fg_color: $dark_sidebar_fg;
-$osd_bg_color: darken($dark_sidebar_bg, 8%);
+$osd_bg_color: $dark_sidebar_bg;
+
+$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
+$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);
+
+$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
+$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6);
 
 $osd_insensitive_bg_color: darken($osd_bg_color, 3%);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$panel_bg: darken($osd_bg_color, 4.7%);
-$panel_fg: $osd_fg_color;
+$panel_bg: darken($dark_sidebar_bg, 4.7%);
+$panel_fg: $dark_sidebar_fg;
+
+$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
+$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
+
+$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1));
+$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
+
+$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
+$button_border: $entry_border;
+
+$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1));
+$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
 
 //WM Buttons
 
 // Close
-$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65);
-$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085);
-$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f);
+$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841);
 
-$wm_icon_close_bg: $selected_fg_color;
-$wm_icon_close_hover_bg: $selected_fg_color;
-$wm_icon_close_active_bg: $selected_fg_color;
+$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f);
 
 // Minimize, Maximize
-$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
-$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035);
-$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C);
 $wm_button_active_bg: $selected_bg_color;
 
-$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21);
-$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328);
-$wm_button_hover_border: $selected_bg_color;
-$wm_button_active_border: $selected_bg_color;
+$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932);
 
-$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8);
-$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78);
-$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5);
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC);
 $wm_icon_active_bg: $selected_fg_color;
diff --git a/arc-firefox-theme/chrome/browser/sass/_drawing.scss b/arc-firefox-theme/chrome/browser/sass/_drawing.scss
index cd263c5..a4f95c4 100644
--- a/arc-firefox-theme/chrome/browser/sass/_drawing.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_drawing.scss
@@ -2,26 +2,35 @@
 
 // Entries
 
-@mixin entry($t, $dark:false) {
+@mixin entry($t) {
 //
 // Entries drawing function
 //
-  //@extend %reset_style;
-    box-shadow: inset 0 0 transparentize($base_color, 1);
+// $t: entry type
+//
 
   @if $t==normal {
+  //
+  // normal entry
+  //
     color: $text_color;
     background-color: $entry_bg;
     border: 1px solid $entry_border;
   }
 
   @if $t==focus {
+  //
+  // focused entry
+  //
     color: $fg_color;
     background-color: $entry_bg;
     border: 1px solid $selected_bg_color;
   }
 
   @if $t==insensitive {
+  //
+  // insensitive entry
+  //
     color: $insensitive_fg_color;
     background-color: mix($entry_bg, $bg_color, 55%);
     border-color: 1px solid mix($entry_border, $bg_color, 55%);
@@ -44,31 +53,13 @@
     border: 1px solid $button_border;
   }
 
-  @else if $t==focus {
-  //
-  // focused button
-  //
-    color: $fg_color;
-    background-color: $button_bg;
-    border: 1px solid $selected_bg_color;
-  }
-
-  @else if $t==focus-hover {
-  //
-  // focused button
-  //
-    color: $selected_bg_color;
-    background-color: $button_bg;
-    border: 1px solid $selected_bg_color;
-  }
-
   @else if $t==hover {
   //
   // hovered button
   //
     color: $fg_color;
-    background-color: $button_bg;
-    border: 1px solid $selected_bg_color;
+    background-color: lighten($button_bg, 5%);
+    border: 1px solid $button_border;
   }
 
   @else if $t==active {
@@ -89,9 +80,6 @@
     background-color: transparentize($button_bg, 0.45);
   }
 
-  $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1));
-  $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7));
-
   @if $t==header-normal {
   //
   // normal header-bar button
@@ -106,8 +94,8 @@
   // hovered header-bar button
   //
     color: $header_fg;
-    border-color: $_header_button_border;
-    background-color: $_header_button_bg;
+    border-color: $header_button_border;
+    background-color: $header_button_bg;
   }
 
   @else if $t==header-active {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index a7f3d04..941934a 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -6,9 +6,9 @@
  * 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/. */
 :root {
-  --toolbarbutton-hover-background: #3d414b;
+  --toolbarbutton-hover-background: #444a58;
   --toolbarbutton-hover-boxshadow: none;
-  --toolbarbutton-hover-bordercolor: #5294E2;
+  --toolbarbutton-hover-bordercolor: #2b2e39;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: #5294E2;
   --toolbarbutton-active-background: #5294E2;
@@ -36,12 +36,12 @@
   -moz-box-ordinal-group: 101;
   /* tabs toolbar is 100 */
   height: 1px;
-  background-color: #2d3036; }
+  background-color: #2b2e39; }
 
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
-  background-color: #444852; }
+  background-color: #383C4A; }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   padding-top: 1px;
@@ -58,7 +58,7 @@
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  border-top: 1px solid rgba(29, 32, 36, 0.97) !important;
+  border-top: 1px solid rgba(38, 42, 51, 0.97) !important;
   background-clip: padding-box;
   margin-top: -1px;
   /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
@@ -67,11 +67,11 @@
   z-index: 1; }
 
 #main-window[htitlemode=always] #TabsToolbar {
-  box-shadow: inset 0 1px rgba(54, 60, 68, 0.97) !important; }
+  box-shadow: inset 0 1px rgba(54, 59, 72, 0.97) !important; }
 
 #nav-bar {
   background-image: none !important;
-  background-color: #444852 !important;
+  background-color: #383C4A !important;
   box-shadow: none;
   padding-top: 3px;
   padding-bottom: 3px; }
@@ -137,8 +137,8 @@ toolbarbutton.bookmark-item {
 toolbarbutton.bookmark-item:not([disabled=true]):hover {
   -moz-appearance: none;
   color: #D3DAE3;
-  background-color: #3d414b;
-  border: 1px solid #5294E2; }
+  background-color: #505666;
+  border: 1px solid #2b2e39; }
 
 toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   -moz-appearance: none;
@@ -544,8 +544,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 #TabsToolbar .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon {
   background-color: none;
   color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(29, 32, 36, 0.97);
-  background-color: rgba(40, 44, 50, 0.87); }
+  border-color: rgba(21, 23, 28, 0.37);
+  background-color: rgba(95, 105, 127, 0.37); }
 
 .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon,
@@ -1278,16 +1278,14 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   padding: 3px;
   border-radius: 3px;
   margin: 0 3px;
-  box-shadow: inset 0 0 rgba(56, 60, 69, 0);
   color: #D3DAE3;
-  background-color: #383c45;
-  border: 1px solid #2d3036; }
+  background-color: #404552;
+  border: 1px solid #2b2e39; }
 
 #urlbar[focused],
 .searchbar-textbox[focused] {
-  box-shadow: inset 0 0 rgba(56, 60, 69, 0);
   color: #D3DAE3;
-  background-color: #383c45;
+  background-color: #404552;
   border: 1px solid #5294E2; }
 
 .searchbar-textbox {
@@ -1547,9 +1545,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   background-color: transparent;
   background-clip: padding-box;
   padding-left: 1px;
-  border-width: 0 8px 0 0;
+  padding-right: 4px;
+  border-width: 0 1px 0 0;
   border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; }
+  border-color: #2b2e39; }
 
 #notification-popup-box:-moz-locale-dir(rtl),
 .notification-anchor-icon:-moz-locale-dir(rtl) {
@@ -1708,9 +1707,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill; }
-
   .notification-anchor-icon {
     list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
 
@@ -2198,17 +2194,17 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Findbar */
 .browserContainer > findbar {
-  background-color: #444852;
+  background-color: #383C4A;
   color: #D3DAE3;
   border-top: 1px solid;
-  -moz-border-top-colors: #2d3036;
+  -moz-border-top-colors: #2b2e39;
   text-shadow: none; }
 
 .browserContainer > findbar .findbar-textbox {
   -moz-appearance: none;
   color: #D3DAE3;
-  border: 1px solid #2d3036;
-  background-color: #383c45;
+  border: 1px solid #2b2e39;
+  background-color: #404552;
   box-shadow: none;
   margin: 0;
   padding: 5px;
@@ -2235,8 +2231,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .browserContainer > findbar .findbar-find-previous,
 .browserContainer > findbar .findbar-find-next {
-  background: #3d414b;
-  border: 1px solid #2d3036;
+  background: #444a58;
+  border: 1px solid #2b2e39;
   box-shadow: none; }
 
 .browserContainer > findbar .findbar-find-previous {
@@ -2527,7 +2523,7 @@ lwtHeader;*/
 #TabsToolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
   color: rgba(207, 218, 231, 0.8);
-  background: #2f343b; }
+  background: #2f343f; }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index 3a5c545..f797f4a 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -8,7 +8,7 @@
 :root {
   --toolbarbutton-hover-background: #fbfbfc;
   --toolbarbutton-hover-boxshadow: none;
-  --toolbarbutton-hover-bordercolor: #5294E2;
+  --toolbarbutton-hover-bordercolor: #cfd6e6;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: #5294E2;
   --toolbarbutton-active-background: #5294E2;
@@ -58,7 +58,7 @@
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  border-top: 1px solid rgba(24, 27, 31, 0.97) !important;
+  border-top: 1px solid rgba(38, 42, 51, 0.97) !important;
   background-clip: padding-box;
   margin-top: -1px;
   /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
@@ -67,7 +67,7 @@
   z-index: 1; }
 
 #main-window[htitlemode=always] #TabsToolbar {
-  box-shadow: inset 0 1px rgba(54, 60, 68, 0.97) !important; }
+  box-shadow: inset 0 1px rgba(54, 59, 72, 0.97) !important; }
 
 #nav-bar {
   background-image: none !important;
@@ -137,8 +137,8 @@ toolbarbutton.bookmark-item {
 toolbarbutton.bookmark-item:not([disabled=true]):hover {
   -moz-appearance: none;
   color: #5c616c;
-  background-color: #fbfbfc;
-  border: 1px solid #5294E2; }
+  background-color: white;
+  border: 1px solid #cfd6e6; }
 
 toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   -moz-appearance: none;
@@ -544,8 +544,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 #TabsToolbar .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon {
   background-color: none;
   color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(29, 32, 36, 0.97);
-  background-color: rgba(40, 44, 50, 0.87); }
+  border-color: rgba(21, 23, 28, 0.37);
+  background-color: rgba(95, 105, 127, 0.37); }
 
 .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon,
@@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   padding: 3px;
   border-radius: 3px;
   margin: 0 3px;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
 
 #urlbar[focused],
 .searchbar-textbox[focused] {
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #5294E2; }
@@ -1547,9 +1545,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   background-color: transparent;
   background-clip: padding-box;
   padding-left: 1px;
-  border-width: 0 8px 0 0;
+  padding-right: 4px;
+  border-width: 0 1px 0 0;
   border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; }
+  border-color: #dcdfe3; }
 
 #notification-popup-box:-moz-locale-dir(rtl),
 .notification-anchor-icon:-moz-locale-dir(rtl) {
@@ -1708,9 +1707,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill; }
-
   .notification-anchor-icon {
     list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
 
@@ -2527,7 +2523,7 @@ lwtHeader;*/
 #TabsToolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
   color: rgba(207, 218, 231, 0.8);
-  background: #2f343b; }
+  background: #2f343f; }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 82fc9e9..b7cd533 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -8,7 +8,7 @@
 :root {
   --toolbarbutton-hover-background: #fbfbfc;
   --toolbarbutton-hover-boxshadow: none;
-  --toolbarbutton-hover-bordercolor: #5294E2;
+  --toolbarbutton-hover-bordercolor: #cfd6e6;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: #5294E2;
   --toolbarbutton-active-background: #5294E2;
@@ -58,7 +58,7 @@
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  border-top: 1px solid rgba(203, 205, 212, 0.95) !important;
+  border-top: 1px solid rgba(212, 213, 219, 0.95) !important;
   background-clip: padding-box;
   margin-top: -1px;
   /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
@@ -137,8 +137,8 @@ toolbarbutton.bookmark-item {
 toolbarbutton.bookmark-item:not([disabled=true]):hover {
   -moz-appearance: none;
   color: #5c616c;
-  background-color: #fbfbfc;
-  border: 1px solid #5294E2; }
+  background-color: white;
+  border: 1px solid #cfd6e6; }
 
 toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) {
   -moz-appearance: none;
@@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   padding: 3px;
   border-radius: 3px;
   margin: 0 3px;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #cfd6e6; }
 
 #urlbar[focused],
 .searchbar-textbox[focused] {
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
   border: 1px solid #5294E2; }
@@ -1547,9 +1545,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   background-color: transparent;
   background-clip: padding-box;
   padding-left: 1px;
-  border-width: 0 8px 0 0;
+  padding-right: 4px;
+  border-width: 0 1px 0 0;
   border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; }
+  border-color: #dcdfe3; }
 
 #notification-popup-box:-moz-locale-dir(rtl),
 .notification-anchor-icon:-moz-locale-dir(rtl) {
@@ -1708,9 +1707,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
     transform: translateX(0); } }
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
-  #notification-popup-box {
-    border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill; }
-
   .notification-anchor-icon {
     list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); }
 
diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf
index 691724a..9e51772 100644
--- a/arc-firefox-theme/install.rdf
+++ b/arc-firefox-theme/install.rdf
@@ -5,17 +5,13 @@
   
   <Description about="urn:mozilla:install-manifest">
     <em:id>{52c2877e-44e1-11e5-8874-a62d1d5d46B0}</em:id>
-    <em:version>40.20150820</em:version>
+    <em:version>40.20150911</em:version>
     <em:type>4</em:type>
-    <em:name>Arc Firefox Theme</em:name>
+    <em:name>Arc Theme</em:name>
     <em:description>Arc Theme for Firefox</em:description>
     <em:creator>horst3180</em:creator>
-    <em:internalName>arc-firefox-theme</em:internalName>
+    <em:internalName>arc-theme</em:internalName>
     <em:skinnable>false</em:skinnable>
-    <em:targetPlatform>Linux</em:targetPlatform>
-    <em:targetPlatform>OpenBSD</em:targetPlatform>
-    <em:targetPlatform>FreeBSD</em:targetPlatform>
-    <em:targetPlatform>NetBSD</em:targetPlatform>
 
     <em:targetApplication>
       <Description>
diff --git a/configure.ac b/configure.ac
index e9165f6..3d772f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([arc-firefox-theme], [40.20150820], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme])
+AC_INIT([arc-firefox-theme], [40.20150911], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme])
 AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects tar-ustar])
 AC_PREFIX_DEFAULT(/usr/local)
 AM_SILENT_RULES([yes])