--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -282,25 +282,25 @@ popupnotificationcontent {
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {
   height: 28px;
   width: 28px;
   border: none;
   margin: -14px;
   padding: 0;
-  background-image: url("chrome://global/skin/icons/autoscroll.png");
+  background-image: url("chrome://global/skin/icons/autoscroll.svg");
+  background-size: contain;
   background-color: transparent;
-  background-position: right top;
   -moz-appearance: none;
 }
 
 .autoscroller[scrolldir="NS"] {
-  background-position: right center;
+  background-image: url("chrome://global/skin/icons/autoscroll-vertical.svg");
 }
 
 .autoscroller[scrolldir="EW"] {
-  background-position: right bottom;
+  background-image: url("chrome://global/skin/icons/autoscroll-horizontal.svg");
 }
 
 /* :::::: Close button icons ::::: */
 
 %include ../../shared/close-icon.inc.css

deleted file mode 100644
index 6aac3d98e9e5b8ae9db35c05b9473eb352a3387f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -34,17 +34,16 @@ toolkit.jar:
    skin/classic/global/toolbar.css
    skin/classic/global/toolbarbutton.css
    skin/classic/global/tree.css
 *  skin/classic/global/alerts/alert.css                        (alerts/alert.css)
    skin/classic/global/arrow/arrow-dn-hov.gif                  (arrow/arrow-dn-hov.gif)
    skin/classic/global/arrow/arrow-up-hov.gif                  (arrow/arrow-up-hov.gif)
 
    skin/classic/global/icons/Authentication.png                (icons/Authentication.png)
-   skin/classic/global/icons/autoscroll.png                    (icons/autoscroll.png)
    skin/classic/global/icons/blacklist_favicon.png             (icons/blacklist_favicon.png)
    skin/classic/global/icons/blacklist_large.png               (icons/blacklist_large.png)
    skin/classic/global/icons/Close.gif                         (icons/Close.gif)
    skin/classic/global/icons/Minimize.gif                      (icons/Minimize.gif)
    skin/classic/global/icons/resizer.png                       (icons/resizer.png)
    skin/classic/global/icons/Restore.gif                       (icons/Restore.gif)
    skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
 

--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -291,29 +291,30 @@ popupnotificationcontent {
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {
   height: 28px;
   width: 28px;
   border: none;
   margin: -14px;
   padding: 0;
-  background-image: url("chrome://global/skin/icons/autoscroll.png");
+  background-image: url("chrome://global/skin/icons/autoscroll.svg");
+  background-size: contain;
   background-color: transparent;
   background-position: right top;
   -moz-appearance: none;
   -moz-window-shadow: none;
 }
 
 .autoscroller[scrolldir="NS"] {
-  background-position: right center;
+  background-image: url("chrome://global/skin/icons/autoscroll-vertical.svg");
 }
 
 .autoscroller[scrolldir="EW"] {
-  background-position: right bottom;
+  background-image: url("chrome://global/skin/icons/autoscroll-horizontal.svg");
 }
 
 /* autorepeatbuttons in menus */
 
 .popup-internal-box > autorepeatbutton {
   height: 15px;
   position: relative;
   list-style-image: none;

deleted file mode 100644
index c21e067d9aa17bd49498d7297d37183e0f96fa72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -65,17 +65,16 @@ toolkit.jar:
   skin/classic/global/arrow/panelarrow-vertical.png                  (arrow/panelarrow-vertical.png)
   skin/classic/global/arrow/panelarrow-vertical@2x.png               (arrow/panelarrow-vertical@2x.png)
   skin/classic/global/checkbox/cbox-check.gif                        (checkbox/cbox-check.gif)
   skin/classic/global/checkbox/cbox-check-dis.gif                    (checkbox/cbox-check-dis.gif)
   skin/classic/global/dirListing/dirListing.css                      (dirListing/dirListing.css)
   skin/classic/global/dirListing/folder.png                          (dirListing/folder.png)
   skin/classic/global/dirListing/up.png                              (dirListing/up.png)
   skin/classic/global/icons/autocomplete-dropmarker.png              (icons/autocomplete-dropmarker.png)
-  skin/classic/global/icons/autoscroll.png                           (icons/autoscroll.png)
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
   skin/classic/global/icons/glyph-dropdown.png                       (icons/glyph-dropdown.png)
   skin/classic/global/icons/glyph-dropdown@2x.png                    (icons/glyph-dropdown@2x.png)
   skin/classic/global/icons/notfound.png                             (icons/notfound.png)
   skin/classic/global/icons/panebutton-active.png                    (icons/panebutton-active.png)
   skin/classic/global/icons/panebutton-inactive.png                  (icons/panebutton-inactive.png)
   skin/classic/global/icons/panel-dropmarker.png                     (icons/panel-dropmarker.png)

new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/icons/autoscroll-horizontal.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="48" width="48">
+  <circle id="compassbackground" r="6" cx="8" cy="8" fill="#f9f9fa" fill-opacity=".8"/>
+  <circle id="compassborder" r="7" cx="8" cy="8" fill="none" stroke="#0c0c0d" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="0" stroke-opacity=".8"/>
+  <circle id="compasscenter" cx="8" cy="8" r="1" fill="#0c0c0d" fill-opacity=".8"/>
+  <g id="westeast" stroke="#0c0c0d" stroke-opacity=".8" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M4.5 7l-1 1 1 1"/>
+    <path d="M11.5 7l1 1-1 1"/>
+  </g>
+</svg>

new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/icons/autoscroll-vertical.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="48" width="48">
+  <circle id="compassbackground" r="6" cx="8" cy="8" fill="#f9f9fa" fill-opacity=".8"/>
+  <circle id="compassborder" r="7" cx="8" cy="8" fill="none" stroke="#0c0c0d" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="0" stroke-opacity=".8"/>
+  <circle id="compasscenter" cx="8" cy="8" r="1" fill="#0c0c0d" fill-opacity=".8"/>
+  <g id="northsouth" fill="none" fill-opacity=".8" stroke="#0c0c0d" stroke-opacity=".8" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M7 4.5l1-1 1 1"/>
+    <path d="M7 11.5l1 1 1-1"/>
+  </g>
+</svg>

new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/icons/autoscroll.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="48" width="48">
+  <circle id="compassbackground" r="6" cx="8" cy="8" fill="#f9f9fa" fill-opacity=".8"/>
+  <circle id="compassborder" r="7" cx="8" cy="8" fill="none" stroke="#0c0c0d" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="0" stroke-opacity=".8"/>
+  <circle id="compasscenter" cx="8" cy="8" r="1" fill="#0c0c0d" fill-opacity=".8"/>
+  <g id="northsouth" fill="none" fill-opacity=".8" stroke="#0c0c0d" stroke-opacity=".8" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M7 4.5l1-1 1 1"/>
+    <path d="M7 11.5l1 1 1-1"/>
+  </g>
+  <g id="westeast" stroke="#0c0c0d" stroke-opacity=".8" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M4.5 7l-1 1 1 1"/>
+    <path d="M11.5 7l1 1-1 1"/>
+  </g>
+</svg>

--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -22,16 +22,19 @@ toolkit.jar:
   skin/classic/global/aboutLicense.css                     (../../shared/aboutLicense.css)
   skin/classic/global/aboutSupport.css                     (../../shared/aboutSupport.css)
   skin/classic/global/appPicker.css                        (../../shared/appPicker.css)
   skin/classic/global/config.css                           (../../shared/config.css)
   skin/classic/global/datetimeinputpickers.css             (../../shared/datetimeinputpickers.css)
   skin/classic/global/datetimepopup.css                    (../../shared/datetimepopup.css)
   skin/classic/global/passwordmgr.css                      (../../shared/passwordmgr.css)
   skin/classic/global/scale.css                            (../../shared/scale.css)
+  skin/classic/global/icons/autoscroll.svg                 (../../shared/icons/autoscroll.svg)
+  skin/classic/global/icons/autoscroll-horizontal.svg      (../../shared/icons/autoscroll-horizontal.svg)
+  skin/classic/global/icons/autoscroll-vertical.svg        (../../shared/icons/autoscroll-vertical.svg)
   skin/classic/global/icons/calendar-arrow-left.svg        (../../shared/icons/calendar-arrow-left.svg)
   skin/classic/global/icons/calendar-arrow-right.svg       (../../shared/icons/calendar-arrow-right.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
   skin/classic/global/icons/error.svg                      (../../shared/icons/error.svg)
   skin/classic/global/icons/find-previous-arrow.svg        (../../shared/icons/find-previous-arrow.svg)
   skin/classic/global/icons/find-next-arrow.svg            (../../shared/icons/find-next-arrow.svg)
   skin/classic/global/icons/help.svg                       (../../shared/icons/help.svg)
   skin/classic/global/icons/info.svg                       (../../shared/incontent-icons/info.svg)

--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -293,35 +293,25 @@ popupnotificationcontent {
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {
   height: 28px;
   width: 28px;
   border: none;
   margin: -14px;
   padding: 0;
-  background-image: url("chrome://global/skin/icons/autoscroll.png");
+  background-image: url("chrome://global/skin/icons/autoscroll.svg");
+  background-size: contain;
   background-color: transparent;
-%ifdef XP_WIN
-  background-position: right top;
-%endif
   -moz-appearance: none;
 }
 
 .autoscroller[scrolldir="NS"] {
-%ifdef XP_WIN
-  background-position: right center;
-%else
-  background-position: left center;
-%endif
+  background-image: url("chrome://global/skin/icons/autoscroll-vertical.svg");
 }
 
 .autoscroller[scrolldir="EW"] {
-%ifdef XP_WIN
-  background-position: right bottom;
-%else
-  background-position: left bottom;
-%endif
+  background-image: url("chrome://global/skin/icons/autoscroll-horizontal.svg");
 }
 
 /* :::::: Close button icons ::::: */
 
 %include ../../shared/close-icon.inc.css

deleted file mode 100644
index 95794f822fdd64a74fd821123dce2a9e9a3a4aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -52,18 +52,16 @@ toolkit.jar:
   skin/classic/global/icons/resizer.png                    (icons/resizer.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
   skin/classic/global/icons/Warning.png                    (icons/Warning.png)
   skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
   skin/classic/global/icons/warning-large.png              (icons/warning-large.png)
 * skin/classic/global/in-content/common.css                (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css            (in-content/info-pages.css)
   skin/classic/global/toolbar/spring.png                   (toolbar/spring.png)
-
-  skin/classic/global/icons/autoscroll.png                       (icons/autoscroll.png)
   skin/classic/global/tree/twisty.svg                            (tree/twisty.svg)
   skin/classic/global/tree/twisty-preWin10.svg                   (tree/twisty-preWin10.svg)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif