Bug 1134237 - Port bug 1022581 to TB [Category icons in about:preferences aren't legible when using black-on-white High Contrast mode]. r=josiah, a=rkent
authorRichard Marti <richard.marti@gmail.com>
Wed, 18 Feb 2015 06:50:18 +0100
changeset 25770 52709503cdab940ad5239e3e7bd24571c5975c97
parent 25769 b658f01ca6f90402b8b7d6e50c00e0a0d74bde21
child 25771 6cf68063bffb375ab96100b58a5f8e7e60d8661d
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosiah, rkent
bugs1134237, 1022581
Bug 1134237 - Port bug 1022581 to TB [Category icons in about:preferences aren't legible when using black-on-white High Contrast mode]. r=josiah, a=rkent
mail/themes/linux/jar.mn
mail/themes/osx/jar.mn
mail/themes/shared/mail/incontentprefs/aboutPreferences.css
mail/themes/shared/mail/incontentprefs/icons.png
mail/themes/shared/mail/incontentprefs/icons.svg
mail/themes/shared/mail/incontentprefs/icons@2x.png
mail/themes/windows/jar.mn
mail/themes/windows/mail/preferences/aboutPreferences.css
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -116,18 +116,17 @@ classic.jar:
   skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
   skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
   skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/messenger/preferences/auth-error.png           (mail/preferences/auth-error.png)
   skin/classic/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/aboutPreferences.css     (mail/preferences/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
-  skin/classic/messenger/shared/in-content/icons.png          (../shared/mail/incontentprefs/icons.png)
-  skin/classic/messenger/shared/in-content/icons@2x.png       (../shared/mail/incontentprefs/icons@2x.png)
+  skin/classic/messenger/shared/in-content/icons.svg          (../shared/mail/incontentprefs/icons.svg)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSecurityInfo.css        (mail/smime/msgReadSecurityInfo.css)
   skin/classic/messenger/smime/msgCompSecurityInfo.css        (mail/smime/msgCompSecurityInfo.css)
   skin/classic/messenger/smime/certFetchingStatus.css         (mail/smime/certFetchingStatus.css)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png       (mail/smime/hdrCryptoNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png          (mail/smime/hdrCryptoOk.png)
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -125,18 +125,17 @@ classic.jar:
   skin/classic/messenger/preferences/applications.css            (mail/preferences/applications.css)
   skin/classic/messenger/preferences/mail-options.png            (mail/preferences/mail-options.png)
   skin/classic/messenger/preferences/mail-options@2x.png         (mail/preferences/mail-options@2x.png)
   skin/classic/messenger/preferences/auth-error.png              (mail/preferences/auth-error.png)
   skin/classic/messenger/preferences/dialog.css                  (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/aboutPreferences.css        (mail/preferences/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/dialog.css            (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css  (../shared/mail/incontentprefs/aboutPreferences.css)
-  skin/classic/messenger/shared/in-content/icons.png             (../shared/mail/incontentprefs/icons.png)
-  skin/classic/messenger/shared/in-content/icons@2x.png          (../shared/mail/incontentprefs/icons@2x.png)
+  skin/classic/messenger/shared/in-content/icons.svg             (../shared/mail/incontentprefs/icons.svg)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css           (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css        (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css           (mail/smime/msgReadSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSecurityInfo.css           (mail/smime/msgReadSecurityInfo.css)
   skin/classic/messenger/smime/msgCompSecurityInfo.css           (mail/smime/msgCompSecurityInfo.css)
   skin/classic/messenger/smime/certFetchingStatus.css            (mail/smime/certFetchingStatus.css)
   skin/classic/messenger/smime/icons/sbSignOk.png                (mail/smime/sbSignOk.png)
   skin/classic/messenger/smime/icons/sbSignUnknown.png           (mail/smime/sbSignUnknown.png)
--- a/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
+++ b/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
@@ -104,95 +104,57 @@ radio[pane][selected]::before {
   .paneButtonLabel {
     display: none;
   }
 }
 
 .paneButtonIcon {
   width: 24px;
   height: 24px;
-  list-style-image: url("icons.png");
+  -moz-image-region: auto;
 }
 
 radio[pane=paneGeneral] > .paneButtonIcon {
-  -moz-image-region: rect(0, 24px, 24px, 0);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#general");
 }
 
 radio[pane=paneDisplay] > .paneButtonIcon {
-  -moz-image-region: rect(0, 48px, 24px, 24px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#display");
 }
 
 radio[pane=paneApplications] > .paneButtonIcon {
-  -moz-image-region: rect(0, 72px, 24px, 48px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#applications");
 }
 
 radio[pane=panePrivacy] > .paneButtonIcon {
-  -moz-image-region: rect(0, 96px, 24px, 72px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#privacy");
 }
 
 radio[pane=paneSecurity]> .paneButtonIcon {
-  -moz-image-region: rect(0, 120px, 24px, 96px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#security");
 }
 
 radio[pane=paneCompose] > .paneButtonIcon {
-  -moz-image-region: rect(0, 144px, 24px, 120px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#compose");
 }
 
 radio[pane=paneAdvanced] > .paneButtonIcon {
-  -moz-image-region: rect(0, 168px, 24px, 144px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#advanced");
 }
 
 radio[pane=paneChat] > .paneButtonIcon {
-  -moz-image-region: rect(0, 192px, 24px, 168px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#chat");
 }
 
 radio[pane=paneLightning] > .paneButtonIcon {
-  -moz-image-region: rect(0, 216px, 24px, 192px);
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#calendar");
 }
 
-@media (min-resolution: 2dppx) {
-  .paneButtonIcon {
-    list-style-image: url("icons@2x.png");
-  }
-
-  radio[pane=paneGeneral] > .paneButtonIcon {
-    -moz-image-region: rect(0, 48px, 48px, 0);
-  }
-
-  radio[pane=paneDisplay] > .paneButtonIcon {
-    -moz-image-region: rect(0, 96px, 48px, 48px);
-  }
-
-  radio[pane=paneApplications] > .paneButtonIcon {
-    -moz-image-region: rect(0, 144px, 48px, 96px);
-  }
-
-  radio[pane=panePrivacy] > .paneButtonIcon {
-    -moz-image-region: rect(0, 192px, 48px, 144px);
-  }
-
-  radio[pane=paneSecurity]> .paneButtonIcon {
-    -moz-image-region: rect(0, 240px, 48px, 192px);
-  }
-
-  radio[pane=paneCompose] > .paneButtonIcon {
-    -moz-image-region: rect(0, 288px, 48px, 240px);
-  }
-
-  radio[pane=paneAdvanced] > .paneButtonIcon {
-    -moz-image-region: rect(0, 336px, 48px, 288px);
-  }
-
-  radio[pane=paneChat] > .paneButtonIcon {
-    -moz-image-region: rect(0, 384px, 48px, 336px);
-  }
-
-  radio[pane=paneLightning] > .paneButtonIcon {
-    -moz-image-region: rect(0, 432px, 48px, 384px);
-  }
+radio[pane=paneAccount] > .paneButtonIcon {
+  list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#account");
 }
 
 /* Applications Pane Styles */
 
 #applications-content {
   padding: 15px;
 }
 
deleted file mode 100644
index fed6bf4dba0055469204b91a08c4d983cc31361e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/incontentprefs/icons.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 24 24">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #fbfbfb;
+      stroke: rgba(0,0,0,0.4);
+      stroke-width: .5px;
+    }
+    use[id$="-native"] {
+      fill: ThreeDHighlight;
+    }
+  </style>
+  <defs style="display: none;">
+    <g id="general-shape">
+      <path
+        d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03
+        V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731
+        c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731
+        c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035
+        c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03
+        c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582
+        c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731
+        c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168
+        c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731
+        C19.24,5.84,18.913,6.168,18.509,6.168z"/>
+      <path
+        d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657
+        c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
+    </g>
+    <g id="display-shape">
+      <path
+        d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714
+        C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4
+        h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223
+        c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z
+         M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2
+        c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
+    </g>
+    <g id="applications-shape">
+      <path
+        d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268
+        l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z
+         M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1
+        C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074
+        c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408
+        c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
+    </g>
+    <g id="privacy-shape">
+      <path
+        d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498
+        c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836
+        c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973
+        C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091
+        C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451
+        c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z
+         M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338
+        c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
+    </g>
+    <g id="security-shape">
+      <path
+        d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2
+        C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818
+        c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478
+        c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092
+        l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727
+        l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
+    </g>
+    <g id="compose-shape">
+      <path
+        d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095
+        2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945
+        -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886
+        4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791
+        3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271
+        7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443
+        -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892
+        2.17,9.86 2.06,10.887 1.62,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682
+        10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
+    </g>
+    <g id="advanced-shape">
+      <path
+        d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0
+        -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659
+        C22,17.22,20.922,16.553,19.173,16.163z"/>
+      <path
+        d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403
+        c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364
+        l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144
+        C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466
+        c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403
+        c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816
+        c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131
+        c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773
+        c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158
+        c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488
+        c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239
+        c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
+    </g>
+    <g id="chat-shape">
+      <path
+        d="M18.85,2 5.14,2C3.95,2 3,2.96 3,4.14 l 0,9.71C3,15.04 3.96,16 5.14,16L6.8,16 6,22 l 5.21,-6 7.64,0c1.18,0 2.14,-0.96
+        2.14,-2.14 l 0,-9.71C20.98,3.17 20.23,2.01 18.85,2ZM15,13.6C15,13.82 14.82,14 14.6,14L5.4,14C5.18,14 5,13.82 5,13.6L5,12.4
+        C5,12.18 5.18,12 5.4,12 l 9.2,0c0.22,0 0.4,0.18 0.4,0.4zm0,-4C15,9.82 14.82,10 14.6,10L5.4,10C5.18,10 5,9.82 5,9.6 L 5,8.4
+        C5,8.18 5.18,8 5.4,8 l 9.2,0C14.82,8 15,8.18 15,8.4Zm4,-4C19,5.82 18.82,6 18.6,6L5.4,6C5.18,6 5,5.82 5,5.6L5,4.4C5,4.18
+        5.18,4 5.4,4L18.6,4C18.82,4 19,4.18 19,4.4Z"/>
+    </g>
+    <g id="calendar-shape">
+      <path
+        d="M5.14,2 C 3.95,2 3,2.96 3,4.142L3,19.85c0,1.183 0.957,2.142 2.14,2.142 l 13.716,0C20.042,21.99 21,21.038 21,19.85L21,4.142
+        C21,3.0 20.1,2.012 18.857,2ZM5,4 19,4 19,5 5,5Zm3,4 2,0 0,2 -2,0zm3,0 2,0 0,2 -2,0zm3,0 2,0 0,2 -2,0zm3,0 2,0 0,2 -2,0zm-12,3
+        2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm-12,3 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0
+        0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm-12,3 2,0 0,2-2,0zm3,0 2,0 0,2-2,0zm3,0 2,0 0,2-2,0z"/>
+    </g>
+    <g id="account-shape">
+      <path
+        d="M18.97,3 5.03,3C3.914,3 3,3.914 3,5.03L3,18.97C3,20.086 3.914,21 5.03,21 l 13.94,0C20.087,21 21,20.086 21,18.97L21,5.03
+        C21,3.914 20.086,3 18.97,3ZM18,17.5c0,0.228 -0.271,0.5 -0.5,0.5 l -1.155,0C16.284,16.793 16.038,15.666 13.5,15.496 l 0,-1.698
+        C14.369,13.423 15.017,12.457 15,10.89 14.96,9.163 14.183,7.9 12,7.8 10.075,7.872 9.075,9.238 9,10.901c0.019,1.447 0.593,2.562
+        1.5,2.901 l 0,1.7C7.85,15.638 7.752,16.94 7.65,18L6.5,18C6.273,18 6,17.728 6,17.5L6,6.5C6,6.271 6.273,6 6.5,6 l 11,0C17.728,6
+        18,6.271 18,6.5Z"/>
+    </g>
+  </defs>
+  <use id="general" xlink:href="#general-shape"/>
+  <use id="general-native" xlink:href="#general-shape"/>
+  <use id="compose" xlink:href="#compose-shape"/>
+  <use id="compose-native" xlink:href="#compose-shape"/>
+  <use id="display" xlink:href="#display-shape"/>
+  <use id="display-native" xlink:href="#display-shape"/>
+  <use id="applications" xlink:href="#applications-shape"/>
+  <use id="applications-native" xlink:href="#applications-shape"/>
+  <use id="privacy" xlink:href="#privacy-shape"/>
+  <use id="privacy-native" xlink:href="#privacy-shape"/>
+  <use id="security" xlink:href="#security-shape"/>
+  <use id="security-native" xlink:href="#security-shape"/>
+  <use id="compose" xlink:href="#compose-shape"/>
+  <use id="compose-native" xlink:href="#compose-shape"/>
+  <use id="advanced" xlink:href="#advanced-shape"/>
+  <use id="advanced-native" xlink:href="#advanced-shape"/>
+  <use id="chat" xlink:href="#chat-shape"/>
+  <use id="chat-native" xlink:href="#chat-shape"/>
+  <use id="calendar" xlink:href="#calendar-shape"/>
+  <use id="calendar-native" xlink:href="#calendar-shape"/>
+  <use id="account" xlink:href="#account-shape"/>
+  <use id="account-native" xlink:href="#account-shape"/>
+</svg>
deleted file mode 100644
index b6d0cca6664cdf50cf795b1cae6b5e04771b6494..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -145,18 +145,17 @@ classic.jar:
   skin/classic/messenger/preferences/background.png           (mail/preferences/background.png)
   skin/classic/messenger/preferences/hover.png                (mail/preferences/hover.png)
   skin/classic/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/messenger/preferences/auth-error.png           (mail/preferences/auth-error.png)
   skin/classic/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/aboutPreferences.css     (mail/preferences/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
-  skin/classic/messenger/shared/in-content/icons.png          (../shared/mail/incontentprefs/icons.png)
-  skin/classic/messenger/shared/in-content/icons@2x.png       (../shared/mail/incontentprefs/icons@2x.png)
+  skin/classic/messenger/shared/in-content/icons.svg          (../shared/mail/incontentprefs/icons.svg)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
   skin/classic/messenger/smime/msgReadSecurityInfo.css        (mail/smime/msgReadSecurityInfo.css)
   skin/classic/messenger/smime/msgCompSecurityInfo.css        (mail/smime/msgCompSecurityInfo.css)
   skin/classic/messenger/smime/certFetchingStatus.css         (mail/smime/certFetchingStatus.css)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png       (mail/smime/hdrCryptoNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png          (mail/smime/hdrCryptoOk.png)
@@ -427,18 +426,17 @@ classic.jar:
   skin/classic/aero/messenger/preferences/background.png           (mail/preferences/background.png)
   skin/classic/aero/messenger/preferences/hover.png                (mail/preferences/hover.png)
   skin/classic/aero/messenger/preferences/selected.png             (mail/preferences/selected.png)
   skin/classic/aero/messenger/preferences/auth-error.png           (mail/preferences/auth-error.png)
   skin/classic/aero/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
   skin/classic/aero/messenger/preferences/aboutPreferences.css     (mail/preferences/aboutPreferences.css)
   skin/classic/aero/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/aero/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
-  skin/classic/aero/messenger/shared/in-content/icons.png          (../shared/mail/incontentprefs/icons.png)
-  skin/classic/aero/messenger/shared/in-content/icons@2x.png       (../shared/mail/incontentprefs/icons@2x.png)
+  skin/classic/aero/messenger/shared/in-content/icons.svg          (../shared/mail/incontentprefs/icons.svg)
   skin/classic/aero/messenger/smime/msgCompSMIMEOverlay.css        (mail/smime/msgCompSMIMEOverlay.css)
   skin/classic/aero/messenger/smime/msgHdrViewSMIMEOverlay.css     (mail/smime/msgHdrViewSMIMEOverlay.css)
   skin/classic/aero/messenger/smime/msgReadSMIMEOverlay.css        (mail/smime/msgReadSMIMEOverlay.css)
   skin/classic/aero/messenger/smime/msgReadSecurityInfo.css        (mail/smime/msgReadSecurityInfo.css)
   skin/classic/aero/messenger/smime/msgCompSecurityInfo.css        (mail/smime/msgCompSecurityInfo.css)
   skin/classic/aero/messenger/smime/certFetchingStatus.css         (mail/smime/certFetchingStatus.css)
   skin/classic/aero/messenger/smime/icons/hdrCryptoNotOk.png       (mail/smime/hdrCryptoNotOk-aero.png)
   skin/classic/aero/messenger/smime/icons/hdrCryptoOk.png          (mail/smime/hdrCryptoOk-aero.png)
--- a/mail/themes/windows/mail/preferences/aboutPreferences.css
+++ b/mail/themes/windows/mail/preferences/aboutPreferences.css
@@ -1,14 +1,56 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://messenger/skin/shared/in-content/aboutPreferences.css");
 
+@media not all and (-moz-windows-default-theme) {
+  radio[pane=paneGeneral] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#general-native");
+  }
+
+  radio[pane=paneDisplay] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#display-native");
+  }
+
+  radio[pane=paneApplications] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#applications-native");
+  }
+
+  radio[pane=panePrivacy] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#privacy-native");
+  }
+
+  radio[pane=paneSecurity]> .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#security-native");
+  }
+
+  radio[pane=paneCompose] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#compose-native");
+  }
+
+  radio[pane=paneAdvanced] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#advanced-native");
+  }
+
+  radio[pane=paneChat] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#chat-native");
+  }
+
+  radio[pane=paneLightning] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#calendar-native");
+  }
+
+  radio[pane=paneAccount] > .paneButtonIcon {
+    list-style-image: url("chrome://messenger/skin/shared/in-content/icons.svg#account-native");
+  }
+}
+
 radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio") !important;
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   -moz-margin-end: 9px;
 }